Details

    • Type: Task
    • Status: Closed
    • Priority: Blocker
    • Resolution: Fixed
    • Affects Version/s: None
    • Fix Version/s: 2.0
    • Component/s: Source Control
    • Labels:
      None

      Description

      I'm hoping that we can wait to do this until 1.0.3 is completed if at all possible. Reference the previous merge that was done of 1.0.3 into 1.1 on August 15, 2010 which is KULRICE-4437.

      Note that the starting revision for this merge from 1.0.3 should be 14215

        Attachments

          Issue Links

            Activity

            Hide
            jjhanso Jeremy Hanson added a comment -
            Show
            jjhanso Jeremy Hanson added a comment - svn command is: svn merge -r 14215:HEAD https://test.kuali.org/svn/rice/branches/rice-release-1-0-3-br/
            Hide
            jjhanso Jeremy Hanson added a comment -

            output from the merge:

            C:\java\projects\rice-1.1.0>svn merge -r 14215:HEAD https://test.kuali.org/svn/rice/branches/rice-release-1-0-3-br/
            — Merging r14216 through r14521 into '.':
            A ksb\src\test\java\org\kuali\rice\ksb\testclient1\Storage.java
            A ksb\src\test\java\org\kuali\rice\ksb\testclient1\InboxResourceImpl.java
            A ksb\src\test\java\org\kuali\rice\ksb\testclient1\MessageResourceImpl.java
            A ksb\src\test\java\org\kuali\rice\ksb\messaging\RestServiceDefinitionTest.java
            A ksb\src\test\java\org\kuali\rice\ksb\messaging\remotedservices\Inbox.java
            A ksb\src\test\java\org\kuali\rice\ksb\messaging\remotedservices\Message.java
            A ksb\src\test\java\org\kuali\rice\ksb\messaging\remotedservices\InboxResource.java
            A ksb\src\test\java\org\kuali\rice\ksb\messaging\remotedservices\MessageResource.java
            U ksb\src\test\java\org\kuali\rice\ksb\messaging\RESTServiceTest.java
            U ksb\src\test\java\org\kuali\rice\ksb\messaging\RemotedServiceRegistryTest.java
            U ksb\src\test\java\org\kuali\rice\ksb\messaging\ServiceUpdateAndRemovalTest.java
            U ksb\src\test\java\org\kuali\rice\ksb\messaging\DevModeTest.java
            U ksb\src\test\java\org\kuali\rice\ksb\messaging\RemoteResourceLoaderTest.java
            Conflict discovered in 'ksb/src/test/resources/KSBTestHarnessNoJtaSpring.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C ksb\src\test\resources\KSBTestHarnessNoJtaSpring.xml
            Conflict discovered in 'ksb/src/test/resources/KSBTestHarnessSpring.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C ksb\src\test\resources\KSBTestHarnessSpring.xml
            Conflict discovered in 'ksb/src/test/resources/org/kuali/rice/ksb/testclient1/resources/TestClient1SpringBeans.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p

            (e) edit - change merged file in an editor
            (df) diff-full - show all changes made to merged file
            (r) resolved - accept merged version of file

            (dc) display-conflict - show all conflicts (ignoring merged version)
            (mc) mine-conflict - accept my version for all conflicts (same)
            (tc) theirs-conflict - accept their version for all conflicts (same)

            (mf) mine-full - accept my version of entire file (even non-conflicts)
            (tf) theirs-full - accept their version of entire file (same)

            (p) postpone - mark the conflict to be resolved later
            (l) launch - launch external tool to resolve conflict
            (s) show all - show this list

            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C ksb\src\test\resources\org\kuali\rice\ksb\testclient1\resources\TestClient1SpringBeans.xml
            Conflict discovered in 'ksb/src/test/resources/org/kuali/rice/ksb/testclient2/resources/TestClient2SpringBeans.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C ksb\src\test\resources\org\kuali\rice\ksb\testclient2\resources\TestClient2SpringBeans.xml
            A kim\src\test\java\org\kuali\rice\kim\test\bo\group
            A kim\src\test\java\org\kuali\rice\kim\test\bo\group\impl
            A kim\src\test\java\org\kuali\rice\kim\test\bo\group\impl\GroupAttributeDataImplTest.java
            U kim\src\test\java\org\kuali\rice\kim\test\service\GroupServiceImplTest.java
            U kim\src\test\java\org\kuali\rice\kim\test\service\RoleServiceTest.java
            A kim\src\test\java\org\kuali\rice\kim\test\GroupMemberImplTest.java
            U kim\src\test\java\org\kuali\rice\kim\test\KIMTestCase.java
            U kim\src\test\java\org\kuali\rice\kim\service\impl\RoleServiceImplTest.java
            A kim\src\test\java\org\kuali\rice\kim\service\KIMServiceLocatorTest.java
            A kim\src\test\java\org\kuali\rice\kim\util
            A kim\src\test\java\org\kuali\rice\kim\util\KimCommonUtilsTest.java
            Conflict discovered in 'kim/src/test/resources/KIMTestHarnessSpringBeans.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C kim\src\test\resources\KIMTestHarnessSpringBeans.xml
            A kim\src\test\resources\org\kuali\rice\kim\test\CircularRolesTestData.sql
            A kim\src\test\resources\org\kuali\rice\kim\test\CircularGroupsTestData.sql
            A sampleapp
            A sampleapp\scripts
            A sampleapp\scripts\sql
            A sampleapp\scripts\sql\mysql
            A sampleapp\scripts\sql\mysql\create_travel_tables.sql
            A sampleapp\scripts\sql\mysql\default_travel_data.sql
            A sampleapp\scripts\sql\oracle
            A sampleapp\scripts\sql\oracle\create_travel_tables.sql
            A sampleapp\scripts\sql\oracle\default_travel_data.sql
            A sampleapp\src
            A sampleapp\src\main
            A sampleapp\src\main\java
            A sampleapp\src\main\java\edu
            A sampleapp\src\main\java\edu\sampleu
            A sampleapp\src\main\java\edu\sampleu\travel
            A sampleapp\src\main\java\edu\sampleu\travel\bo
            A sampleapp\src\main\java\edu\sampleu\travel\bo\FiscalOfficer.java
            A sampleapp\src\main\java\edu\sampleu\travel\bo\TravelAccountUseRate.java
            A sampleapp\src\main\java\edu\sampleu\travel\bo\TravelAccountRules.java
            A sampleapp\src\main\java\edu\sampleu\travel\bo\TravelAccountExtension.java
            A sampleapp\src\main\java\edu\sampleu\travel\bo\TravelAccount.java
            A sampleapp\src\main\java\edu\sampleu\travel\bo\TravelAccountType.java
            A sampleapp\src\main\java\edu\sampleu\travel\infrastructure
            A sampleapp\src\main\java\edu\sampleu\travel\infrastructure\TravelServiceLocator.java
            A sampleapp\src\main\java\edu\sampleu\travel\infrastructure\TravelAppInitializeListener.java
            A sampleapp\src\main\java\edu\sampleu\travel\infrastructure\Constants.java
            A sampleapp\src\main\java\edu\sampleu\travel\remotedservice
            A sampleapp\src\main\java\edu\sampleu\travel\remotedservice\SampleRemotedService.java
            A sampleapp\src\main\java\edu\sampleu\travel\workflow
            A sampleapp\src\main\java\edu\sampleu\travel\workflow\AccountAttribute.java
            A sampleapp\src\main\java\edu\sampleu\travel\workflow\XmlUtils.java
            A sampleapp\src\main\java\edu\sampleu\travel\workflow\EmployeeAttribute.java
            A sampleapp\src\main\java\edu\sampleu\travel\workflow\CustomActionListAttributeImpl.java
            A sampleapp\src\main\java\edu\sampleu\travel\workflow\DestinationRuleAttribute.java
            A sampleapp\src\main\java\edu\sampleu\travel\web
            A sampleapp\src\main\java\edu\sampleu\travel\web\form
            A sampleapp\src\main\java\edu\sampleu\travel\web\form\TravelDocumentForm2.java
            A sampleapp\src\main\java\edu\sampleu\travel\web\action
            A sampleapp\src\main\java\edu\sampleu\travel\web\action\TravelDocumentAction2.java
            A sampleapp\src\main\java\edu\sampleu\travel\document
            A sampleapp\src\main\java\edu\sampleu\travel\document\keyvalue
            A sampleapp\src\main\java\edu\sampleu\travel\document\keyvalue\AccountTypeKeyValues.java
            A sampleapp\src\main\java\edu\sampleu\travel\document\keyvalue\TravelRequestType.java
            A sampleapp\src\main\java\edu\sampleu\travel\document\rule
            A sampleapp\src\main\java\edu\sampleu\travel\document\rule\TravelDocumentRule.java
            A sampleapp\src\main\java\edu\sampleu\travel\document\authorizer
            A sampleapp\src\main\java\edu\sampleu\travel\document\authorizer\TravelDocumentAuthorizer.java
            A sampleapp\src\main\java\edu\sampleu\travel\document\authorizer\TravelDocumentPresentationController.java
            A sampleapp\src\main\java\edu\sampleu\travel\document\TravelDocument2.java
            A sampleapp\src\main\resources
            A sampleapp\src\main\resources\OJB-repository-sampleapp.xml
            A sampleapp\src\main\resources\edu
            A sampleapp\src\main\resources\edu\sampleu
            A sampleapp\src\main\resources\edu\sampleu\travel
            A sampleapp\src\main\resources\edu\sampleu\travel\datadictionary
            A sampleapp\src\main\resources\edu\sampleu\travel\datadictionary\FiscalOfficerMaintenanceDocument.xml
            A sampleapp\src\main\resources\edu\sampleu\travel\datadictionary\TravelAccountUseRate.xml
            A sampleapp\src\main\resources\edu\sampleu\travel\datadictionary\TravelRequestDocument.xml
            A sampleapp\src\main\resources\edu\sampleu\travel\datadictionary\TravelAccountExtension.xml
            A sampleapp\src\main\resources\edu\sampleu\travel\datadictionary\FiscalOfficer-Extension.xml
            A sampleapp\src\main\resources\edu\sampleu\travel\datadictionary\TravelAccount.xml
            A sampleapp\src\main\resources\edu\sampleu\travel\datadictionary\TravelAccountMaintenanceDocument.xml
            A sampleapp\src\main\resources\edu\sampleu\travel\datadictionary\TravelAccountType.xml
            A sampleapp\src\main\resources\edu\sampleu\travel\datadictionary\FiscalOfficer.xml
            A sampleapp\pom.xml
            U kew\src\test\java\org\kuali\rice\kew\batch\XmlIngestionTest.java
            U kew\src\test\java\org\kuali\rice\kew\routing\RoutingWithEmptyWorkGroupTest.java
            U kew\src\test\java\org\kuali\rice\kew\routemanager\ExceptionRoutingTest.java
            U kew\src\test\java\org\kuali\rice\kew\routemanager\ExceptionRoutingTestPostProcessor.java
            U kew\src\test\java\org\kuali\rice\kew\docsearch\SearchableAttributeTest.java
            U kew\src\test\java\org\kuali\rice\kew\actions\SimpleDocumentActionsWebServiceTest.java
            U kew\src\test\java\org\kuali\rice\kew\role\RoleRouteModuleTest.java
            U kew\src\test\java\org\kuali\rice\core\util\ClientDocumentDaoOjb.java
            A kew\src\test\java\mocks\MockJavaMailSender.java
            A kew\src\test\java\mocks\MockMailer.java
            Conflict discovered in 'kew/src/test/resources/org/kuali/rice/kew/clientapp/ThinClientSpringBeans.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C kew\src\test\resources\org\kuali\rice\kew\clientapp\ThinClientSpringBeans.xml
            A kew\src\test\resources\org\kuali\rice\kew\batch\data\widgetsTest.xml
            Conflict discovered in 'kew/src/test/resources/org/kuali/rice/kew/docsearch/xml/SearchableAttributeProcessorSpring.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C kew\src\test\resources\org\kuali\rice\kew\docsearch\xml\SearchableAttributeProcessorSpring.xml
            Conflict discovered in 'kew/src/test/resources/org/kuali/rice/kew/docsearch/xml/SearchableAttributesSpringBeans.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C kew\src\test\resources\org\kuali\rice\kew\docsearch\xml\SearchableAttributesSpringBeans.xml
            A kew\src\test\resources\org\kuali\rice\kew\docsearch\SearchableTrimTest.xml
            U kew\src\test\resources\org\kuali\rice\kew\edl\widgets.xml
            Conflict discovered in 'kew/src/test/resources/org/kuali/rice/kew/config/TestKEWSpringBeans.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C kew\src\test\resources\org\kuali\rice\kew\config\TestKEWSpringBeans.xml
            Conflict discovered in 'kew/src/test/resources/org/kuali/rice/kew/config/TestSpring.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C kew\src\test\resources\org\kuali\rice\kew\config\TestSpring.xml
            Conflict discovered in 'kew/src/test/resources/org/kuali/rice/kew/config/OverrideTestSpringBeans.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C kew\src\test\resources\org\kuali\rice\kew\config\OverrideTestSpringBeans.xml
            Conflict discovered in 'kew/src/test/resources/org/kuali/rice/kew/rule/TestRouteTemplateSpring.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C kew\src\test\resources\org\kuali\rice\kew\rule\TestRouteTemplateSpring.xml
            Conflict discovered in 'kew/src/test/resources/org/kuali/rice/core/util/RiceServiceOverrideTestSpringBeans.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C kew\src\test\resources\org\kuali\rice\core\util\RiceServiceOverrideTestSpringBeans.xml
            U kew\pom.xml
            U scripts\dataset\bootstrap-server-dataset-cleanup.sql
            A scripts\upgrades\1.0.2 to 1.0.3\db-updates-client
            A scripts\upgrades\1.0.2 to 1.0.3\db-updates-client\mysql
            A scripts\upgrades\1.0.2 to 1.0.3\db-updates-client\mysql\2010-09-09.sql
            A scripts\upgrades\1.0.2 to 1.0.3\db-updates-client\oracle
            A scripts\upgrades\1.0.2 to 1.0.3\db-updates-client\oracle\2010-09-09.sql
            A scripts\upgrades\1.0.2 to 1.0.3\db-updates\mysql
            A scripts\upgrades\1.0.2 to 1.0.3\db-updates\mysql\2010-06-30.sql
            A scripts\upgrades\1.0.2 to 1.0.3\db-updates\mysql\2010-05-14.sql
            A scripts\upgrades\1.0.2 to 1.0.3\db-updates\mysql\2010-09-01.sql
            A scripts\upgrades\1.0.2 to 1.0.3\db-updates\mysql\2010-06-23.sql
            A scripts\upgrades\1.0.2 to 1.0.3\db-updates\mysql\2010-09-02.sql
            A scripts\upgrades\1.0.2 to 1.0.3\db-updates\mysql\2010-09-14.sql
            A scripts\upgrades\1.0.2 to 1.0.3\db-updates\mysql\2010-09-24.sql
            A scripts\upgrades\1.0.2 to 1.0.3\db-updates\mysql\2010-09-09.sql
            A scripts\upgrades\1.0.2 to 1.0.3\db-updates\mysql\2010-09-28.sql
            A scripts\upgrades\1.0.2 to 1.0.3\db-updates\oracle
            A scripts\upgrades\1.0.2 to 1.0.3\db-updates\oracle\2010-06-30.sql
            A scripts\upgrades\1.0.2 to 1.0.3\db-updates\oracle\2010-05-14.sql
            A scripts\upgrades\1.0.2 to 1.0.3\db-updates\oracle\2010-09-01.sql
            A scripts\upgrades\1.0.2 to 1.0.3\db-updates\oracle\2010-06-23.sql
            A scripts\upgrades\1.0.2 to 1.0.3\db-updates\oracle\2010-09-02.sql
            A scripts\upgrades\1.0.2 to 1.0.3\db-updates\oracle\2010-09-14.sql
            A scripts\upgrades\1.0.2 to 1.0.3\db-updates\oracle\2010-09-24.sql
            A scripts\upgrades\1.0.2 to 1.0.3\db-updates\oracle\2010-09-09.sql
            A scripts\upgrades\1.0.2 to 1.0.3\db-updates\oracle\2010-09-28.sql
            D scripts\upgrades\1.0.2 to 1.0.3\db-updates\2010-06-23.sql
            D scripts\upgrades\1.0.2 to 1.0.3\db-updates\mysql-2010-05-14.sql
            D scripts\upgrades\1.0.2 to 1.0.3\db-updates\2010-01-26.sql
            D scripts\upgrades\1.0.2 to 1.0.3\db-updates\2010-06-30.sql
            D scripts\upgrades\1.0.2 to 1.0.3\db-updates\2010-05-14.sql
            A scripts\upgrades\1.0.2 to 1.0.3\CountryCodeUpdateGenerator.groovy
            A scripts\upgrades\1.0.1.1 to 1.0.2\final\update_client_final_mysql.sql
            A scripts\upgrades\1.0.1.1 to 1.0.2\final\update_client_final_oracle.sql
            U scripts\upgrades\1.0.1.1 to 1.0.2\final\udpate_final_mysql.sql
            U scripts\upgrades\1.0.1.1 to 1.0.2\final\update_final_oracle.sql
            U scripts\createproject.groovy
            Conflict discovered in 'pom.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p

            (e) edit - change merged file in an editor
            (df) diff-full - show all changes made to merged file
            (r) resolved - accept merged version of file

            (dc) display-conflict - show all conflicts (ignoring merged version)
            (mc) mine-conflict - accept my version for all conflicts (same)
            (tc) theirs-conflict - accept their version for all conflicts (same)

            (mf) mine-full - accept my version of entire file (even non-conflicts)
            (tf) theirs-full - accept their version of entire file (same)

            (p) postpone - mark the conflict to be resolved later
            (l) launch - launch external tool to resolve conflict
            (s) show all - show this list

            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C pom.xml
            U kns\src\test\java\org\kuali\rice\kns\datadictionary\validation\fieldlevel\FixedPointValidationPatternTest.java
            A kns\src\test\java\org\kuali\rice\kns\bo\AttributeReferenceElementsTest.java
            A kns\src\test\java\org\kuali\rice\kns\bo\PostalCodeImplTest.java
            A kns\src\test\java\org\kuali\rice\kns\bo\PersistableAttachmentBaseTest.java
            A kns\src\test\java\org\kuali\rice\kns\bo\SessionDocumentTest.java
            C kns\src\test\java\org\kuali\rice\kns\bo\StateImplTest.java
            C kns\src\test\java\org\kuali\rice\kns\bo\CountryImplTest.java
            A kns\src\test\java\org\kuali\rice\kns\bo\DocumentAttachmentTest.java
            C kns\src\test\java\org\kuali\rice\kns\bo\NoteTypeTest.java
            A kns\src\test\java\org\kuali\rice\kns\bo\AttachmentTest.java
            A kns\src\test\java\org\kuali\rice\kns\bo\BusinessObjectAttributeEntryTest.java
            C kns\src\test\java\org\kuali\rice\kns\bo\CampusImplTest.java
            A kns\src\test\java\org\kuali\rice\kns\bo\LookupResultsTest.java
            C kns\src\test\java\org\kuali\rice\kns\bo\CampusTypeImplTest.java
            A kns\src\test\java\org\kuali\rice\kns\bo\AttributeReferenceDummyTest.java
            A kns\src\test\java\org\kuali\rice\kns\service\InactivateableFromToServiceTest.java
            A kns\src\test\java\org\kuali\rice\kns\util\PatternedStringBuilderTest.java
            U kns\src\test\java\org\kuali\rice\kns\util\ObjectUtilsTest.java
            U kns\src\test\java\org\kuali\rice\kns\util\WebUtilsTest.java
            A kns\src\test\resources\testAccountUseRate.sql
            Conflict discovered in 'kns/src/test/resources/KnsTestSpringBeans.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C kns\src\test\resources\KnsTestSpringBeans.xml
            A kns\src\test\resources\org\kuali\rice\kns\test\document\TravelAccountUseRate.xml
            U kns\src\test\resources\OJB-repository-kns-test.xml
            Conflict discovered in 'kns/pom.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C kns\pom.xml
            U build.xml
            Conflict discovered in 'kcb/src/test/resources/KCBTestHarnessSpringBeans.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C kcb\src\test\resources\KCBTestHarnessSpringBeans.xml
            Conflict discovered in '.classpath'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C .classpath
            U impl\src\test\java\org\kuali\rice\core\xml\JaxpSchemaValidationTest.java
            Conflict discovered in 'impl/src/test/resources/org/kuali/rice/core/database/MultipleDatabaseTransactionTestSpring.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\test\resources\org\kuali\rice\core\database\MultipleDatabaseTransactionTestSpring.xml
            U impl\src\test\resources\org\kuali\rice\core\config\jaxb-test-import-config.xml
            Conflict discovered in 'impl/src/test/resources/org/kuali/rice/core/jta/JtaTestSpring.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\test\resources\org\kuali\rice\core\jta\JtaTestSpring.xml
            U impl\src\main\java\org\kuali\rice\ksb\service\KSBServiceLocator.java
            U impl\src\main\java\org\kuali\rice\ksb\messaging\MessageServiceInvoker.java
            U impl\src\main\java\org\kuali\rice\ksb\messaging\servlet\KSBHttpInvokerHandler.java
            U impl\src\main\java\org\kuali\rice\ksb\messaging\dao\ServiceInfoDAO.java
            U impl\src\main\java\org\kuali\rice\ksb\messaging\dao\impl\ServiceInfoDAOJpaImpl.java
            U impl\src\main\java\org\kuali\rice\ksb\messaging\dao\impl\ServiceInfoDAOOjbImpl.java
            U impl\src\main\java\org\kuali\rice\ksb\messaging\exceptionhandling\MessageExceptionHandler.java
            U impl\src\main\java\org\kuali\rice\ksb\messaging\exceptionhandling\DefaultExceptionServiceImpl.java
            U impl\src\main\java\org\kuali\rice\ksb\messaging\exceptionhandling\DefaultMessageExceptionHandler.java
            U impl\src\main\java\org\kuali\rice\ksb\messaging\exceptionhandling\ExceptionRoutingService.java
            U impl\src\main\java\org\kuali\rice\ksb\messaging\RemotedServiceRegistryImpl.java
            U impl\src\main\java\org\kuali\rice\ksb\messaging\serviceexporters\RESTServiceExporter.java
            U impl\src\main\java\org\kuali\rice\ksb\messaging\web\MessageQueueAction.java
            U impl\src\main\java\org\kuali\rice\ksb\messaging\BusClientFailureProxy.java
            U impl\src\main\java\org\kuali\rice\ksb\messaging\RESTServiceDefinition.java
            U impl\src\main\java\org\kuali\rice\ksb\messaging\RemotedServiceRegistry.java
            U impl\src\main\java\org\kuali\rice\ksb\messaging\ServiceInfo.java
            U impl\src\main\java\org\kuali\rice\ksb\messaging\serviceconnectors\AbstractServiceConnector.java
            U impl\src\main\java\org\kuali\rice\ksb\messaging\serviceconnectors\RESTConnector.java
            A impl\src\main\java\org\kuali\rice\ksb\messaging\serviceconnectors\ResourceFacadeImpl.java
            U impl\src\main\java\org\kuali\rice\ksb\messaging\service\impl\ServiceRegistryImpl.java
            U impl\src\main\java\org\kuali\rice\ksb\messaging\service\ServiceRegistry.java
            U impl\src\main\java\org\kuali\rice\ksb\messaging\RemoteResourceServiceLocatorImpl.java
            U impl\src\main\java\org\kuali\rice\ksb\util\KSBConstants.java
            U impl\src\main\java\org\kuali\rice\kim\bo\impl\GroupImpl.java
            U impl\src\main\java\org\kuali\rice\kim\bo\impl\KimAbstractMemberImpl.java
            D impl\src\main\java\org\kuali\rice\kim\bo\impl\InactivatableFromToImpl.java
            U impl\src\main\java\org\kuali\rice\kim\bo\role\impl\KimDelegationMemberImpl.java
            Conflict discovered in 'impl/src/main/java/org/kuali/rice/kim/bo/role/impl/RoleMemberImpl.java'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\java\org\kuali\rice\kim\bo\role\impl\RoleMemberImpl.java
            Conflict discovered in 'impl/src/main/java/org/kuali/rice/kim/bo/ui/PersonDocumentGroup.java'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\java\org\kuali\rice\kim\bo\ui\PersonDocumentGroup.java
            Conflict discovered in 'impl/src/main/java/org/kuali/rice/kim/bo/ui/KimDocumentBoBase.java'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\java\org\kuali\rice\kim\bo\ui\KimDocumentBoBase.java
            Conflict discovered in 'impl/src/main/java/org/kuali/rice/kim/service/impl/GroupServiceImpl.java'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\java\org\kuali\rice\kim\service\impl\GroupServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kim\service\impl\RoleManagementServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kim\service\impl\GroupUpdateServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kim\service\impl\RoleServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kim\service\impl\RoleUpdateServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kim\service\impl\GroupServiceBase.java
            U impl\src\main\java\org\kuali\rice\kim\service\impl\PersonServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kim\service\impl\RoleServiceBase.java
            U impl\src\main\java\org\kuali\rice\kim\service\impl\UiDocumentServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kim\service\impl\IdentityArchiveServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kim\service\KIMServiceLocator.java
            U impl\src\main\java\org\kuali\rice\kim\dao\impl\KimRoleDaoOjb.java
            U impl\src\main\java\org\kuali\rice\kim\dao\impl\KimGroupDaoOjb.java
            U impl\src\main\java\org\kuali\rice\kim\dao\KimRoleDao.java
            U impl\src\main\java\org\kuali\rice\kim\config\KIMConfigurer.java
            U impl\src\main\java\org\kuali\rice\kim\lookup\ResponsibilityLookupableHelperServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kim\lookup\PermissionLookupableHelperServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kim\lookup\RoleMemberLookupableHelperServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kim\lookup\GroupLookupableHelperServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kim\lookup\RoleLookupableHelperServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kim\lookup\PersonLookupableHelperServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kim\rules\ui\PersonDocumentGroupRule.java
            U impl\src\main\java\org\kuali\rice\kim\rules\ui\GroupDocumentMemberRule.java
            U impl\src\main\java\org\kuali\rice\kim\util\KIMPropertyConstants.java
            U impl\src\main\java\org\kuali\rice\kim\util\KimCommonUtils.java
            U impl\src\main\java\org\kuali\rice\kim\web\struts\form\IdentityManagementPersonDocumentForm.java
            U impl\src\main\java\org\kuali\rice\kim\web\struts\form\IdentityManagementDocumentFormBase.java
            U impl\src\main\java\org\kuali\rice\kim\web\struts\form\IdentityManagementGroupDocumentForm.java
            U impl\src\main\java\org\kuali\rice\kim\web\struts\form\IdentityManagementRoleDocumentForm.java
            U impl\src\main\java\org\kuali\rice\kim\web\struts\action\IdentityManagementGroupDocumentAction.java
            U impl\src\main\java\org\kuali\rice\kim\web\struts\action\IdentityManagementRoleDocumentAction.java
            U impl\src\main\java\org\kuali\rice\kim\web\struts\action\IdentityManagementPersonDocumentAction.java
            U impl\src\main\java\org\kuali\rice\kim\web\struts\action\IdentityManagementDocumentActionBase.java
            U impl\src\main\java\org\kuali\rice\kim\document\rule\IdentityManagementRoleDocumentRule.java
            U impl\src\main\java\org\kuali\rice\kim\document\rule\IdentityManagementPersonDocumentRule.java
            A impl\src\main\java\org\kuali\rice\kim\document\rule\ActiveRoleMemberHelper.java
            U impl\src\main\java\org\kuali\rice\kim\document\rule\IdentityManagementGroupDocumentRule.java
            U impl\src\main\java\org\kuali\rice\kim\document\IdentityManagementPersonDocument.java
            U impl\src\main\java\org\kuali\rice\kew\exception\WorkflowDocumentExceptionRoutingService.java
            U impl\src\main\java\org\kuali\rice\kew\webservice\impl\SimpleDocumentActionsWebServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kew\doctype\LazyLoadSecurityAttribute.java
            U impl\src\main\java\org\kuali\rice\kew\messaging\exceptionhandling\DocumentMessageExceptionHandler.java
            U impl\src\main\java\org\kuali\rice\kew\messaging\exceptionhandling\ExceptionRoutingServiceImpl.java
            D impl\src\main\java\org\kuali\rice\kew\web\backdoor
            U impl\src\main\java\org\kuali\rice\kew\mail\service\impl\ActionListEmailServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kew\mail\service\impl\StyleableEmailContentServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kew\mail\service\impl\DefaultEmailService.java
            U impl\src\main\java\org\kuali\rice\kew\mail\EmailStyleHelper.java
            U impl\src\main\java\org\kuali\rice\kew\actionrequest\service\impl\ActionRequestServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kew\notes\web\AttachmentServlet.java
            U impl\src\main\java\org\kuali\rice\kew\service\impl\DocumentTypeResponsibilityTypeServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kew\service\impl\ReviewResponsibilityTypeServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kew\service\impl\AdhocReviewPermissionTypeServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kew\xml\export\XmlExporterServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kew\xml\RuleAttributeXmlParser.java
            U impl\src\main\java\org\kuali\rice\kew\preferences\service\impl\PreferencesServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kew\role\service\impl\ActionRequestDerivedRoleTypeServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kew\role\service\impl\RouteLogDerivedRoleTypeServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kew\role\RoleRouteModule.java
            U impl\src\main\java\org\kuali\rice\kew\edl\EDLDatabasePostProcessor.java
            U impl\src\main\java\org\kuali\rice\kew\edl\components\BrowserHandler.java
            U impl\src\main\java\org\kuali\rice\kew\edl\components\AnnotationComponent.java
            U impl\src\main\java\org\kuali\rice\kew\edl\EDLServlet.java
            U impl\src\main\java\org\kuali\rice\kew\edl\EDocLitePostProcessor.java
            U impl\src\main\java\org\kuali\rice\kew\engine\StandardWorkflowEngine.java
            U impl\src\main\java\org\kuali\rice\kew\engine\node\RouteNodeInstance.java
            U impl\src\main\java\org\kuali\rice\kew\config\KEWConfigurer.java
            U impl\src\main\java\org\kuali\rice\kew\routeheader\dao\impl\DocumentRouteHeaderDAOOjbImpl.java
            U impl\src\main\java\org\kuali\rice\kew\util\XmlHelper.java
            U impl\src\main\java\org\kuali\rice\core\proxy\BaseTargetedInvocationHandler.java
            U impl\src\main\java\org\kuali\rice\core\config\RiceConfigurer.java
            U impl\src\main\java\org\kuali\rice\core\config\ModuleConfigurer.java
            U impl\src\main\java\org\kuali\rice\core\config\JAXBConfigImpl.java
            U impl\src\main\java\org\kuali\rice\core\jpa\criteria\Criteria.java
            U impl\src\main\java\org\kuali\rice\kns\maintenance\KualiMaintainableImpl.java
            U impl\src\main\java\org\kuali\rice\kns\maintenance\KualiGlobalMaintainableImpl.java
            U impl\src\main\java\org\kuali\rice\kns\rules\DocumentRuleBase.java
            U impl\src\main\java\org\kuali\rice\kns\exception\InactiveDocumentTypeAuthorizationException.java
            U impl\src\main\java\org\kuali\rice\kns\exception\DocumentAuthorizationException.java
            U impl\src\main\java\org\kuali\rice\kns\exception\AuthorizationException.java
            U impl\src\main\java\org\kuali\rice\kns\exception\DocumentTypeAuthorizationException.java
            A impl\src\main\java\org\kuali\rice\kns\datadictionary\FieldOverride.java
            U impl\src\main\java\org\kuali\rice\kns\datadictionary\BusinessObjectEntry.java
            U impl\src\main\java\org\kuali\rice\kns\datadictionary\validation\charlevel\AlphaNumericValidationPattern.java
            U impl\src\main\java\org\kuali\rice\kns\datadictionary\validation\charlevel\RegexValidationPattern.java
            U impl\src\main\java\org\kuali\rice\kns\datadictionary\validation\ValidationPattern.java
            U impl\src\main\java\org\kuali\rice\kns\datadictionary\validation\fieldlevel\FixedPointValidationPattern.java
            A impl\src\main\java\org\kuali\rice\kns\datadictionary\impl
            A impl\src\main\java\org\kuali\rice\kns\datadictionary\impl\FieldOverrideForListElementDeleteImpl.java
            A impl\src\main\java\org\kuali\rice\kns\datadictionary\impl\FieldOverrideForValueReplaceImpl.java
            A impl\src\main\java\org\kuali\rice\kns\datadictionary\impl\BeanOverrideImpl.java
            A impl\src\main\java\org\kuali\rice\kns\datadictionary\impl\FieldOverrideForListElementInsertImpl.java
            A impl\src\main\java\org\kuali\rice\kns\datadictionary\impl\FieldOverrideForListElementBase.java
            A impl\src\main\java\org\kuali\rice\kns\datadictionary\impl\FieldOverrideForListElementReplaceImpl.java
            U impl\src\main\java\org\kuali\rice\kns\datadictionary\DataDictionary.java
            U impl\src\main\java\org\kuali\rice\kns\datadictionary\MaintainableFieldDefinition.java
            A impl\src\main\java\org\kuali\rice\kns\datadictionary\BeanOverride.java
            U impl\src\main\java\org\kuali\rice\kns\inquiry\KualiInquirableImpl.java
            U impl\src\main\java\org\kuali\rice\kns\bo\PersistableBusinessObjectBase.java
            U impl\src\main\java\org\kuali\rice\kns\bo\ModuleConfiguration.java
            Conflict discovered in 'impl/src/main/java/org/kuali/rice/kns/bo/CountryImpl.java'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\java\org\kuali\rice\kns\bo\CountryImpl.java
            U impl\src\main\java\org\kuali\rice\kns\bo\AttributeReferenceDummy.java
            U impl\src\main\java\org\kuali\rice\kns\bo\Country.java
            A impl\src\main\java\org\kuali\rice\kns\bo\InactivatableFromToImpl.java
            U impl\src\main\java\org\kuali\rice\kns\service\KNSServiceLocator.java
            U impl\src\main\java\org\kuali\rice\kns\service\impl\DataDictionaryServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kns\service\impl\InactivationBlockingDetectionServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kns\service\impl\BusinessObjectDictionaryServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kns\service\impl\CountryServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kns\service\impl\NamespacePermissionTypeServiceImpl.java
            A impl\src\main\java\org\kuali\rice\kns\service\impl\InactivateableFromToServiceImpl.java
            A impl\src\main\java\org\kuali\rice\kns\service\impl\DocumentAdHocServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kns\service\CountryService.java
            A impl\src\main\java\org\kuali\rice\kns\service\InactivateableFromToService.java
            U impl\src\main\java\org\kuali\rice\kns\service\BusinessObjectDictionaryService.java
            A impl\src\main\java\org\kuali\rice\kns\service\DocumentAdHocService.java
            U impl\src\main\java\org\kuali\rice\kns\UserSession.java
            Conflict discovered in 'impl/src/main/java/org/kuali/rice/kns/dao/proxy/DocumentDaoProxy.java'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\java\org\kuali\rice\kns\dao\proxy\DocumentDaoProxy.java
            Conflict discovered in 'impl/src/main/java/org/kuali/rice/kns/dao/proxy/BusinessObjectDaoProxy.java'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\java\org\kuali\rice\kns\dao\proxy\BusinessObjectDaoProxy.java
            Conflict discovered in 'impl/src/main/java/org/kuali/rice/kns/dao/DocumentDao.java'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\java\org\kuali\rice\kns\dao\DocumentDao.java
            U impl\src\main\java\org\kuali\rice\kns\dao\impl\BusinessObjectDaoOjb.java
            Conflict discovered in 'impl/src/main/java/org/kuali/rice/kns/dao/impl/BusinessObjectDaoJpa.java'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\java\org\kuali\rice\kns\dao\impl\BusinessObjectDaoJpa.java
            U impl\src\main\java\org\kuali\rice\kns\dao\impl\LookupDaoOjb.java
            U impl\src\main\java\org\kuali\rice\kns\dao\impl\LookupDaoJpa.java
            Conflict discovered in 'impl/src/main/java/org/kuali/rice/kns/dao/impl/DocumentDaoOjb.java'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\java\org\kuali\rice\kns\dao\impl\DocumentDaoOjb.java
            Conflict discovered in 'impl/src/main/java/org/kuali/rice/kns/dao/impl/DocumentDaoJpa.java'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\java\org\kuali\rice\kns\dao\impl\DocumentDaoJpa.java
            U impl\src\main\java\org\kuali\rice\kns\config\KNSConfigurer.java
            U impl\src\main\java\org\kuali\rice\kns\lookup\KualiLookupableImpl.java
            U impl\src\main\java\org\kuali\rice\kns\lookup\AbstractLookupableHelperServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kns\lookup\KualiLookupableHelperServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kns\lookup\PessimisticLockLookupableHelperServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kns\lookup\LookupUtils.java
            U impl\src\main\java\org\kuali\rice\kns\workflow\attribute\DataDictionaryDocumentSearchCustomizer.java
            U impl\src\main\java\org\kuali\rice\kns\util\FieldUtils.java
            U impl\src\main\java\org\kuali\rice\kns\util\OjbCharBooleanConversion.java
            U impl\src\main\java\org\kuali\rice\kns\util\KNSPropertyConstants.java
            U impl\src\main\java\org\kuali\rice\kns\util\ObjectUtils.java
            U impl\src\main\java\org\kuali\rice\kns\util\RiceKeyConstants.java
            Conflict discovered in 'impl/src/main/java/org/kuali/rice/kns/util/ExceptionUtils.java'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\java\org\kuali\rice\kns\util\ExceptionUtils.java
            A impl\src\main\java\org\kuali\rice\kns\util\SessionTicket.java
            U impl\src\main\java\org\kuali\rice\kns\util\WebUtils.java
            A impl\src\main\java\org\kuali\rice\kns\web\struts\form\AuthorizationExceptionForm.java
            U impl\src\main\java\org\kuali\rice\kns\web\struts\form\KualiTransactionalDocumentFormBase.java
            A impl\src\main\java\org\kuali\rice\kns\web\struts\form\BackdoorForm.java
            A impl\src\main\java\org\kuali\rice\kns\web\struts\form\KualiLogoutForm.java
            U impl\src\main\java\org\kuali\rice\kns\web\struts\form\KualiDocumentFormBase.java
            U impl\src\main\java\org\kuali\rice\kns\web\struts\form\InquiryForm.java
            U impl\src\main\java\org\kuali\rice\kns\web\struts\form\KualiExceptionIncidentForm.java
            A impl\src\main\java\org\kuali\rice\kns\web\struts\pojo\AuthorizationExceptionHandler.java
            U impl\src\main\java\org\kuali\rice\kns\web\struts\action\QuestionPromptAction.java
            U impl\src\main\java\org\kuali\rice\kns\web\struts\action\KualiHelpAction.java
            A impl\src\main\java\org\kuali\rice\kns\web\struts\action\AuthorizationExceptionAction.java
            U impl\src\main\java\org\kuali\rice\kns\web\struts\action\KualiRequestProcessor.java
            A impl\src\main\java\org\kuali\rice\kns\web\struts\action\BackdoorAction.java
            U impl\src\main\java\org\kuali\rice\kns\web\struts\action\KualiInquiryAction.java
            A impl\src\main\java\org\kuali\rice\kns\web\struts\action\KualiLogoutAction.java
            U impl\src\main\java\org\kuali\rice\kns\web\struts\action\KualiDocumentActionBase.java
            A impl\src\main\java\org\kuali\rice\kns\web\filter\AutoLoginFilter.java
            D impl\src\main\java\org\kuali\rice\kns\web\filter\DummyLoginFilter.java
            U impl\src\main\java\org\kuali\rice\kns\web\EditablePropertiesHistoryHolder.java
            A impl\src\main\java\org\kuali\rice\kns\web\format\DateDisplayTimestampObjectFormatter.java
            U impl\src\main\java\org\kuali\rice\kns\web\ui\FieldBridge.java
            U impl\src\main\java\org\kuali\rice\kns\web\ui\SectionBridge.java
            U impl\src\main\java\org\kuali\rice\kns\web\ui\Field.java
            U impl\src\main\java\org\kuali\rice\kns\document\MaintenanceDocumentBase.java
            U impl\src\main\resources\META-INF\kew-config-defaults.xml
            U impl\src\main\resources\META-INF\common-config-defaults.xml
            U impl\src\main\resources\KR-ApplicationResources.properties
            Conflict discovered in 'impl/src/main/resources/org/kuali/rice/kcb/config/KCBSpringBeans-test.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\resources\org\kuali\rice\kcb\config\KCBSpringBeans-test.xml
            Conflict discovered in 'impl/src/main/resources/org/kuali/rice/kcb/config/KCBSpringBeans.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\resources\org\kuali\rice\kcb\config\KCBSpringBeans.xml
            Conflict discovered in 'impl/src/main/resources/org/kuali/rice/ksb/config/KSBJPASpringBeans.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\resources\org\kuali\rice\ksb\config\KSBJPASpringBeans.xml
            Conflict discovered in 'impl/src/main/resources/org/kuali/rice/ksb/config/KSBOJBSpringBeans.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\resources\org\kuali\rice\ksb\config\KSBOJBSpringBeans.xml
            Conflict discovered in 'impl/src/main/resources/org/kuali/rice/ksb/config/KSBModuleConfigurationSpringBeans.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\resources\org\kuali\rice\ksb\config\KSBModuleConfigurationSpringBeans.xml
            Conflict discovered in 'impl/src/main/resources/org/kuali/rice/ksb/config/KSBSpringBeans.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\resources\org\kuali\rice\ksb\config\KSBSpringBeans.xml
            Conflict discovered in 'impl/src/main/resources/org/kuali/rice/ksb/config/KSBThinClientSpringBeans.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\resources\org\kuali\rice\ksb\config\KSBThinClientSpringBeans.xml
            U impl\src\main\resources\org\kuali\rice\kim\bo\datadictionary\GroupDocumentMember.xml
            U impl\src\main\resources\org\kuali\rice\kim\bo\datadictionary\KimBaseBeans.xml
            U impl\src\main\resources\org\kuali\rice\kim\bo\datadictionary\PersonDocumentName.xml
            U impl\src\main\resources\org\kuali\rice\kim\bo\datadictionary\RoleMemberImpl.xml
            U impl\src\main\resources\org\kuali\rice\kim\bo\datadictionary\PersonDocumentGroup.xml
            U impl\src\main\resources\org\kuali\rice\kim\bo\datadictionary\RoleDocumentDelegationMember.xml
            U impl\src\main\resources\org\kuali\rice\kim\bo\datadictionary\KimDocumentRoleMember.xml
            U impl\src\main\resources\org\kuali\rice\kim\bo\datadictionary\PersonDocumentEmploymentInfo.xml
            Conflict discovered in 'impl/src/main/resources/org/kuali/rice/kim/config/KIMImplementationSpringBeans.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\resources\org\kuali\rice\kim\config\KIMImplementationSpringBeans.xml
            U impl\src\main\resources\org\kuali\rice\kim\config\OJB-repository-kim.xml
            Conflict discovered in 'impl/src/main/resources/org/kuali/rice/kim/config/KIMServiceBusSpringBeans.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\resources\org\kuali\rice\kim\config\KIMServiceBusSpringBeans.xml
            Conflict discovered in 'impl/src/main/resources/org/kuali/rice/kim/config/KIMUserInterfaceSpringBeans.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\resources\org\kuali\rice\kim\config\KIMUserInterfaceSpringBeans.xml
            Conflict discovered in 'impl/src/main/resources/org/kuali/rice/kim/config/KIMInterfaceSpringBeans.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\resources\org\kuali\rice\kim\config\KIMInterfaceSpringBeans.xml
            Conflict discovered in 'impl/src/main/resources/org/kuali/rice/kim/config/KIMThinClientSpringBeans.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\resources\org\kuali\rice\kim\config\KIMThinClientSpringBeans.xml
            A impl\src\main\resources\org\kuali\rice\kim\config\KIMServiceBusSOAPDefaultSpringBeans.xml
            Conflict discovered in 'impl/src/main/resources/org/kuali/rice/kew/config/KEWSpringBeans.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\resources\org\kuali\rice\kew\config\KEWSpringBeans.xml
            A impl\src\main\resources\org\kuali\rice\kew\config\KEWServiceBusSOAPDefaultSpringBeans.xml
            Conflict discovered in 'impl/src/main/resources/org/kuali/rice/kew/config/ServerKEWSpringBeans.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\resources\org\kuali\rice\kew\config\ServerKEWSpringBeans.xml
            U impl\src\main\resources\org\kuali\rice\kew\config\OJB-repository-kew.xml
            Conflict discovered in 'impl/src/main/resources/org/kuali/rice/kew/config/KEWJPASpringBeans.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\resources\org\kuali\rice\kew\config\KEWJPASpringBeans.xml
            Conflict discovered in 'impl/src/main/resources/org/kuali/rice/kew/config/KEWOJBSpringBeans.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\resources\org\kuali\rice\kew\config\KEWOJBSpringBeans.xml
            Conflict discovered in 'impl/src/main/resources/org/kuali/rice/kew/config/KEWServiceBusSpringBeans.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\resources\org\kuali\rice\kew\config\KEWServiceBusSpringBeans.xml
            Conflict discovered in 'impl/src/main/resources/org/kuali/rice/core/CommonSpringBeans.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\resources\org\kuali\rice\core\CommonSpringBeans.xml
            Conflict discovered in 'impl/src/main/resources/org/kuali/rice/core/RiceDataSourceSpringBeans.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\resources\org\kuali\rice\core\RiceDataSourceSpringBeans.xml
            A impl\src\main\resources\org\kuali\rice\core\RiceDataSourceStandaloneClientSpringBeans.xml.template
            Conflict discovered in 'impl/src/main/resources/org/kuali/rice/core/RiceJTASpringBeans.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\resources\org\kuali\rice\core\RiceJTASpringBeans.xml
            Conflict discovered in 'impl/src/main/resources/org/kuali/rice/core/CommonOJBSpringBeans.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\resources\org\kuali\rice\core\CommonOJBSpringBeans.xml
            Conflict discovered in 'impl/src/main/resources/org/kuali/rice/standalone/config/StandaloneSpringBeans.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\resources\org\kuali\rice\standalone\config\StandaloneSpringBeans.xml
            U impl\src\main\resources\org\kuali\rice\kns\bo\datadictionary\Campus.xml
            U impl\src\main\resources\org\kuali\rice\kns\bo\datadictionary\AttributeReferenceDummy.xml
            U impl\src\main\resources\org\kuali\rice\kns\bo\datadictionary\Country.xml
            U impl\src\main\resources\org\kuali\rice\kns\bo\datadictionary\DataDictionaryBaseTypes.xml
            U impl\src\main\resources\org\kuali\rice\kns\config\OJB-repository-kns.xml
            Conflict discovered in 'impl/src/main/resources/org/kuali/rice/kns/config/KNSServiceBusSpringBeans.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\resources\org\kuali\rice\kns\config\KNSServiceBusSpringBeans.xml
            Conflict discovered in 'impl/src/main/resources/org/kuali/rice/kns/config/KNSSpringBeans.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\resources\org\kuali\rice\kns\config\KNSSpringBeans.xml
            U impl\src\main\resources\org\kuali\rice\kns\document\datadictionary\CountryMaintenanceDocument.xml
            Conflict discovered in 'impl/src/main/resources/org/kuali/rice/ken/config/KENSpringBeans.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\resources\org\kuali\rice\ken\config\KENSpringBeans.xml
            Conflict discovered in 'impl/src/main/resources/TestHarnessSpringBeans.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\resources\TestHarnessSpringBeans.xml
            U impl\pom.xml
            U config\examples\struts-config.example.xml
            U config\templates\createproject.config.template.xml
            Conflict discovered in 'config/templates/createproject.SpringBeans.template.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C config\templates\createproject.SpringBeans.template.xml
            U config\templates\createproject.pom.template.xml
            A config\templates\createproject.standalone.config.template.xml
            A api\src\main\java\org\kuali\rice\ksb
            A api\src\main\java\org\kuali\rice\ksb\messaging
            A api\src\main\java\org\kuali\rice\ksb\messaging\serviceconnectors
            A api\src\main\java\org\kuali\rice\ksb\messaging\serviceconnectors\ResourceFacade.java
            U api\src\main\java\org\kuali\rice\kim\bo\role\dto\DelegateInfo.java
            U api\src\main\java\org\kuali\rice\kim\bo\role\dto\RoleMemberCompleteInfo.java
            D api\src\main\java\org\kuali\rice\kim\bo\role\dto\InactiveableInfo.java
            U api\src\main\java\org\kuali\rice\kim\bo\group\dto\GroupMembershipInfo.java
            U api\src\main\java\org\kuali\rice\kim\bo\group\dto\GroupInfo.java
            U api\src\main\java\org\kuali\rice\kim\service\ResponsibilityService.java
            U api\src\main\java\org\kuali\rice\kim\service\RoleService.java
            U api\src\main\java\org\kuali\rice\kim\service\RoleUpdateService.java
            U api\src\main\java\org\kuali\rice\kew\service\WorkflowUtility.java
            U api\src\main\java\org\kuali\rice\kew\util\KEWConstants.java
            U api\src\main\java\org\kuali\rice\kew\webservice\SimpleDocumentActionsWebService.java
            U api\src\main\java\org\kuali\rice\core\config\Config.java
            U api\src\main\java\org\kuali\rice\kns\bo\InactivateableFromTo.java
            A api\src\main\java\org\kuali\rice\kns\dto
            A api\src\main\java\org\kuali\rice\kns\dto\InactiveableInfo.java
            U api\src\main\java\org\kuali\rice\kns\util\KNSConstants.java
            U api\pom.xml
            Conflict discovered in 'ken/src/test/resources/KENTestHarnessSpringBeans.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C ken\src\test\resources\KENTestHarnessSpringBeans.xml
            D web\src\test\java\edu\sampleu\travel\bo
            D web\src\test\java\edu\sampleu\travel\infrastructure
            D web\src\test\java\edu\sampleu\travel\remotedservice
            D web\src\test\java\edu\sampleu\travel\web\form
            D web\src\test\java\edu\sampleu\travel\workflow
            D web\src\test\java\edu\sampleu\travel\web\action
            D web\src\test\java\edu\sampleu\travel\document\TravelDocument2.java
            D web\src\test\java\edu\sampleu\travel\document\keyvalue
            D web\src\test\java\edu\sampleu\travel\document\rule
            D web\src\test\java\edu\sampleu\travel\document\authorizer
            U web\src\test\resources\org\kuali\rice\web\test\DefaultSuiteTestData.sql
            D web\src\test\resources\OJB-repository-sampleapp.xml
            D web\src\test\resources\edu\sampleu\travel\datadictionary
            U web\src\main\resources\SampleAppModuleBeans.xml
            A web\src\main\resources\org\kuali\rice\config\RiceStandaloneClientSpringBeans.xml.template
            Conflict discovered in 'web/src/main/resources/org/kuali/rice/config/RiceSpringBeans.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C web\src\main\resources\org\kuali\rice\config\RiceSpringBeans.xml
            U web\src\main\webapp\ksb\WEB-INF\struts-config.xml
            U web\src\main\webapp\kim\WEB-INF\struts-config.xml
            U web\src\main\webapp\rice-portal\css\portal.css
            U web\src\main\webapp\kew\WEB-INF\struts-config.xml
            U web\src\main\webapp\kew\WEB-INF\jsp\AppSpecificRoute.jsp
            A web\src\main\webapp\kew\scripts\prototype.js
            U web\src\main\webapp\WEB-INF\struts-config.xml
            A web\src\main\webapp\WEB-INF\jsp\recurseCheckTabHighlight.jsp
            A web\src\main\webapp\WEB-INF\jsp\recurseRowDisplay.jsp
            U web\src\main\webapp\WEB-INF\tags\kim\personGroup.tag
            U web\src\main\webapp\WEB-INF\tags\kim\personEmpInfo.tag
            U web\src\main\webapp\WEB-INF\tags\kim\personOverview.tag
            U web\src\main\webapp\WEB-INF\tags\kim\groupAssignees.tag
            U web\src\main\webapp\WEB-INF\tags\kim\roleAssignees.tag
            U web\src\main\webapp\WEB-INF\tags\rice-portal\channel\main\sampleTravelApplication.tag
            U web\src\main\webapp\WEB-INF\tags\rice-portal\channel\administration\configuration.tag
            U web\src\main\webapp\WEB-INF\tags\rice-portal\portalBody.tag
            U web\src\main\webapp\WEB-INF\tags\rice-portal\iframePortletContainer.tag
            U web\src\main\webapp\WEB-INF\tags\rice-portal\immutableBar.tag
            U web\src\main\webapp\WEB-INF\tags\rice-portal\portalTop.tag
            U web\src\main\webapp\WEB-INF\tags\kr\subtab.tag
            U web\src\main\webapp\WEB-INF\tags\kr\htmlControlAttribute.tag
            U web\src\main\webapp\WEB-INF\tags\kr\rowDisplay.tag
            Conflict discovered in 'web/src/main/webapp/WEB-INF/tags/kr/containerRowDisplay.tag'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C web\src\main\webapp\WEB-INF\tags\kr\containerRowDisplay.tag
            U web\src\main\webapp\WEB-INF\tags\kr\tab.tag
            U web\src\main\webapp\WEB-INF\tags\kr\notes.tag
            U web\src\main\webapp\WEB-INF\tags\kr\user.tag
            U web\src\main\webapp\WEB-INF\tags\kr\checkTabHighlight.tag
            U web\src\main\webapp\WEB-INF\tags\kr\adHocRecipients.tag
            U web\src\main\webapp\WEB-INF\tags\kr\fieldShowHelpIcon.tag
            A web\src\main\webapp\kr\images\tab-top-right-gray.gif
            A web\src\main\webapp\kr\images\tab-top-left.gif
            A web\src\main\webapp\kr\images\tab-top-left-gray.gif
            A web\src\main\webapp\kr\images\tab-top-right.gif
            U web\src\main\webapp\kr\WEB-INF\struts-config.xml
            U web\src\main\webapp\kr\WEB-INF\jsp\KualiHelp.jsp
            A web\src\main\webapp\kr\WEB-INF\jsp\AuthorizationException.jsp
            U web\src\main\webapp\kr\WEB-INF\jsp\KualiLookup.jsp
            A web\src\main\webapp\kr\static\images\tinybutton-inactivate.gif
            U web\src\main\webapp\kr\css\kuali.css
            Conflict discovered in 'web/pom.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C web\pom.xml
            Summary of conflicts:
            Text conflicts: 63
            Tree conflicts: 5

            Show
            jjhanso Jeremy Hanson added a comment - output from the merge: C:\java\projects\rice-1.1.0>svn merge -r 14215:HEAD https://test.kuali.org/svn/rice/branches/rice-release-1-0-3-br/ — Merging r14216 through r14521 into '.': A ksb\src\test\java\org\kuali\rice\ksb\testclient1\Storage.java A ksb\src\test\java\org\kuali\rice\ksb\testclient1\InboxResourceImpl.java A ksb\src\test\java\org\kuali\rice\ksb\testclient1\MessageResourceImpl.java A ksb\src\test\java\org\kuali\rice\ksb\messaging\RestServiceDefinitionTest.java A ksb\src\test\java\org\kuali\rice\ksb\messaging\remotedservices\Inbox.java A ksb\src\test\java\org\kuali\rice\ksb\messaging\remotedservices\Message.java A ksb\src\test\java\org\kuali\rice\ksb\messaging\remotedservices\InboxResource.java A ksb\src\test\java\org\kuali\rice\ksb\messaging\remotedservices\MessageResource.java U ksb\src\test\java\org\kuali\rice\ksb\messaging\RESTServiceTest.java U ksb\src\test\java\org\kuali\rice\ksb\messaging\RemotedServiceRegistryTest.java U ksb\src\test\java\org\kuali\rice\ksb\messaging\ServiceUpdateAndRemovalTest.java U ksb\src\test\java\org\kuali\rice\ksb\messaging\DevModeTest.java U ksb\src\test\java\org\kuali\rice\ksb\messaging\RemoteResourceLoaderTest.java Conflict discovered in 'ksb/src/test/resources/KSBTestHarnessNoJtaSpring.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C ksb\src\test\resources\KSBTestHarnessNoJtaSpring.xml Conflict discovered in 'ksb/src/test/resources/KSBTestHarnessSpring.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C ksb\src\test\resources\KSBTestHarnessSpring.xml Conflict discovered in 'ksb/src/test/resources/org/kuali/rice/ksb/testclient1/resources/TestClient1SpringBeans.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p (e) edit - change merged file in an editor (df) diff-full - show all changes made to merged file (r) resolved - accept merged version of file (dc) display-conflict - show all conflicts (ignoring merged version) (mc) mine-conflict - accept my version for all conflicts (same) (tc) theirs-conflict - accept their version for all conflicts (same) (mf) mine-full - accept my version of entire file (even non-conflicts) (tf) theirs-full - accept their version of entire file (same) (p) postpone - mark the conflict to be resolved later (l) launch - launch external tool to resolve conflict (s) show all - show this list Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C ksb\src\test\resources\org\kuali\rice\ksb\testclient1\resources\TestClient1SpringBeans.xml Conflict discovered in 'ksb/src/test/resources/org/kuali/rice/ksb/testclient2/resources/TestClient2SpringBeans.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C ksb\src\test\resources\org\kuali\rice\ksb\testclient2\resources\TestClient2SpringBeans.xml A kim\src\test\java\org\kuali\rice\kim\test\bo\group A kim\src\test\java\org\kuali\rice\kim\test\bo\group\impl A kim\src\test\java\org\kuali\rice\kim\test\bo\group\impl\GroupAttributeDataImplTest.java U kim\src\test\java\org\kuali\rice\kim\test\service\GroupServiceImplTest.java U kim\src\test\java\org\kuali\rice\kim\test\service\RoleServiceTest.java A kim\src\test\java\org\kuali\rice\kim\test\GroupMemberImplTest.java U kim\src\test\java\org\kuali\rice\kim\test\KIMTestCase.java U kim\src\test\java\org\kuali\rice\kim\service\impl\RoleServiceImplTest.java A kim\src\test\java\org\kuali\rice\kim\service\KIMServiceLocatorTest.java A kim\src\test\java\org\kuali\rice\kim\util A kim\src\test\java\org\kuali\rice\kim\util\KimCommonUtilsTest.java Conflict discovered in 'kim/src/test/resources/KIMTestHarnessSpringBeans.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C kim\src\test\resources\KIMTestHarnessSpringBeans.xml A kim\src\test\resources\org\kuali\rice\kim\test\CircularRolesTestData.sql A kim\src\test\resources\org\kuali\rice\kim\test\CircularGroupsTestData.sql A sampleapp A sampleapp\scripts A sampleapp\scripts\sql A sampleapp\scripts\sql\mysql A sampleapp\scripts\sql\mysql\create_travel_tables.sql A sampleapp\scripts\sql\mysql\default_travel_data.sql A sampleapp\scripts\sql\oracle A sampleapp\scripts\sql\oracle\create_travel_tables.sql A sampleapp\scripts\sql\oracle\default_travel_data.sql A sampleapp\src A sampleapp\src\main A sampleapp\src\main\java A sampleapp\src\main\java\edu A sampleapp\src\main\java\edu\sampleu A sampleapp\src\main\java\edu\sampleu\travel A sampleapp\src\main\java\edu\sampleu\travel\bo A sampleapp\src\main\java\edu\sampleu\travel\bo\FiscalOfficer.java A sampleapp\src\main\java\edu\sampleu\travel\bo\TravelAccountUseRate.java A sampleapp\src\main\java\edu\sampleu\travel\bo\TravelAccountRules.java A sampleapp\src\main\java\edu\sampleu\travel\bo\TravelAccountExtension.java A sampleapp\src\main\java\edu\sampleu\travel\bo\TravelAccount.java A sampleapp\src\main\java\edu\sampleu\travel\bo\TravelAccountType.java A sampleapp\src\main\java\edu\sampleu\travel\infrastructure A sampleapp\src\main\java\edu\sampleu\travel\infrastructure\TravelServiceLocator.java A sampleapp\src\main\java\edu\sampleu\travel\infrastructure\TravelAppInitializeListener.java A sampleapp\src\main\java\edu\sampleu\travel\infrastructure\Constants.java A sampleapp\src\main\java\edu\sampleu\travel\remotedservice A sampleapp\src\main\java\edu\sampleu\travel\remotedservice\SampleRemotedService.java A sampleapp\src\main\java\edu\sampleu\travel\workflow A sampleapp\src\main\java\edu\sampleu\travel\workflow\AccountAttribute.java A sampleapp\src\main\java\edu\sampleu\travel\workflow\XmlUtils.java A sampleapp\src\main\java\edu\sampleu\travel\workflow\EmployeeAttribute.java A sampleapp\src\main\java\edu\sampleu\travel\workflow\CustomActionListAttributeImpl.java A sampleapp\src\main\java\edu\sampleu\travel\workflow\DestinationRuleAttribute.java A sampleapp\src\main\java\edu\sampleu\travel\web A sampleapp\src\main\java\edu\sampleu\travel\web\form A sampleapp\src\main\java\edu\sampleu\travel\web\form\TravelDocumentForm2.java A sampleapp\src\main\java\edu\sampleu\travel\web\action A sampleapp\src\main\java\edu\sampleu\travel\web\action\TravelDocumentAction2.java A sampleapp\src\main\java\edu\sampleu\travel\document A sampleapp\src\main\java\edu\sampleu\travel\document\keyvalue A sampleapp\src\main\java\edu\sampleu\travel\document\keyvalue\AccountTypeKeyValues.java A sampleapp\src\main\java\edu\sampleu\travel\document\keyvalue\TravelRequestType.java A sampleapp\src\main\java\edu\sampleu\travel\document\rule A sampleapp\src\main\java\edu\sampleu\travel\document\rule\TravelDocumentRule.java A sampleapp\src\main\java\edu\sampleu\travel\document\authorizer A sampleapp\src\main\java\edu\sampleu\travel\document\authorizer\TravelDocumentAuthorizer.java A sampleapp\src\main\java\edu\sampleu\travel\document\authorizer\TravelDocumentPresentationController.java A sampleapp\src\main\java\edu\sampleu\travel\document\TravelDocument2.java A sampleapp\src\main\resources A sampleapp\src\main\resources\OJB-repository-sampleapp.xml A sampleapp\src\main\resources\edu A sampleapp\src\main\resources\edu\sampleu A sampleapp\src\main\resources\edu\sampleu\travel A sampleapp\src\main\resources\edu\sampleu\travel\datadictionary A sampleapp\src\main\resources\edu\sampleu\travel\datadictionary\FiscalOfficerMaintenanceDocument.xml A sampleapp\src\main\resources\edu\sampleu\travel\datadictionary\TravelAccountUseRate.xml A sampleapp\src\main\resources\edu\sampleu\travel\datadictionary\TravelRequestDocument.xml A sampleapp\src\main\resources\edu\sampleu\travel\datadictionary\TravelAccountExtension.xml A sampleapp\src\main\resources\edu\sampleu\travel\datadictionary\FiscalOfficer-Extension.xml A sampleapp\src\main\resources\edu\sampleu\travel\datadictionary\TravelAccount.xml A sampleapp\src\main\resources\edu\sampleu\travel\datadictionary\TravelAccountMaintenanceDocument.xml A sampleapp\src\main\resources\edu\sampleu\travel\datadictionary\TravelAccountType.xml A sampleapp\src\main\resources\edu\sampleu\travel\datadictionary\FiscalOfficer.xml A sampleapp\pom.xml U kew\src\test\java\org\kuali\rice\kew\batch\XmlIngestionTest.java U kew\src\test\java\org\kuali\rice\kew\routing\RoutingWithEmptyWorkGroupTest.java U kew\src\test\java\org\kuali\rice\kew\routemanager\ExceptionRoutingTest.java U kew\src\test\java\org\kuali\rice\kew\routemanager\ExceptionRoutingTestPostProcessor.java U kew\src\test\java\org\kuali\rice\kew\docsearch\SearchableAttributeTest.java U kew\src\test\java\org\kuali\rice\kew\actions\SimpleDocumentActionsWebServiceTest.java U kew\src\test\java\org\kuali\rice\kew\role\RoleRouteModuleTest.java U kew\src\test\java\org\kuali\rice\core\util\ClientDocumentDaoOjb.java A kew\src\test\java\mocks\MockJavaMailSender.java A kew\src\test\java\mocks\MockMailer.java Conflict discovered in 'kew/src/test/resources/org/kuali/rice/kew/clientapp/ThinClientSpringBeans.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C kew\src\test\resources\org\kuali\rice\kew\clientapp\ThinClientSpringBeans.xml A kew\src\test\resources\org\kuali\rice\kew\batch\data\widgetsTest.xml Conflict discovered in 'kew/src/test/resources/org/kuali/rice/kew/docsearch/xml/SearchableAttributeProcessorSpring.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C kew\src\test\resources\org\kuali\rice\kew\docsearch\xml\SearchableAttributeProcessorSpring.xml Conflict discovered in 'kew/src/test/resources/org/kuali/rice/kew/docsearch/xml/SearchableAttributesSpringBeans.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C kew\src\test\resources\org\kuali\rice\kew\docsearch\xml\SearchableAttributesSpringBeans.xml A kew\src\test\resources\org\kuali\rice\kew\docsearch\SearchableTrimTest.xml U kew\src\test\resources\org\kuali\rice\kew\edl\widgets.xml Conflict discovered in 'kew/src/test/resources/org/kuali/rice/kew/config/TestKEWSpringBeans.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C kew\src\test\resources\org\kuali\rice\kew\config\TestKEWSpringBeans.xml Conflict discovered in 'kew/src/test/resources/org/kuali/rice/kew/config/TestSpring.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C kew\src\test\resources\org\kuali\rice\kew\config\TestSpring.xml Conflict discovered in 'kew/src/test/resources/org/kuali/rice/kew/config/OverrideTestSpringBeans.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C kew\src\test\resources\org\kuali\rice\kew\config\OverrideTestSpringBeans.xml Conflict discovered in 'kew/src/test/resources/org/kuali/rice/kew/rule/TestRouteTemplateSpring.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C kew\src\test\resources\org\kuali\rice\kew\rule\TestRouteTemplateSpring.xml Conflict discovered in 'kew/src/test/resources/org/kuali/rice/core/util/RiceServiceOverrideTestSpringBeans.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C kew\src\test\resources\org\kuali\rice\core\util\RiceServiceOverrideTestSpringBeans.xml U kew\pom.xml U scripts\dataset\bootstrap-server-dataset-cleanup.sql A scripts\upgrades\1.0.2 to 1.0.3\db-updates-client A scripts\upgrades\1.0.2 to 1.0.3\db-updates-client\mysql A scripts\upgrades\1.0.2 to 1.0.3\db-updates-client\mysql\2010-09-09.sql A scripts\upgrades\1.0.2 to 1.0.3\db-updates-client\oracle A scripts\upgrades\1.0.2 to 1.0.3\db-updates-client\oracle\2010-09-09.sql A scripts\upgrades\1.0.2 to 1.0.3\db-updates\mysql A scripts\upgrades\1.0.2 to 1.0.3\db-updates\mysql\2010-06-30.sql A scripts\upgrades\1.0.2 to 1.0.3\db-updates\mysql\2010-05-14.sql A scripts\upgrades\1.0.2 to 1.0.3\db-updates\mysql\2010-09-01.sql A scripts\upgrades\1.0.2 to 1.0.3\db-updates\mysql\2010-06-23.sql A scripts\upgrades\1.0.2 to 1.0.3\db-updates\mysql\2010-09-02.sql A scripts\upgrades\1.0.2 to 1.0.3\db-updates\mysql\2010-09-14.sql A scripts\upgrades\1.0.2 to 1.0.3\db-updates\mysql\2010-09-24.sql A scripts\upgrades\1.0.2 to 1.0.3\db-updates\mysql\2010-09-09.sql A scripts\upgrades\1.0.2 to 1.0.3\db-updates\mysql\2010-09-28.sql A scripts\upgrades\1.0.2 to 1.0.3\db-updates\oracle A scripts\upgrades\1.0.2 to 1.0.3\db-updates\oracle\2010-06-30.sql A scripts\upgrades\1.0.2 to 1.0.3\db-updates\oracle\2010-05-14.sql A scripts\upgrades\1.0.2 to 1.0.3\db-updates\oracle\2010-09-01.sql A scripts\upgrades\1.0.2 to 1.0.3\db-updates\oracle\2010-06-23.sql A scripts\upgrades\1.0.2 to 1.0.3\db-updates\oracle\2010-09-02.sql A scripts\upgrades\1.0.2 to 1.0.3\db-updates\oracle\2010-09-14.sql A scripts\upgrades\1.0.2 to 1.0.3\db-updates\oracle\2010-09-24.sql A scripts\upgrades\1.0.2 to 1.0.3\db-updates\oracle\2010-09-09.sql A scripts\upgrades\1.0.2 to 1.0.3\db-updates\oracle\2010-09-28.sql D scripts\upgrades\1.0.2 to 1.0.3\db-updates\2010-06-23.sql D scripts\upgrades\1.0.2 to 1.0.3\db-updates\mysql-2010-05-14.sql D scripts\upgrades\1.0.2 to 1.0.3\db-updates\2010-01-26.sql D scripts\upgrades\1.0.2 to 1.0.3\db-updates\2010-06-30.sql D scripts\upgrades\1.0.2 to 1.0.3\db-updates\2010-05-14.sql A scripts\upgrades\1.0.2 to 1.0.3\CountryCodeUpdateGenerator.groovy A scripts\upgrades\1.0.1.1 to 1.0.2\final\update_client_final_mysql.sql A scripts\upgrades\1.0.1.1 to 1.0.2\final\update_client_final_oracle.sql U scripts\upgrades\1.0.1.1 to 1.0.2\final\udpate_final_mysql.sql U scripts\upgrades\1.0.1.1 to 1.0.2\final\update_final_oracle.sql U scripts\createproject.groovy Conflict discovered in 'pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p (e) edit - change merged file in an editor (df) diff-full - show all changes made to merged file (r) resolved - accept merged version of file (dc) display-conflict - show all conflicts (ignoring merged version) (mc) mine-conflict - accept my version for all conflicts (same) (tc) theirs-conflict - accept their version for all conflicts (same) (mf) mine-full - accept my version of entire file (even non-conflicts) (tf) theirs-full - accept their version of entire file (same) (p) postpone - mark the conflict to be resolved later (l) launch - launch external tool to resolve conflict (s) show all - show this list Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C pom.xml U kns\src\test\java\org\kuali\rice\kns\datadictionary\validation\fieldlevel\FixedPointValidationPatternTest.java A kns\src\test\java\org\kuali\rice\kns\bo\AttributeReferenceElementsTest.java A kns\src\test\java\org\kuali\rice\kns\bo\PostalCodeImplTest.java A kns\src\test\java\org\kuali\rice\kns\bo\PersistableAttachmentBaseTest.java A kns\src\test\java\org\kuali\rice\kns\bo\SessionDocumentTest.java C kns\src\test\java\org\kuali\rice\kns\bo\StateImplTest.java C kns\src\test\java\org\kuali\rice\kns\bo\CountryImplTest.java A kns\src\test\java\org\kuali\rice\kns\bo\DocumentAttachmentTest.java C kns\src\test\java\org\kuali\rice\kns\bo\NoteTypeTest.java A kns\src\test\java\org\kuali\rice\kns\bo\AttachmentTest.java A kns\src\test\java\org\kuali\rice\kns\bo\BusinessObjectAttributeEntryTest.java C kns\src\test\java\org\kuali\rice\kns\bo\CampusImplTest.java A kns\src\test\java\org\kuali\rice\kns\bo\LookupResultsTest.java C kns\src\test\java\org\kuali\rice\kns\bo\CampusTypeImplTest.java A kns\src\test\java\org\kuali\rice\kns\bo\AttributeReferenceDummyTest.java A kns\src\test\java\org\kuali\rice\kns\service\InactivateableFromToServiceTest.java A kns\src\test\java\org\kuali\rice\kns\util\PatternedStringBuilderTest.java U kns\src\test\java\org\kuali\rice\kns\util\ObjectUtilsTest.java U kns\src\test\java\org\kuali\rice\kns\util\WebUtilsTest.java A kns\src\test\resources\testAccountUseRate.sql Conflict discovered in 'kns/src/test/resources/KnsTestSpringBeans.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C kns\src\test\resources\KnsTestSpringBeans.xml A kns\src\test\resources\org\kuali\rice\kns\test\document\TravelAccountUseRate.xml U kns\src\test\resources\OJB-repository-kns-test.xml Conflict discovered in 'kns/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C kns\pom.xml U build.xml Conflict discovered in 'kcb/src/test/resources/KCBTestHarnessSpringBeans.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C kcb\src\test\resources\KCBTestHarnessSpringBeans.xml Conflict discovered in '.classpath'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C .classpath U impl\src\test\java\org\kuali\rice\core\xml\JaxpSchemaValidationTest.java Conflict discovered in 'impl/src/test/resources/org/kuali/rice/core/database/MultipleDatabaseTransactionTestSpring.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\test\resources\org\kuali\rice\core\database\MultipleDatabaseTransactionTestSpring.xml U impl\src\test\resources\org\kuali\rice\core\config\jaxb-test-import-config.xml Conflict discovered in 'impl/src/test/resources/org/kuali/rice/core/jta/JtaTestSpring.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\test\resources\org\kuali\rice\core\jta\JtaTestSpring.xml U impl\src\main\java\org\kuali\rice\ksb\service\KSBServiceLocator.java U impl\src\main\java\org\kuali\rice\ksb\messaging\MessageServiceInvoker.java U impl\src\main\java\org\kuali\rice\ksb\messaging\servlet\KSBHttpInvokerHandler.java U impl\src\main\java\org\kuali\rice\ksb\messaging\dao\ServiceInfoDAO.java U impl\src\main\java\org\kuali\rice\ksb\messaging\dao\impl\ServiceInfoDAOJpaImpl.java U impl\src\main\java\org\kuali\rice\ksb\messaging\dao\impl\ServiceInfoDAOOjbImpl.java U impl\src\main\java\org\kuali\rice\ksb\messaging\exceptionhandling\MessageExceptionHandler.java U impl\src\main\java\org\kuali\rice\ksb\messaging\exceptionhandling\DefaultExceptionServiceImpl.java U impl\src\main\java\org\kuali\rice\ksb\messaging\exceptionhandling\DefaultMessageExceptionHandler.java U impl\src\main\java\org\kuali\rice\ksb\messaging\exceptionhandling\ExceptionRoutingService.java U impl\src\main\java\org\kuali\rice\ksb\messaging\RemotedServiceRegistryImpl.java U impl\src\main\java\org\kuali\rice\ksb\messaging\serviceexporters\RESTServiceExporter.java U impl\src\main\java\org\kuali\rice\ksb\messaging\web\MessageQueueAction.java U impl\src\main\java\org\kuali\rice\ksb\messaging\BusClientFailureProxy.java U impl\src\main\java\org\kuali\rice\ksb\messaging\RESTServiceDefinition.java U impl\src\main\java\org\kuali\rice\ksb\messaging\RemotedServiceRegistry.java U impl\src\main\java\org\kuali\rice\ksb\messaging\ServiceInfo.java U impl\src\main\java\org\kuali\rice\ksb\messaging\serviceconnectors\AbstractServiceConnector.java U impl\src\main\java\org\kuali\rice\ksb\messaging\serviceconnectors\RESTConnector.java A impl\src\main\java\org\kuali\rice\ksb\messaging\serviceconnectors\ResourceFacadeImpl.java U impl\src\main\java\org\kuali\rice\ksb\messaging\service\impl\ServiceRegistryImpl.java U impl\src\main\java\org\kuali\rice\ksb\messaging\service\ServiceRegistry.java U impl\src\main\java\org\kuali\rice\ksb\messaging\RemoteResourceServiceLocatorImpl.java U impl\src\main\java\org\kuali\rice\ksb\util\KSBConstants.java U impl\src\main\java\org\kuali\rice\kim\bo\impl\GroupImpl.java U impl\src\main\java\org\kuali\rice\kim\bo\impl\KimAbstractMemberImpl.java D impl\src\main\java\org\kuali\rice\kim\bo\impl\InactivatableFromToImpl.java U impl\src\main\java\org\kuali\rice\kim\bo\role\impl\KimDelegationMemberImpl.java Conflict discovered in 'impl/src/main/java/org/kuali/rice/kim/bo/role/impl/RoleMemberImpl.java'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\java\org\kuali\rice\kim\bo\role\impl\RoleMemberImpl.java Conflict discovered in 'impl/src/main/java/org/kuali/rice/kim/bo/ui/PersonDocumentGroup.java'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\java\org\kuali\rice\kim\bo\ui\PersonDocumentGroup.java Conflict discovered in 'impl/src/main/java/org/kuali/rice/kim/bo/ui/KimDocumentBoBase.java'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\java\org\kuali\rice\kim\bo\ui\KimDocumentBoBase.java Conflict discovered in 'impl/src/main/java/org/kuali/rice/kim/service/impl/GroupServiceImpl.java'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\java\org\kuali\rice\kim\service\impl\GroupServiceImpl.java U impl\src\main\java\org\kuali\rice\kim\service\impl\RoleManagementServiceImpl.java U impl\src\main\java\org\kuali\rice\kim\service\impl\GroupUpdateServiceImpl.java U impl\src\main\java\org\kuali\rice\kim\service\impl\RoleServiceImpl.java U impl\src\main\java\org\kuali\rice\kim\service\impl\RoleUpdateServiceImpl.java U impl\src\main\java\org\kuali\rice\kim\service\impl\GroupServiceBase.java U impl\src\main\java\org\kuali\rice\kim\service\impl\PersonServiceImpl.java U impl\src\main\java\org\kuali\rice\kim\service\impl\RoleServiceBase.java U impl\src\main\java\org\kuali\rice\kim\service\impl\UiDocumentServiceImpl.java U impl\src\main\java\org\kuali\rice\kim\service\impl\IdentityArchiveServiceImpl.java U impl\src\main\java\org\kuali\rice\kim\service\KIMServiceLocator.java U impl\src\main\java\org\kuali\rice\kim\dao\impl\KimRoleDaoOjb.java U impl\src\main\java\org\kuali\rice\kim\dao\impl\KimGroupDaoOjb.java U impl\src\main\java\org\kuali\rice\kim\dao\KimRoleDao.java U impl\src\main\java\org\kuali\rice\kim\config\KIMConfigurer.java U impl\src\main\java\org\kuali\rice\kim\lookup\ResponsibilityLookupableHelperServiceImpl.java U impl\src\main\java\org\kuali\rice\kim\lookup\PermissionLookupableHelperServiceImpl.java U impl\src\main\java\org\kuali\rice\kim\lookup\RoleMemberLookupableHelperServiceImpl.java U impl\src\main\java\org\kuali\rice\kim\lookup\GroupLookupableHelperServiceImpl.java U impl\src\main\java\org\kuali\rice\kim\lookup\RoleLookupableHelperServiceImpl.java U impl\src\main\java\org\kuali\rice\kim\lookup\PersonLookupableHelperServiceImpl.java U impl\src\main\java\org\kuali\rice\kim\rules\ui\PersonDocumentGroupRule.java U impl\src\main\java\org\kuali\rice\kim\rules\ui\GroupDocumentMemberRule.java U impl\src\main\java\org\kuali\rice\kim\util\KIMPropertyConstants.java U impl\src\main\java\org\kuali\rice\kim\util\KimCommonUtils.java U impl\src\main\java\org\kuali\rice\kim\web\struts\form\IdentityManagementPersonDocumentForm.java U impl\src\main\java\org\kuali\rice\kim\web\struts\form\IdentityManagementDocumentFormBase.java U impl\src\main\java\org\kuali\rice\kim\web\struts\form\IdentityManagementGroupDocumentForm.java U impl\src\main\java\org\kuali\rice\kim\web\struts\form\IdentityManagementRoleDocumentForm.java U impl\src\main\java\org\kuali\rice\kim\web\struts\action\IdentityManagementGroupDocumentAction.java U impl\src\main\java\org\kuali\rice\kim\web\struts\action\IdentityManagementRoleDocumentAction.java U impl\src\main\java\org\kuali\rice\kim\web\struts\action\IdentityManagementPersonDocumentAction.java U impl\src\main\java\org\kuali\rice\kim\web\struts\action\IdentityManagementDocumentActionBase.java U impl\src\main\java\org\kuali\rice\kim\document\rule\IdentityManagementRoleDocumentRule.java U impl\src\main\java\org\kuali\rice\kim\document\rule\IdentityManagementPersonDocumentRule.java A impl\src\main\java\org\kuali\rice\kim\document\rule\ActiveRoleMemberHelper.java U impl\src\main\java\org\kuali\rice\kim\document\rule\IdentityManagementGroupDocumentRule.java U impl\src\main\java\org\kuali\rice\kim\document\IdentityManagementPersonDocument.java U impl\src\main\java\org\kuali\rice\kew\exception\WorkflowDocumentExceptionRoutingService.java U impl\src\main\java\org\kuali\rice\kew\webservice\impl\SimpleDocumentActionsWebServiceImpl.java U impl\src\main\java\org\kuali\rice\kew\doctype\LazyLoadSecurityAttribute.java U impl\src\main\java\org\kuali\rice\kew\messaging\exceptionhandling\DocumentMessageExceptionHandler.java U impl\src\main\java\org\kuali\rice\kew\messaging\exceptionhandling\ExceptionRoutingServiceImpl.java D impl\src\main\java\org\kuali\rice\kew\web\backdoor U impl\src\main\java\org\kuali\rice\kew\mail\service\impl\ActionListEmailServiceImpl.java U impl\src\main\java\org\kuali\rice\kew\mail\service\impl\StyleableEmailContentServiceImpl.java U impl\src\main\java\org\kuali\rice\kew\mail\service\impl\DefaultEmailService.java U impl\src\main\java\org\kuali\rice\kew\mail\EmailStyleHelper.java U impl\src\main\java\org\kuali\rice\kew\actionrequest\service\impl\ActionRequestServiceImpl.java U impl\src\main\java\org\kuali\rice\kew\notes\web\AttachmentServlet.java U impl\src\main\java\org\kuali\rice\kew\service\impl\DocumentTypeResponsibilityTypeServiceImpl.java U impl\src\main\java\org\kuali\rice\kew\service\impl\ReviewResponsibilityTypeServiceImpl.java U impl\src\main\java\org\kuali\rice\kew\service\impl\AdhocReviewPermissionTypeServiceImpl.java U impl\src\main\java\org\kuali\rice\kew\xml\export\XmlExporterServiceImpl.java U impl\src\main\java\org\kuali\rice\kew\xml\RuleAttributeXmlParser.java U impl\src\main\java\org\kuali\rice\kew\preferences\service\impl\PreferencesServiceImpl.java U impl\src\main\java\org\kuali\rice\kew\role\service\impl\ActionRequestDerivedRoleTypeServiceImpl.java U impl\src\main\java\org\kuali\rice\kew\role\service\impl\RouteLogDerivedRoleTypeServiceImpl.java U impl\src\main\java\org\kuali\rice\kew\role\RoleRouteModule.java U impl\src\main\java\org\kuali\rice\kew\edl\EDLDatabasePostProcessor.java U impl\src\main\java\org\kuali\rice\kew\edl\components\BrowserHandler.java U impl\src\main\java\org\kuali\rice\kew\edl\components\AnnotationComponent.java U impl\src\main\java\org\kuali\rice\kew\edl\EDLServlet.java U impl\src\main\java\org\kuali\rice\kew\edl\EDocLitePostProcessor.java U impl\src\main\java\org\kuali\rice\kew\engine\StandardWorkflowEngine.java U impl\src\main\java\org\kuali\rice\kew\engine\node\RouteNodeInstance.java U impl\src\main\java\org\kuali\rice\kew\config\KEWConfigurer.java U impl\src\main\java\org\kuali\rice\kew\routeheader\dao\impl\DocumentRouteHeaderDAOOjbImpl.java U impl\src\main\java\org\kuali\rice\kew\util\XmlHelper.java U impl\src\main\java\org\kuali\rice\core\proxy\BaseTargetedInvocationHandler.java U impl\src\main\java\org\kuali\rice\core\config\RiceConfigurer.java U impl\src\main\java\org\kuali\rice\core\config\ModuleConfigurer.java U impl\src\main\java\org\kuali\rice\core\config\JAXBConfigImpl.java U impl\src\main\java\org\kuali\rice\core\jpa\criteria\Criteria.java U impl\src\main\java\org\kuali\rice\kns\maintenance\KualiMaintainableImpl.java U impl\src\main\java\org\kuali\rice\kns\maintenance\KualiGlobalMaintainableImpl.java U impl\src\main\java\org\kuali\rice\kns\rules\DocumentRuleBase.java U impl\src\main\java\org\kuali\rice\kns\exception\InactiveDocumentTypeAuthorizationException.java U impl\src\main\java\org\kuali\rice\kns\exception\DocumentAuthorizationException.java U impl\src\main\java\org\kuali\rice\kns\exception\AuthorizationException.java U impl\src\main\java\org\kuali\rice\kns\exception\DocumentTypeAuthorizationException.java A impl\src\main\java\org\kuali\rice\kns\datadictionary\FieldOverride.java U impl\src\main\java\org\kuali\rice\kns\datadictionary\BusinessObjectEntry.java U impl\src\main\java\org\kuali\rice\kns\datadictionary\validation\charlevel\AlphaNumericValidationPattern.java U impl\src\main\java\org\kuali\rice\kns\datadictionary\validation\charlevel\RegexValidationPattern.java U impl\src\main\java\org\kuali\rice\kns\datadictionary\validation\ValidationPattern.java U impl\src\main\java\org\kuali\rice\kns\datadictionary\validation\fieldlevel\FixedPointValidationPattern.java A impl\src\main\java\org\kuali\rice\kns\datadictionary\impl A impl\src\main\java\org\kuali\rice\kns\datadictionary\impl\FieldOverrideForListElementDeleteImpl.java A impl\src\main\java\org\kuali\rice\kns\datadictionary\impl\FieldOverrideForValueReplaceImpl.java A impl\src\main\java\org\kuali\rice\kns\datadictionary\impl\BeanOverrideImpl.java A impl\src\main\java\org\kuali\rice\kns\datadictionary\impl\FieldOverrideForListElementInsertImpl.java A impl\src\main\java\org\kuali\rice\kns\datadictionary\impl\FieldOverrideForListElementBase.java A impl\src\main\java\org\kuali\rice\kns\datadictionary\impl\FieldOverrideForListElementReplaceImpl.java U impl\src\main\java\org\kuali\rice\kns\datadictionary\DataDictionary.java U impl\src\main\java\org\kuali\rice\kns\datadictionary\MaintainableFieldDefinition.java A impl\src\main\java\org\kuali\rice\kns\datadictionary\BeanOverride.java U impl\src\main\java\org\kuali\rice\kns\inquiry\KualiInquirableImpl.java U impl\src\main\java\org\kuali\rice\kns\bo\PersistableBusinessObjectBase.java U impl\src\main\java\org\kuali\rice\kns\bo\ModuleConfiguration.java Conflict discovered in 'impl/src/main/java/org/kuali/rice/kns/bo/CountryImpl.java'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\java\org\kuali\rice\kns\bo\CountryImpl.java U impl\src\main\java\org\kuali\rice\kns\bo\AttributeReferenceDummy.java U impl\src\main\java\org\kuali\rice\kns\bo\Country.java A impl\src\main\java\org\kuali\rice\kns\bo\InactivatableFromToImpl.java U impl\src\main\java\org\kuali\rice\kns\service\KNSServiceLocator.java U impl\src\main\java\org\kuali\rice\kns\service\impl\DataDictionaryServiceImpl.java U impl\src\main\java\org\kuali\rice\kns\service\impl\InactivationBlockingDetectionServiceImpl.java U impl\src\main\java\org\kuali\rice\kns\service\impl\BusinessObjectDictionaryServiceImpl.java U impl\src\main\java\org\kuali\rice\kns\service\impl\CountryServiceImpl.java U impl\src\main\java\org\kuali\rice\kns\service\impl\NamespacePermissionTypeServiceImpl.java A impl\src\main\java\org\kuali\rice\kns\service\impl\InactivateableFromToServiceImpl.java A impl\src\main\java\org\kuali\rice\kns\service\impl\DocumentAdHocServiceImpl.java U impl\src\main\java\org\kuali\rice\kns\service\CountryService.java A impl\src\main\java\org\kuali\rice\kns\service\InactivateableFromToService.java U impl\src\main\java\org\kuali\rice\kns\service\BusinessObjectDictionaryService.java A impl\src\main\java\org\kuali\rice\kns\service\DocumentAdHocService.java U impl\src\main\java\org\kuali\rice\kns\UserSession.java Conflict discovered in 'impl/src/main/java/org/kuali/rice/kns/dao/proxy/DocumentDaoProxy.java'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\java\org\kuali\rice\kns\dao\proxy\DocumentDaoProxy.java Conflict discovered in 'impl/src/main/java/org/kuali/rice/kns/dao/proxy/BusinessObjectDaoProxy.java'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\java\org\kuali\rice\kns\dao\proxy\BusinessObjectDaoProxy.java Conflict discovered in 'impl/src/main/java/org/kuali/rice/kns/dao/DocumentDao.java'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\java\org\kuali\rice\kns\dao\DocumentDao.java U impl\src\main\java\org\kuali\rice\kns\dao\impl\BusinessObjectDaoOjb.java Conflict discovered in 'impl/src/main/java/org/kuali/rice/kns/dao/impl/BusinessObjectDaoJpa.java'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\java\org\kuali\rice\kns\dao\impl\BusinessObjectDaoJpa.java U impl\src\main\java\org\kuali\rice\kns\dao\impl\LookupDaoOjb.java U impl\src\main\java\org\kuali\rice\kns\dao\impl\LookupDaoJpa.java Conflict discovered in 'impl/src/main/java/org/kuali/rice/kns/dao/impl/DocumentDaoOjb.java'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\java\org\kuali\rice\kns\dao\impl\DocumentDaoOjb.java Conflict discovered in 'impl/src/main/java/org/kuali/rice/kns/dao/impl/DocumentDaoJpa.java'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\java\org\kuali\rice\kns\dao\impl\DocumentDaoJpa.java U impl\src\main\java\org\kuali\rice\kns\config\KNSConfigurer.java U impl\src\main\java\org\kuali\rice\kns\lookup\KualiLookupableImpl.java U impl\src\main\java\org\kuali\rice\kns\lookup\AbstractLookupableHelperServiceImpl.java U impl\src\main\java\org\kuali\rice\kns\lookup\KualiLookupableHelperServiceImpl.java U impl\src\main\java\org\kuali\rice\kns\lookup\PessimisticLockLookupableHelperServiceImpl.java U impl\src\main\java\org\kuali\rice\kns\lookup\LookupUtils.java U impl\src\main\java\org\kuali\rice\kns\workflow\attribute\DataDictionaryDocumentSearchCustomizer.java U impl\src\main\java\org\kuali\rice\kns\util\FieldUtils.java U impl\src\main\java\org\kuali\rice\kns\util\OjbCharBooleanConversion.java U impl\src\main\java\org\kuali\rice\kns\util\KNSPropertyConstants.java U impl\src\main\java\org\kuali\rice\kns\util\ObjectUtils.java U impl\src\main\java\org\kuali\rice\kns\util\RiceKeyConstants.java Conflict discovered in 'impl/src/main/java/org/kuali/rice/kns/util/ExceptionUtils.java'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\java\org\kuali\rice\kns\util\ExceptionUtils.java A impl\src\main\java\org\kuali\rice\kns\util\SessionTicket.java U impl\src\main\java\org\kuali\rice\kns\util\WebUtils.java A impl\src\main\java\org\kuali\rice\kns\web\struts\form\AuthorizationExceptionForm.java U impl\src\main\java\org\kuali\rice\kns\web\struts\form\KualiTransactionalDocumentFormBase.java A impl\src\main\java\org\kuali\rice\kns\web\struts\form\BackdoorForm.java A impl\src\main\java\org\kuali\rice\kns\web\struts\form\KualiLogoutForm.java U impl\src\main\java\org\kuali\rice\kns\web\struts\form\KualiDocumentFormBase.java U impl\src\main\java\org\kuali\rice\kns\web\struts\form\InquiryForm.java U impl\src\main\java\org\kuali\rice\kns\web\struts\form\KualiExceptionIncidentForm.java A impl\src\main\java\org\kuali\rice\kns\web\struts\pojo\AuthorizationExceptionHandler.java U impl\src\main\java\org\kuali\rice\kns\web\struts\action\QuestionPromptAction.java U impl\src\main\java\org\kuali\rice\kns\web\struts\action\KualiHelpAction.java A impl\src\main\java\org\kuali\rice\kns\web\struts\action\AuthorizationExceptionAction.java U impl\src\main\java\org\kuali\rice\kns\web\struts\action\KualiRequestProcessor.java A impl\src\main\java\org\kuali\rice\kns\web\struts\action\BackdoorAction.java U impl\src\main\java\org\kuali\rice\kns\web\struts\action\KualiInquiryAction.java A impl\src\main\java\org\kuali\rice\kns\web\struts\action\KualiLogoutAction.java U impl\src\main\java\org\kuali\rice\kns\web\struts\action\KualiDocumentActionBase.java A impl\src\main\java\org\kuali\rice\kns\web\filter\AutoLoginFilter.java D impl\src\main\java\org\kuali\rice\kns\web\filter\DummyLoginFilter.java U impl\src\main\java\org\kuali\rice\kns\web\EditablePropertiesHistoryHolder.java A impl\src\main\java\org\kuali\rice\kns\web\format\DateDisplayTimestampObjectFormatter.java U impl\src\main\java\org\kuali\rice\kns\web\ui\FieldBridge.java U impl\src\main\java\org\kuali\rice\kns\web\ui\SectionBridge.java U impl\src\main\java\org\kuali\rice\kns\web\ui\Field.java U impl\src\main\java\org\kuali\rice\kns\document\MaintenanceDocumentBase.java U impl\src\main\resources\META-INF\kew-config-defaults.xml U impl\src\main\resources\META-INF\common-config-defaults.xml U impl\src\main\resources\KR-ApplicationResources.properties Conflict discovered in 'impl/src/main/resources/org/kuali/rice/kcb/config/KCBSpringBeans-test.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\resources\org\kuali\rice\kcb\config\KCBSpringBeans-test.xml Conflict discovered in 'impl/src/main/resources/org/kuali/rice/kcb/config/KCBSpringBeans.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\resources\org\kuali\rice\kcb\config\KCBSpringBeans.xml Conflict discovered in 'impl/src/main/resources/org/kuali/rice/ksb/config/KSBJPASpringBeans.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\resources\org\kuali\rice\ksb\config\KSBJPASpringBeans.xml Conflict discovered in 'impl/src/main/resources/org/kuali/rice/ksb/config/KSBOJBSpringBeans.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\resources\org\kuali\rice\ksb\config\KSBOJBSpringBeans.xml Conflict discovered in 'impl/src/main/resources/org/kuali/rice/ksb/config/KSBModuleConfigurationSpringBeans.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\resources\org\kuali\rice\ksb\config\KSBModuleConfigurationSpringBeans.xml Conflict discovered in 'impl/src/main/resources/org/kuali/rice/ksb/config/KSBSpringBeans.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\resources\org\kuali\rice\ksb\config\KSBSpringBeans.xml Conflict discovered in 'impl/src/main/resources/org/kuali/rice/ksb/config/KSBThinClientSpringBeans.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\resources\org\kuali\rice\ksb\config\KSBThinClientSpringBeans.xml U impl\src\main\resources\org\kuali\rice\kim\bo\datadictionary\GroupDocumentMember.xml U impl\src\main\resources\org\kuali\rice\kim\bo\datadictionary\KimBaseBeans.xml U impl\src\main\resources\org\kuali\rice\kim\bo\datadictionary\PersonDocumentName.xml U impl\src\main\resources\org\kuali\rice\kim\bo\datadictionary\RoleMemberImpl.xml U impl\src\main\resources\org\kuali\rice\kim\bo\datadictionary\PersonDocumentGroup.xml U impl\src\main\resources\org\kuali\rice\kim\bo\datadictionary\RoleDocumentDelegationMember.xml U impl\src\main\resources\org\kuali\rice\kim\bo\datadictionary\KimDocumentRoleMember.xml U impl\src\main\resources\org\kuali\rice\kim\bo\datadictionary\PersonDocumentEmploymentInfo.xml Conflict discovered in 'impl/src/main/resources/org/kuali/rice/kim/config/KIMImplementationSpringBeans.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\resources\org\kuali\rice\kim\config\KIMImplementationSpringBeans.xml U impl\src\main\resources\org\kuali\rice\kim\config\OJB-repository-kim.xml Conflict discovered in 'impl/src/main/resources/org/kuali/rice/kim/config/KIMServiceBusSpringBeans.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\resources\org\kuali\rice\kim\config\KIMServiceBusSpringBeans.xml Conflict discovered in 'impl/src/main/resources/org/kuali/rice/kim/config/KIMUserInterfaceSpringBeans.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\resources\org\kuali\rice\kim\config\KIMUserInterfaceSpringBeans.xml Conflict discovered in 'impl/src/main/resources/org/kuali/rice/kim/config/KIMInterfaceSpringBeans.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\resources\org\kuali\rice\kim\config\KIMInterfaceSpringBeans.xml Conflict discovered in 'impl/src/main/resources/org/kuali/rice/kim/config/KIMThinClientSpringBeans.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\resources\org\kuali\rice\kim\config\KIMThinClientSpringBeans.xml A impl\src\main\resources\org\kuali\rice\kim\config\KIMServiceBusSOAPDefaultSpringBeans.xml Conflict discovered in 'impl/src/main/resources/org/kuali/rice/kew/config/KEWSpringBeans.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\resources\org\kuali\rice\kew\config\KEWSpringBeans.xml A impl\src\main\resources\org\kuali\rice\kew\config\KEWServiceBusSOAPDefaultSpringBeans.xml Conflict discovered in 'impl/src/main/resources/org/kuali/rice/kew/config/ServerKEWSpringBeans.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\resources\org\kuali\rice\kew\config\ServerKEWSpringBeans.xml U impl\src\main\resources\org\kuali\rice\kew\config\OJB-repository-kew.xml Conflict discovered in 'impl/src/main/resources/org/kuali/rice/kew/config/KEWJPASpringBeans.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\resources\org\kuali\rice\kew\config\KEWJPASpringBeans.xml Conflict discovered in 'impl/src/main/resources/org/kuali/rice/kew/config/KEWOJBSpringBeans.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\resources\org\kuali\rice\kew\config\KEWOJBSpringBeans.xml Conflict discovered in 'impl/src/main/resources/org/kuali/rice/kew/config/KEWServiceBusSpringBeans.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\resources\org\kuali\rice\kew\config\KEWServiceBusSpringBeans.xml Conflict discovered in 'impl/src/main/resources/org/kuali/rice/core/CommonSpringBeans.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\resources\org\kuali\rice\core\CommonSpringBeans.xml Conflict discovered in 'impl/src/main/resources/org/kuali/rice/core/RiceDataSourceSpringBeans.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\resources\org\kuali\rice\core\RiceDataSourceSpringBeans.xml A impl\src\main\resources\org\kuali\rice\core\RiceDataSourceStandaloneClientSpringBeans.xml.template Conflict discovered in 'impl/src/main/resources/org/kuali/rice/core/RiceJTASpringBeans.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\resources\org\kuali\rice\core\RiceJTASpringBeans.xml Conflict discovered in 'impl/src/main/resources/org/kuali/rice/core/CommonOJBSpringBeans.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\resources\org\kuali\rice\core\CommonOJBSpringBeans.xml Conflict discovered in 'impl/src/main/resources/org/kuali/rice/standalone/config/StandaloneSpringBeans.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\resources\org\kuali\rice\standalone\config\StandaloneSpringBeans.xml U impl\src\main\resources\org\kuali\rice\kns\bo\datadictionary\Campus.xml U impl\src\main\resources\org\kuali\rice\kns\bo\datadictionary\AttributeReferenceDummy.xml U impl\src\main\resources\org\kuali\rice\kns\bo\datadictionary\Country.xml U impl\src\main\resources\org\kuali\rice\kns\bo\datadictionary\DataDictionaryBaseTypes.xml U impl\src\main\resources\org\kuali\rice\kns\config\OJB-repository-kns.xml Conflict discovered in 'impl/src/main/resources/org/kuali/rice/kns/config/KNSServiceBusSpringBeans.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\resources\org\kuali\rice\kns\config\KNSServiceBusSpringBeans.xml Conflict discovered in 'impl/src/main/resources/org/kuali/rice/kns/config/KNSSpringBeans.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\resources\org\kuali\rice\kns\config\KNSSpringBeans.xml U impl\src\main\resources\org\kuali\rice\kns\document\datadictionary\CountryMaintenanceDocument.xml Conflict discovered in 'impl/src/main/resources/org/kuali/rice/ken/config/KENSpringBeans.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\resources\org\kuali\rice\ken\config\KENSpringBeans.xml Conflict discovered in 'impl/src/main/resources/TestHarnessSpringBeans.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\resources\TestHarnessSpringBeans.xml U impl\pom.xml U config\examples\struts-config.example.xml U config\templates\createproject.config.template.xml Conflict discovered in 'config/templates/createproject.SpringBeans.template.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C config\templates\createproject.SpringBeans.template.xml U config\templates\createproject.pom.template.xml A config\templates\createproject.standalone.config.template.xml A api\src\main\java\org\kuali\rice\ksb A api\src\main\java\org\kuali\rice\ksb\messaging A api\src\main\java\org\kuali\rice\ksb\messaging\serviceconnectors A api\src\main\java\org\kuali\rice\ksb\messaging\serviceconnectors\ResourceFacade.java U api\src\main\java\org\kuali\rice\kim\bo\role\dto\DelegateInfo.java U api\src\main\java\org\kuali\rice\kim\bo\role\dto\RoleMemberCompleteInfo.java D api\src\main\java\org\kuali\rice\kim\bo\role\dto\InactiveableInfo.java U api\src\main\java\org\kuali\rice\kim\bo\group\dto\GroupMembershipInfo.java U api\src\main\java\org\kuali\rice\kim\bo\group\dto\GroupInfo.java U api\src\main\java\org\kuali\rice\kim\service\ResponsibilityService.java U api\src\main\java\org\kuali\rice\kim\service\RoleService.java U api\src\main\java\org\kuali\rice\kim\service\RoleUpdateService.java U api\src\main\java\org\kuali\rice\kew\service\WorkflowUtility.java U api\src\main\java\org\kuali\rice\kew\util\KEWConstants.java U api\src\main\java\org\kuali\rice\kew\webservice\SimpleDocumentActionsWebService.java U api\src\main\java\org\kuali\rice\core\config\Config.java U api\src\main\java\org\kuali\rice\kns\bo\InactivateableFromTo.java A api\src\main\java\org\kuali\rice\kns\dto A api\src\main\java\org\kuali\rice\kns\dto\InactiveableInfo.java U api\src\main\java\org\kuali\rice\kns\util\KNSConstants.java U api\pom.xml Conflict discovered in 'ken/src/test/resources/KENTestHarnessSpringBeans.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C ken\src\test\resources\KENTestHarnessSpringBeans.xml D web\src\test\java\edu\sampleu\travel\bo D web\src\test\java\edu\sampleu\travel\infrastructure D web\src\test\java\edu\sampleu\travel\remotedservice D web\src\test\java\edu\sampleu\travel\web\form D web\src\test\java\edu\sampleu\travel\workflow D web\src\test\java\edu\sampleu\travel\web\action D web\src\test\java\edu\sampleu\travel\document\TravelDocument2.java D web\src\test\java\edu\sampleu\travel\document\keyvalue D web\src\test\java\edu\sampleu\travel\document\rule D web\src\test\java\edu\sampleu\travel\document\authorizer U web\src\test\resources\org\kuali\rice\web\test\DefaultSuiteTestData.sql D web\src\test\resources\OJB-repository-sampleapp.xml D web\src\test\resources\edu\sampleu\travel\datadictionary U web\src\main\resources\SampleAppModuleBeans.xml A web\src\main\resources\org\kuali\rice\config\RiceStandaloneClientSpringBeans.xml.template Conflict discovered in 'web/src/main/resources/org/kuali/rice/config/RiceSpringBeans.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C web\src\main\resources\org\kuali\rice\config\RiceSpringBeans.xml U web\src\main\webapp\ksb\WEB-INF\struts-config.xml U web\src\main\webapp\kim\WEB-INF\struts-config.xml U web\src\main\webapp\rice-portal\css\portal.css U web\src\main\webapp\kew\WEB-INF\struts-config.xml U web\src\main\webapp\kew\WEB-INF\jsp\AppSpecificRoute.jsp A web\src\main\webapp\kew\scripts\prototype.js U web\src\main\webapp\WEB-INF\struts-config.xml A web\src\main\webapp\WEB-INF\jsp\recurseCheckTabHighlight.jsp A web\src\main\webapp\WEB-INF\jsp\recurseRowDisplay.jsp U web\src\main\webapp\WEB-INF\tags\kim\personGroup.tag U web\src\main\webapp\WEB-INF\tags\kim\personEmpInfo.tag U web\src\main\webapp\WEB-INF\tags\kim\personOverview.tag U web\src\main\webapp\WEB-INF\tags\kim\groupAssignees.tag U web\src\main\webapp\WEB-INF\tags\kim\roleAssignees.tag U web\src\main\webapp\WEB-INF\tags\rice-portal\channel\main\sampleTravelApplication.tag U web\src\main\webapp\WEB-INF\tags\rice-portal\channel\administration\configuration.tag U web\src\main\webapp\WEB-INF\tags\rice-portal\portalBody.tag U web\src\main\webapp\WEB-INF\tags\rice-portal\iframePortletContainer.tag U web\src\main\webapp\WEB-INF\tags\rice-portal\immutableBar.tag U web\src\main\webapp\WEB-INF\tags\rice-portal\portalTop.tag U web\src\main\webapp\WEB-INF\tags\kr\subtab.tag U web\src\main\webapp\WEB-INF\tags\kr\htmlControlAttribute.tag U web\src\main\webapp\WEB-INF\tags\kr\rowDisplay.tag Conflict discovered in 'web/src/main/webapp/WEB-INF/tags/kr/containerRowDisplay.tag'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C web\src\main\webapp\WEB-INF\tags\kr\containerRowDisplay.tag U web\src\main\webapp\WEB-INF\tags\kr\tab.tag U web\src\main\webapp\WEB-INF\tags\kr\notes.tag U web\src\main\webapp\WEB-INF\tags\kr\user.tag U web\src\main\webapp\WEB-INF\tags\kr\checkTabHighlight.tag U web\src\main\webapp\WEB-INF\tags\kr\adHocRecipients.tag U web\src\main\webapp\WEB-INF\tags\kr\fieldShowHelpIcon.tag A web\src\main\webapp\kr\images\tab-top-right-gray.gif A web\src\main\webapp\kr\images\tab-top-left.gif A web\src\main\webapp\kr\images\tab-top-left-gray.gif A web\src\main\webapp\kr\images\tab-top-right.gif U web\src\main\webapp\kr\WEB-INF\struts-config.xml U web\src\main\webapp\kr\WEB-INF\jsp\KualiHelp.jsp A web\src\main\webapp\kr\WEB-INF\jsp\AuthorizationException.jsp U web\src\main\webapp\kr\WEB-INF\jsp\KualiLookup.jsp A web\src\main\webapp\kr\static\images\tinybutton-inactivate.gif U web\src\main\webapp\kr\css\kuali.css Conflict discovered in 'web/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C web\pom.xml Summary of conflicts: Text conflicts: 63 Tree conflicts: 5
            Hide
            jjhanso Jeremy Hanson added a comment -

            Commit is done, now running the following sql against the master dbs:

            INSERT INTO krns_parm_t(NMSPC_CD, PARM_DTL_TYP_CD, PARM_NM, OBJ_ID, VER_NBR, PARM_TYP_CD, TXT, PARM_DESC_TXT, CONS_CD, APPL_NMSPC_CD) VALUES ('KR-NS', 'All', 'SENSITIVE_DATA_PATTERNS_WARNING_IND', 'e7d133f3-b5fe-11df-ad0a-d18f5709259f', 1, 'CONFG', 'N', 'If set to ''Y'' when sensitive data is found the user will be prompted to continue the action or cancel. If this is set to ''N'' the user will be presented with an error message and will not be allowed to continue with the action until the sensitive data is removed.', 'A', 'KUALI')
            /

            CREATE TABLE TRV_ACCT_USE_RT_T (
            ID VARCHAR2(40) PRIMARY KEY,
            ACCT_NUM VARCHAR2(10) NOT NULL,
            RATE NUMBER(8) NOT NULL,
            ACTV_FRM_DT DATE DEFAULT NULL,
            ACTV_TO_DT DATE DEFAULT NULL
            )
            /

            ALTER TABLE KRNS_ATT_T MODIFY (MIME_TYP VARCHAR2(255))
            /
            ALTER TABLE KRNS_MAINT_DOC_ATT_T MODIFY (CNTNT_TYP VARCHAR2(255))
            /

            ALTER TABLE KR_COUNTRY_T
            ADD (ALT_POSTAL_CNTRY_CD VARCHAR2(3) NULL )
            /

            – Updating Rice Country table to use ISO3166-1 codes
            DELETE FROM KR_COUNTRY_T WHERE POSTAL_CNTRY_CD!='US'
            /
            UPDATE KR_COUNTRY_T
            SET OBJ_ID='56908AA379F2661BE0404F8189D81F46',
            VER_NBR=1,
            POSTAL_CNTRY_NM='United States',
            PSTL_CNTRY_RSTRC_IND='N',
            ACTV_IND='Y',
            ALT_POSTAL_CNTRY_CD='USA'
            WHERE POSTAL_CNTRY_CD='US'
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('AF', '56908AA378FF661BE0404F8189D81F46', 1, 'Afghanistan', 'N', 'Y', 'AFG')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('AL', '56908AA37902661BE0404F8189D81F46', 1, 'Albania', 'N', 'Y', 'ALB')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('DZ', '56908AA37900661BE0404F8189D81F46', 1, 'Algeria', 'N', 'Y', 'DZA')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('AS', '56908AA37906661BE0404F8189D81F46', 1, 'American Samoa', 'N', 'Y', 'ASM')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('AD', '56908AA37904661BE0404F8189D81F46', 1, 'Andorra', 'N', 'Y', 'AND')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('AO', '56908AA37905661BE0404F8189D81F46', 1, 'Angola', 'N', 'Y', 'AGO')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('AI', '56908AA3790B661BE0404F8189D81F46', 1, 'Anguilla', 'N', 'Y', 'AIA')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('AQ', '56908AA3790C661BE0404F8189D81F46', 1, 'Antarctica', 'N', 'Y', 'ATA')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('AG', '56908AA378FE661BE0404F8189D81F46', 1, 'Antigua and Barbuda', 'N', 'Y', 'ATG')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('AR', '56908AA37907661BE0404F8189D81F46', 1, 'Argentina', 'N', 'Y', 'ARG')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('AM', '56908AA37903661BE0404F8189D81F46', 1, 'Armenia', 'N', 'Y', 'ARM')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('AW', '56908AA378FD661BE0404F8189D81F46', 1, 'Aruba', 'N', 'Y', 'ABW')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('AU', '56908AA37908661BE0404F8189D81F46', 1, 'Australia', 'N', 'Y', 'AUS')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('AT', '56908AA3790A661BE0404F8189D81F46', 1, 'Austria', 'N', 'Y', 'AUT')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('AZ', '56908AA37901661BE0404F8189D81F46', 1, 'Azerbaijan', 'N', 'Y', 'AZE')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('BS', '56908AA37912661BE0404F8189D81F46', 1, 'Bahamas', 'N', 'Y', 'BHS')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('BH', '56908AA3790D661BE0404F8189D81F46', 1, 'Bahrain', 'N', 'Y', 'BHR')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('BD', '56908AA37913661BE0404F8189D81F46', 1, 'Bangladesh', 'N', 'Y', 'BGD')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('BB', '56908AA3790E661BE0404F8189D81F46', 1, 'Barbados', 'N', 'Y', 'BRB')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('BY', '56908AA37919661BE0404F8189D81F46', 1, 'Belarus', 'N', 'Y', 'BLR')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('BE', '56908AA37911661BE0404F8189D81F46', 1, 'Belgium', 'N', 'Y', 'BEL')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('BZ', '56908AA37914661BE0404F8189D81F46', 1, 'Belize', 'N', 'Y', 'BLZ')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('BJ', '56908AA37918661BE0404F8189D81F46', 1, 'Benin', 'N', 'Y', 'BEN')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('BM', '56908AA37910661BE0404F8189D81F46', 1, 'Bermuda', 'N', 'Y', 'BMU')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('BT', '56908AA3791E661BE0404F8189D81F46', 1, 'Bhutan', 'N', 'Y', 'BTN')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('BO', '56908AA37916661BE0404F8189D81F46', 1, 'Bolivia, Plurinational State Of', 'N', 'Y', 'BOL')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('BA', '56908AA37915661BE0404F8189D81F46', 1, 'Bosnia and Herzegovina', 'N', 'Y', 'BIH')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('BW', '56908AA3790F661BE0404F8189D81F46', 1, 'Botswana', 'N', 'Y', 'BWA')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('BV', '56908AA37920661BE0404F8189D81F46', 1, 'Bouvet Island', 'N', 'Y', 'BVT')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('BR', '56908AA3791C661BE0404F8189D81F46', 1, 'Brazil', 'N', 'Y', 'BRA')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('IO', '56908AA3796E661BE0404F8189D81F46', 1, 'British Indian Ocean Territory', 'N', 'Y', 'IOT')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('BN', '56908AA37921661BE0404F8189D81F46', 1, 'Brunei Darussalam', 'N', 'Y', 'BRN')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('BG', '56908AA3791F661BE0404F8189D81F46', 1, 'Bulgaria', 'N', 'Y', 'BGR')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('BF', '56908AA37909661BE0404F8189D81F46', 1, 'Burkina Faso', 'N', 'Y', 'BFA')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('BI', '56908AA37922661BE0404F8189D81F46', 1, 'Burundi', 'N', 'Y', 'BDI')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('KH', '56908AA37924661BE0404F8189D81F46', 1, 'Cambodia', 'N', 'Y', 'KHM')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('CM', '56908AA3792D661BE0404F8189D81F46', 1, 'Cameroon', 'N', 'Y', 'CMR')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('CA', '56908AA37923661BE0404F8189D81F46', 1, 'Canada', 'N', 'Y', 'CAN')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('CV', '56908AA37935661BE0404F8189D81F46', 1, 'Cape Verde', 'N', 'Y', 'CPV')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('KY', '56908AA3792B661BE0404F8189D81F46', 1, 'Cayman Islands', 'N', 'Y', 'CYM')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('CF', '56908AA37933661BE0404F8189D81F46', 1, 'Central African Republic', 'N', 'Y', 'CAF')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('TD', '56908AA37925661BE0404F8189D81F46', 1, 'Chad', 'N', 'Y', 'TCD')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('CL', '56908AA3792A661BE0404F8189D81F46', 1, 'Chile', 'N', 'Y', 'CHL')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('CN', '56908AA37929661BE0404F8189D81F46', 1, 'China', 'N', 'Y', 'CHN')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('CX', '56908AA37983661BE0404F8189D81F46', 1, 'Christmas Island', 'N', 'Y', 'CXR')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('CC', '56908AA3792C661BE0404F8189D81F46', 1, 'Cocos (Keeling) Islands', 'N', 'Y', 'CCK')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('CO', '56908AA3792F661BE0404F8189D81F46', 1, 'Colombia', 'N', 'Y', 'COL')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('KM', '56908AA3792E661BE0404F8189D81F46', 1, 'Comoros', 'N', 'Y', 'COM')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('CG', '56908AA37927661BE0404F8189D81F46', 1, 'Congo', 'N', 'Y', 'COG')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('CD', '56908AA37928661BE0404F8189D81F46', 1, 'Congo, The Democratic Republic Of The', 'N', 'Y', 'COD')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('CK', '56908AA37936661BE0404F8189D81F46', 1, 'Cook Islands', 'N', 'Y', 'COK')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('CR', '56908AA37932661BE0404F8189D81F46', 1, 'Costa Rica', 'N', 'Y', 'CRI')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('HR', '56908AA37968661BE0404F8189D81F46', 1, 'Croatia', 'N', 'Y', 'HRV')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('CU', '56908AA37934661BE0404F8189D81F46', 1, 'Cuba', 'N', 'Y', 'CUB')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('CY', '56908AA37937661BE0404F8189D81F46', 1, 'Cyprus', 'N', 'Y', 'CYP')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('CZ', '56908AA37946661BE0404F8189D81F46', 1, 'Czech Republic', 'N', 'Y', 'CZE')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('CI', '56908AA37973661BE0404F8189D81F46', 1, 'Côte D''Ivoire', 'N', 'Y', 'CIV')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('DK', '56908AA37939661BE0404F8189D81F46', 1, 'Denmark', 'N', 'Y', 'DNK')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('DJ', '56908AA3793A661BE0404F8189D81F46', 1, 'Djibouti', 'N', 'Y', 'DJI')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('DM', '56908AA3793B661BE0404F8189D81F46', 1, 'Dominica', 'N', 'Y', 'DMA')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('DO', '56908AA3793C661BE0404F8189D81F46', 1, 'Dominican Republic', 'N', 'Y', 'DOM')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('EC', '56908AA3793D661BE0404F8189D81F46', 1, 'Ecuador', 'N', 'Y', 'ECU')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('EG', '56908AA3793E661BE0404F8189D81F46', 1, 'Egypt', 'N', 'Y', 'EGY')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('SV', '56908AA37943661BE0404F8189D81F46', 1, 'El Salvador', 'N', 'Y', 'SLV')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('GQ', '56908AA37940661BE0404F8189D81F46', 1, 'Equatorial Guinea', 'N', 'Y', 'GNQ')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('ER', '56908AA37942661BE0404F8189D81F46', 1, 'Eritrea', 'N', 'Y', 'ERI')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('EE', '56908AA37941661BE0404F8189D81F46', 1, 'Estonia', 'N', 'Y', 'EST')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('ET', '56908AA37944661BE0404F8189D81F46', 1, 'Ethiopia', 'N', 'Y', 'ETH')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('FK', '56908AA37947661BE0404F8189D81F46', 1, 'Falkland Islands (Malvinas)', 'N', 'Y', 'FLK')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('FO', '56908AA3794C661BE0404F8189D81F46', 1, 'Faroe Islands', 'N', 'Y', 'FRO')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('FJ', '56908AA3794A661BE0404F8189D81F46', 1, 'Fiji', 'N', 'Y', 'FJI')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('FI', '56908AA37949661BE0404F8189D81F46', 1, 'Finland', 'N', 'Y', 'FIN')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('FR', '56908AA3794F661BE0404F8189D81F46', 1, 'France', 'N', 'Y', 'FRA')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('GF', '56908AA37948661BE0404F8189D81F46', 1, 'French Guiana', 'N', 'Y', 'GUF')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('PF', '56908AA3794D661BE0404F8189D81F46', 1, 'French Polynesia', 'N', 'Y', 'PYF')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('TF', '56908AA37950661BE0404F8189D81F46', 1, 'French Southern Territories', 'N', 'Y', 'ATF')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('GA', '56908AA37952661BE0404F8189D81F46', 1, 'Gabon', 'N', 'Y', 'GAB')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('GM', '56908AA37951661BE0404F8189D81F46', 1, 'Gambia', 'N', 'Y', 'GMB')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('GE', '56908AA37954661BE0404F8189D81F46', 1, 'Georgia', 'N', 'Y', 'GEO')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('DE', '56908AA3795A661BE0404F8189D81F46', 1, 'Germany', 'N', 'Y', 'DEU')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('GH', '56908AA37955661BE0404F8189D81F46', 1, 'Ghana', 'N', 'Y', 'GHA')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('GI', '56908AA37956661BE0404F8189D81F46', 1, 'Gibraltar', 'N', 'Y', 'GIB')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('GR', '56908AA3795E661BE0404F8189D81F46', 1, 'Greece', 'N', 'Y', 'GRC')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('GL', '56908AA37959661BE0404F8189D81F46', 1, 'Greenland', 'N', 'Y', 'GRL')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('GD', '56908AA37957661BE0404F8189D81F46', 1, 'Grenada', 'N', 'Y', 'GRD')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('GP', '56908AA3795C661BE0404F8189D81F46', 1, 'Guadeloupe', 'N', 'Y', 'GLP')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('GU', '56908AA3795D661BE0404F8189D81F46', 1, 'Guam', 'N', 'Y', 'GUM')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('GT', '56908AA3795F661BE0404F8189D81F46', 1, 'Guatemala', 'N', 'Y', 'GTM')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('GG', '56908AA37958661BE0404F8189D81F46', 1, 'Guernsey', 'N', 'Y', 'GGY')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('GN', '56908AA37960661BE0404F8189D81F46', 1, 'Guinea', 'N', 'Y', 'GIN')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('GW', '56908AA379C1661BE0404F8189D81F46', 1, 'Guinea-Bissau', 'N', 'Y', 'GNB')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('GY', '56908AA37961661BE0404F8189D81F46', 1, 'Guyana', 'N', 'Y', 'GUY')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('HT', '56908AA37963661BE0404F8189D81F46', 1, 'Haiti', 'N', 'Y', 'HTI')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('HM', '56908AA37965661BE0404F8189D81F46', 1, 'Heard and McDonald Islands', 'N', 'Y', 'HMD')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('VA', '56908AA379FA661BE0404F8189D81F46', 1, 'Holy See (Vatican City State)', 'N', 'Y', 'VAT')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('HN', '56908AA37966661BE0404F8189D81F46', 1, 'Honduras', 'N', 'Y', 'HND')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('HK', '56908AA37964661BE0404F8189D81F46', 1, 'Hong Kong', 'N', 'Y', 'HKG')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('HU', '56908AA37969661BE0404F8189D81F46', 1, 'Hungary', 'N', 'Y', 'HUN')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('IS', '56908AA3796A661BE0404F8189D81F46', 1, 'Iceland', 'N', 'Y', 'ISL')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('IN', '56908AA3796D661BE0404F8189D81F46', 1, 'India', 'N', 'Y', 'IND')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('ID', '56908AA3796B661BE0404F8189D81F46', 1, 'Indonesia', 'N', 'Y', 'IDN')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('IR', '56908AA37970661BE0404F8189D81F46', 1, 'Iran, Islamic Republic Of', 'N', 'Y', 'IRN')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('IQ', '56908AA37975661BE0404F8189D81F46', 1, 'Iraq', 'N', 'Y', 'IRQ')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('IE', '56908AA3793F661BE0404F8189D81F46', 1, 'Ireland', 'N', 'Y', 'IRL')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('IM', '56908AA3796C661BE0404F8189D81F46', 1, 'Isle of Man', 'N', 'Y', 'IMN')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('IL', '56908AA37971661BE0404F8189D81F46', 1, 'Israel', 'N', 'Y', 'ISR')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('IT', '56908AA37972661BE0404F8189D81F46', 1, 'Italy', 'N', 'Y', 'ITA')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('JM', '56908AA37978661BE0404F8189D81F46', 1, 'Jamaica', 'N', 'Y', 'JAM')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('JP', '56908AA37976661BE0404F8189D81F46', 1, 'Japan', 'N', 'Y', 'JPN')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('JE', '56908AA37977661BE0404F8189D81F46', 1, 'Jersey', 'N', 'Y', 'JEY')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('JO', '56908AA3797A661BE0404F8189D81F46', 1, 'Jordan', 'N', 'Y', 'JOR')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('KZ', '56908AA37985661BE0404F8189D81F46', 1, 'Kazakhstan', 'N', 'Y', 'KAZ')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('KE', '56908AA3797D661BE0404F8189D81F46', 1, 'Kenya', 'N', 'Y', 'KEN')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('KI', '56908AA37981661BE0404F8189D81F46', 1, 'Kiribati', 'N', 'Y', 'KIR')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('KP', '56908AA3797F661BE0404F8189D81F46', 1, 'Korea, Democratic People''s Republic Of', 'N', 'Y', 'PRK')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('KR', '56908AA37982661BE0404F8189D81F46', 1, 'Korea, Republic of', 'N', 'Y', 'KOR')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('KW', '56908AA37984661BE0404F8189D81F46', 1, 'Kuwait', 'N', 'Y', 'KWT')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('KG', '56908AA3797E661BE0404F8189D81F46', 1, 'Kyrgyzstan', 'N', 'Y', 'KGZ')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('LA', '56908AA37986661BE0404F8189D81F46', 1, 'Lao People''s Democratic Republic', 'N', 'Y', 'LAO')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('LV', '56908AA37988661BE0404F8189D81F46', 1, 'Latvia', 'N', 'Y', 'LVA')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('LB', '56908AA37987661BE0404F8189D81F46', 1, 'Lebanon', 'N', 'Y', 'LBN')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('LS', '56908AA3798E661BE0404F8189D81F46', 1, 'Lesotho', 'N', 'Y', 'LSO')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('LR', '56908AA3798A661BE0404F8189D81F46', 1, 'Liberia', 'N', 'Y', 'LBR')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('LY', '56908AA37990661BE0404F8189D81F46', 1, 'Libyan Arab Jamahiriya', 'N', 'Y', 'LBY')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('LI', '56908AA3798D661BE0404F8189D81F46', 1, 'Liechtenstein', 'N', 'Y', 'LIE')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('LT', '56908AA37989661BE0404F8189D81F46', 1, 'Lithuania', 'N', 'Y', 'LTU')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('LU', '56908AA3798F661BE0404F8189D81F46', 1, 'Luxembourg', 'N', 'Y', 'LUX')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('MO', '56908AA37993661BE0404F8189D81F46', 1, 'Macao', 'N', 'Y', 'MAC')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('MK', '56908AA37999661BE0404F8189D81F46', 1, 'Macedonia, the Fmr. Yugoslav Republic Of', 'N', 'Y', 'MKD')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('MG', '56908AA37991661BE0404F8189D81F46', 1, 'Madagascar', 'N', 'Y', 'MDG')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('MW', '56908AA37998661BE0404F8189D81F46', 1, 'Malawi', 'N', 'Y', 'MWI')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('MY', '56908AA379A5661BE0404F8189D81F46', 1, 'Malaysia', 'N', 'Y', 'MYS')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('MV', '56908AA379A2661BE0404F8189D81F46', 1, 'Maldives', 'N', 'Y', 'MDV')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('ML', '56908AA3799A661BE0404F8189D81F46', 1, 'Mali', 'N', 'Y', 'MLI')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('MT', '56908AA379A0661BE0404F8189D81F46', 1, 'Malta', 'N', 'Y', 'MLT')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('MH', '56908AA379C4661BE0404F8189D81F46', 1, 'Marshall Islands', 'N', 'Y', 'MHL')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('MQ', '56908AA37992661BE0404F8189D81F46', 1, 'Martinique', 'N', 'Y', 'MTQ')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('MR', '56908AA3799F661BE0404F8189D81F46', 1, 'Mauritania', 'N', 'Y', 'MRT')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('MU', '56908AA3799D661BE0404F8189D81F46', 1, 'Mauritius', 'N', 'Y', 'MUS')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('YT', '56908AA37995661BE0404F8189D81F46', 1, 'Mayotte', 'N', 'Y', 'MYT')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('MX', '56908AA379A4661BE0404F8189D81F46', 1, 'Mexico', 'N', 'Y', 'MEX')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('FM', '56908AA3794B661BE0404F8189D81F46', 1, 'Micronesia, Federated States Of', 'N', 'Y', 'FSM')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('MD', '56908AA37994661BE0404F8189D81F46', 1, 'Moldova, Republic of', 'N', 'Y', 'MDA')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('MC', '56908AA3799B661BE0404F8189D81F46', 1, 'Monaco', 'N', 'Y', 'MCO')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('MN', '56908AA37996661BE0404F8189D81F46', 1, 'Mongolia', 'N', 'Y', 'MNG')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('ME', '56908AA379A3661BE0404F8189D81F46', 1, 'Montenegro', 'N', 'Y', 'MNE')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('MS', '56908AA37997661BE0404F8189D81F46', 1, 'Montserrat', 'N', 'Y', 'MSR')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('MA', '56908AA3799C661BE0404F8189D81F46', 1, 'Morocco', 'N', 'Y', 'MAR')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('MZ', '56908AA379A6661BE0404F8189D81F46', 1, 'Mozambique', 'N', 'Y', 'MOZ')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('MM', '56908AA37917661BE0404F8189D81F46', 1, 'Myanmar', 'N', 'Y', 'MMR')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('NA', '56908AA379FB661BE0404F8189D81F46', 1, 'Namibia', 'N', 'Y', 'NAM')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('NR', '56908AA379B1661BE0404F8189D81F46', 1, 'Nauru', 'N', 'Y', 'NRU')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('NP', '56908AA379B0661BE0404F8189D81F46', 1, 'Nepal', 'N', 'Y', 'NPL')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('NL', '56908AA379AE661BE0404F8189D81F46', 1, 'Netherlands', 'N', 'Y', 'NLD')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('AN', '56908AA379A7661BE0404F8189D81F46', 1, 'Netherlands Antilles', 'N', 'Y', 'ANT')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('NC', '56908AA379A8661BE0404F8189D81F46', 1, 'New Caledonia', 'N', 'Y', 'NCL')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('NZ', '56908AA379B4661BE0404F8189D81F46', 1, 'New Zealand', 'N', 'Y', 'NZL')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('NI', '56908AA379B3661BE0404F8189D81F46', 1, 'Nicaragua', 'N', 'Y', 'NIC')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('NE', '56908AA379AB661BE0404F8189D81F46', 1, 'Niger', 'N', 'Y', 'NER')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('NG', '56908AA379AD661BE0404F8189D81F46', 1, 'Nigeria', 'N', 'Y', 'NGA')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('NU', '56908AA379A9661BE0404F8189D81F46', 1, 'Niue', 'N', 'Y', 'NIU')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('NF', '56908AA379AA661BE0404F8189D81F46', 1, 'Norfolk Island', 'N', 'Y', 'NFK')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('MP', '56908AA37930661BE0404F8189D81F46', 1, 'Northern Mariana Islands', 'N', 'Y', 'MNP')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('NO', '56908AA379AF661BE0404F8189D81F46', 1, 'Norway', 'N', 'Y', 'NOR')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('OM', '56908AA379A1661BE0404F8189D81F46', 1, 'Oman', 'N', 'Y', 'OMN')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('PK', '56908AA379BB661BE0404F8189D81F46', 1, 'Pakistan', 'N', 'Y', 'PAK')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('PW', '56908AA379C0661BE0404F8189D81F46', 1, 'Palau', 'N', 'Y', 'PLW')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('PS', '56908AA37962661BE0404F8189D81F46', 1, 'Palestinian Territory, Occupied', 'N', 'Y', 'PSE')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('PA', '56908AA379BD661BE0404F8189D81F46', 1, 'Panama', 'N', 'Y', 'PAN')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('PG', '56908AA379BF661BE0404F8189D81F46', 1, 'Papua New Guinea', 'N', 'Y', 'PNG')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('PY', '56908AA379B6661BE0404F8189D81F46', 1, 'Paraguay', 'N', 'Y', 'PRY')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('PE', '56908AA379B8661BE0404F8189D81F46', 1, 'Peru', 'N', 'Y', 'PER')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('PH', '56908AA379C6661BE0404F8189D81F46', 1, 'Philippines', 'N', 'Y', 'PHL')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('PN', '56908AA379B7661BE0404F8189D81F46', 1, 'Pitcairn', 'N', 'Y', 'PCN')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('PL', '56908AA379BC661BE0404F8189D81F46', 1, 'Poland', 'N', 'Y', 'POL')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('PT', '56908AA379BE661BE0404F8189D81F46', 1, 'Portugal', 'N', 'Y', 'PRT')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('PR', '56908AA379C7661BE0404F8189D81F46', 1, 'Puerto Rico', 'N', 'Y', 'PRI')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('QA', '56908AA379C2661BE0404F8189D81F46', 1, 'Qatar', 'N', 'Y', 'QAT')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('RO', '56908AA379C5661BE0404F8189D81F46', 1, 'Romania', 'N', 'Y', 'ROU')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('RU', '56908AA379C8661BE0404F8189D81F46', 1, 'Russian Federation', 'N', 'Y', 'RUS')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('RW', '56908AA379C9661BE0404F8189D81F46', 1, 'Rwanda', 'N', 'Y', 'RWA')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('RE', '56908AA379C3661BE0404F8189D81F46', 1, 'Réunion', 'N', 'Y', 'REU')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('BL', '56908AA3791B661BE0404F8189D81F46', 1, 'Saint Barthélemy', 'N', 'Y', 'BLM')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('SH', '56908AA379D0661BE0404F8189D81F46', 1, 'St. Helena, Ascension, Tristan Da Cunha', 'N', 'Y', 'SHN')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('KN', '56908AA379CC661BE0404F8189D81F46', 1, 'Saint Kitts And Nevis', 'N', 'Y', 'KNA')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('LC', '56908AA379D8661BE0404F8189D81F46', 1, 'Saint Lucia', 'N', 'Y', 'LCA')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('MF', '56908AA3791D661BE0404F8189D81F46', 1, 'Saint Martin', 'N', 'Y', 'MAF')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('PM', '56908AA379CB661BE0404F8189D81F46', 1, 'Saint Pierre And Miquelon', 'N', 'Y', 'SPM')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('VC', '56908AA379F5661BE0404F8189D81F46', 1, 'Saint Vincent And The Grenedines', 'N', 'Y', 'VCT')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('WS', '56908AA37A00661BE0404F8189D81F46', 1, 'Samoa', 'N', 'Y', 'WSM')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('SM', '56908AA379D3661BE0404F8189D81F46', 1, 'San Marino', 'N', 'Y', 'SMR')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('ST', '56908AA379E7661BE0404F8189D81F46', 1, 'Sao Tome and Principe', 'N', 'Y', 'STP')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('SA', '56908AA379CA661BE0404F8189D81F46', 1, 'Saudi Arabia', 'N', 'Y', 'SAU')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('SN', '56908AA379CF661BE0404F8189D81F46', 1, 'Senegal', 'N', 'Y', 'SEN')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('RS', '56908AA379D7661BE0404F8189D81F46', 1, 'Serbia', 'N', 'Y', 'SRB')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('SC', '56908AA379CD661BE0404F8189D81F46', 1, 'Seychelles', 'N', 'Y', 'SYC')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('SL', '56908AA379D2661BE0404F8189D81F46', 1, 'Sierra Leone', 'N', 'Y', 'SLE')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('SG', '56908AA379D4661BE0404F8189D81F46', 1, 'Singapore', 'N', 'Y', 'SGP')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('SK', '56908AA3798B661BE0404F8189D81F46', 1, 'Slovakia', 'N', 'Y', 'SVK')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('SI', '56908AA379D1661BE0404F8189D81F46', 1, 'Slovenia', 'N', 'Y', 'SVN')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('SB', '56908AA3791A661BE0404F8189D81F46', 1, 'Solomon Islands', 'N', 'Y', 'SLB')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('SO', '56908AA379D5661BE0404F8189D81F46', 1, 'Somalia', 'N', 'Y', 'SOM')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('ZA', '56908AA379CE661BE0404F8189D81F46', 1, 'South Africa', 'N', 'Y', 'ZAF')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('GS', '56908AA37931661BE0404F8189D81F46', 1, 'South Georgia and South Sandwich Islands', 'N', 'Y', 'SGS')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('ES', '56908AA379D6661BE0404F8189D81F46', 1, 'Spain', 'N', 'Y', 'ESP')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('LK', '56908AA37926661BE0404F8189D81F46', 1, 'Sri Lanka', 'N', 'Y', 'LKA')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('SD', '56908AA379D9661BE0404F8189D81F46', 1, 'Sudan', 'N', 'Y', 'SDN')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('SR', '56908AA379B2661BE0404F8189D81F46', 1, 'Suriname', 'N', 'Y', 'SUR')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('SJ', '56908AA379DA661BE0404F8189D81F46', 1, 'Svalbard And Jan Mayen', 'N', 'Y', 'SJM')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('SZ', '56908AA37A01661BE0404F8189D81F46', 1, 'Swaziland', 'N', 'Y', 'SWZ')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('SE', '56908AA379DB661BE0404F8189D81F46', 1, 'Sweden', 'N', 'Y', 'SWE')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('CH', '56908AA379DD661BE0404F8189D81F46', 1, 'Switzerland', 'N', 'Y', 'CHE')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('SY', '56908AA379DC661BE0404F8189D81F46', 1, 'Syrian Arab Republic', 'N', 'Y', 'SYR')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('TW', '56908AA379EB661BE0404F8189D81F46', 1, 'Taiwan, Province Of China', 'N', 'Y', 'TWN')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('TJ', '56908AA379E2661BE0404F8189D81F46', 1, 'Tajikistan', 'N', 'Y', 'TJK')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('TZ', '56908AA379ED661BE0404F8189D81F46', 1, 'Tanzania, United Republic of', 'N', 'Y', 'TZA')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('TH', '56908AA379E1661BE0404F8189D81F46', 1, 'Thailand', 'N', 'Y', 'THA')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('TL', '56908AA37945661BE0404F8189D81F46', 1, 'Timor-Leste', 'N', 'Y', 'TLS')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('TG', '56908AA379E6661BE0404F8189D81F46', 1, 'Togo', 'N', 'Y', 'TGO')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('TK', '56908AA379E4661BE0404F8189D81F46', 1, 'Tokelau', 'N', 'Y', 'TKL')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('TO', '56908AA379E5661BE0404F8189D81F46', 1, 'Tonga', 'N', 'Y', 'TON')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('TT', '56908AA379DF661BE0404F8189D81F46', 1, 'Trinidad and Tobago', 'N', 'Y', 'TTO')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('TN', '56908AA379E8661BE0404F8189D81F46', 1, 'Tunisia', 'N', 'Y', 'TUN')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('TR', '56908AA379E9661BE0404F8189D81F46', 1, 'Turkey', 'N', 'Y', 'TUR')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('TM', '56908AA379EC661BE0404F8189D81F46', 1, 'Turkmenistan', 'N', 'Y', 'TKM')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('TC', '56908AA379E3661BE0404F8189D81F46', 1, 'Turks and Caicos Islands', 'N', 'Y', 'TCA')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('TV', '56908AA379EA661BE0404F8189D81F46', 1, 'Tuvalu', 'N', 'Y', 'TUV')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('UG', '56908AA379EE661BE0404F8189D81F46', 1, 'Uganda', 'N', 'Y', 'UGA')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('UA', '56908AA379F0661BE0404F8189D81F46', 1, 'Ukraine', 'N', 'Y', 'UKR')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('AE', '56908AA379DE661BE0404F8189D81F46', 1, 'United Arab Emirates', 'N', 'Y', 'ARE')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('GB', '56908AA379EF661BE0404F8189D81F46', 1, 'United Kingdom', 'N', 'Y', 'GBR')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('UM', '56908AA3799E661BE0404F8189D81F46', 1, 'United States Minor Outlying Islands', 'N', 'Y', 'UMI')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('UY', '56908AA379F3661BE0404F8189D81F46', 1, 'Uruguay', 'N', 'Y', 'URY')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('UZ', '56908AA379F4661BE0404F8189D81F46', 1, 'Uzbekistan', 'N', 'Y', 'UZB')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('VU', '56908AA379AC661BE0404F8189D81F46', 1, 'Vanuatu', 'N', 'Y', 'VUT')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('VE', '56908AA379F6661BE0404F8189D81F46', 1, 'Venezuela, Bolivarian Republic of', 'N', 'Y', 'VEN')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('VN', '56908AA379F8661BE0404F8189D81F46', 1, 'Viet Nam', 'N', 'Y', 'VNM')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('VG', '56908AA379F7661BE0404F8189D81F46', 1, 'Virgin Islands, British', 'N', 'Y', 'VGB')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('VI', '56908AA379F9661BE0404F8189D81F46', 1, 'Virgin Islands, U.S.', 'N', 'Y', 'VIR')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('WF', '56908AA379FD661BE0404F8189D81F46', 1, 'Wallis and Futuna', 'N', 'Y', 'WLF')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('EH', '56908AA379FE661BE0404F8189D81F46', 1, 'Western Sahara', 'N', 'Y', 'ESH')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('YE', '56908AA37A02661BE0404F8189D81F46', 1, 'Yemen', 'N', 'Y', 'YEM')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('ZM', '56908AA37A04661BE0404F8189D81F46', 1, 'Zambia', 'N', 'Y', 'ZMB')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('ZW', '56908AA37A05661BE0404F8189D81F46', 1, 'Zimbabwe', 'N', 'Y', 'ZWE')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('AX', '56908AA3794E661BE0404F8189D81F46', 1, 'Ã…land Islands', 'N', 'Y', 'ALA')
            /
            INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD)
            VALUES('ZZ', '56908AA379B5661BE0404F8189D81F46', 1, 'Other Countries', 'N', 'Y', 'ZZZ')
            /

            --714 is the permission for looking up a pessimistic lock
            delete from KRIM_PERM_ATTR_DATA_T where PERM_ID = '714'
            /
            delete from KRIM_ROLE_PERM_T where PERM_ID = '714'
            /
            delete from KRIM_PERM_T where PERM_ID = '714'
            /

            Show
            jjhanso Jeremy Hanson added a comment - Commit is done, now running the following sql against the master dbs: INSERT INTO krns_parm_t(NMSPC_CD, PARM_DTL_TYP_CD, PARM_NM, OBJ_ID, VER_NBR, PARM_TYP_CD, TXT, PARM_DESC_TXT, CONS_CD, APPL_NMSPC_CD) VALUES ('KR-NS', 'All', 'SENSITIVE_DATA_PATTERNS_WARNING_IND', 'e7d133f3-b5fe-11df-ad0a-d18f5709259f', 1, 'CONFG', 'N', 'If set to ''Y'' when sensitive data is found the user will be prompted to continue the action or cancel. If this is set to ''N'' the user will be presented with an error message and will not be allowed to continue with the action until the sensitive data is removed.', 'A', 'KUALI') / CREATE TABLE TRV_ACCT_USE_RT_T ( ID VARCHAR2(40) PRIMARY KEY, ACCT_NUM VARCHAR2(10) NOT NULL, RATE NUMBER(8) NOT NULL, ACTV_FRM_DT DATE DEFAULT NULL, ACTV_TO_DT DATE DEFAULT NULL ) / ALTER TABLE KRNS_ATT_T MODIFY (MIME_TYP VARCHAR2(255)) / ALTER TABLE KRNS_MAINT_DOC_ATT_T MODIFY (CNTNT_TYP VARCHAR2(255)) / ALTER TABLE KR_COUNTRY_T ADD (ALT_POSTAL_CNTRY_CD VARCHAR2(3) NULL ) / – Updating Rice Country table to use ISO3166-1 codes DELETE FROM KR_COUNTRY_T WHERE POSTAL_CNTRY_CD!='US' / UPDATE KR_COUNTRY_T SET OBJ_ID='56908AA379F2661BE0404F8189D81F46', VER_NBR=1, POSTAL_CNTRY_NM='United States', PSTL_CNTRY_RSTRC_IND='N', ACTV_IND='Y', ALT_POSTAL_CNTRY_CD='USA' WHERE POSTAL_CNTRY_CD='US' / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('AF', '56908AA378FF661BE0404F8189D81F46', 1, 'Afghanistan', 'N', 'Y', 'AFG') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('AL', '56908AA37902661BE0404F8189D81F46', 1, 'Albania', 'N', 'Y', 'ALB') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('DZ', '56908AA37900661BE0404F8189D81F46', 1, 'Algeria', 'N', 'Y', 'DZA') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('AS', '56908AA37906661BE0404F8189D81F46', 1, 'American Samoa', 'N', 'Y', 'ASM') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('AD', '56908AA37904661BE0404F8189D81F46', 1, 'Andorra', 'N', 'Y', 'AND') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('AO', '56908AA37905661BE0404F8189D81F46', 1, 'Angola', 'N', 'Y', 'AGO') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('AI', '56908AA3790B661BE0404F8189D81F46', 1, 'Anguilla', 'N', 'Y', 'AIA') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('AQ', '56908AA3790C661BE0404F8189D81F46', 1, 'Antarctica', 'N', 'Y', 'ATA') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('AG', '56908AA378FE661BE0404F8189D81F46', 1, 'Antigua and Barbuda', 'N', 'Y', 'ATG') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('AR', '56908AA37907661BE0404F8189D81F46', 1, 'Argentina', 'N', 'Y', 'ARG') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('AM', '56908AA37903661BE0404F8189D81F46', 1, 'Armenia', 'N', 'Y', 'ARM') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('AW', '56908AA378FD661BE0404F8189D81F46', 1, 'Aruba', 'N', 'Y', 'ABW') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('AU', '56908AA37908661BE0404F8189D81F46', 1, 'Australia', 'N', 'Y', 'AUS') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('AT', '56908AA3790A661BE0404F8189D81F46', 1, 'Austria', 'N', 'Y', 'AUT') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('AZ', '56908AA37901661BE0404F8189D81F46', 1, 'Azerbaijan', 'N', 'Y', 'AZE') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('BS', '56908AA37912661BE0404F8189D81F46', 1, 'Bahamas', 'N', 'Y', 'BHS') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('BH', '56908AA3790D661BE0404F8189D81F46', 1, 'Bahrain', 'N', 'Y', 'BHR') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('BD', '56908AA37913661BE0404F8189D81F46', 1, 'Bangladesh', 'N', 'Y', 'BGD') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('BB', '56908AA3790E661BE0404F8189D81F46', 1, 'Barbados', 'N', 'Y', 'BRB') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('BY', '56908AA37919661BE0404F8189D81F46', 1, 'Belarus', 'N', 'Y', 'BLR') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('BE', '56908AA37911661BE0404F8189D81F46', 1, 'Belgium', 'N', 'Y', 'BEL') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('BZ', '56908AA37914661BE0404F8189D81F46', 1, 'Belize', 'N', 'Y', 'BLZ') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('BJ', '56908AA37918661BE0404F8189D81F46', 1, 'Benin', 'N', 'Y', 'BEN') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('BM', '56908AA37910661BE0404F8189D81F46', 1, 'Bermuda', 'N', 'Y', 'BMU') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('BT', '56908AA3791E661BE0404F8189D81F46', 1, 'Bhutan', 'N', 'Y', 'BTN') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('BO', '56908AA37916661BE0404F8189D81F46', 1, 'Bolivia, Plurinational State Of', 'N', 'Y', 'BOL') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('BA', '56908AA37915661BE0404F8189D81F46', 1, 'Bosnia and Herzegovina', 'N', 'Y', 'BIH') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('BW', '56908AA3790F661BE0404F8189D81F46', 1, 'Botswana', 'N', 'Y', 'BWA') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('BV', '56908AA37920661BE0404F8189D81F46', 1, 'Bouvet Island', 'N', 'Y', 'BVT') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('BR', '56908AA3791C661BE0404F8189D81F46', 1, 'Brazil', 'N', 'Y', 'BRA') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('IO', '56908AA3796E661BE0404F8189D81F46', 1, 'British Indian Ocean Territory', 'N', 'Y', 'IOT') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('BN', '56908AA37921661BE0404F8189D81F46', 1, 'Brunei Darussalam', 'N', 'Y', 'BRN') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('BG', '56908AA3791F661BE0404F8189D81F46', 1, 'Bulgaria', 'N', 'Y', 'BGR') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('BF', '56908AA37909661BE0404F8189D81F46', 1, 'Burkina Faso', 'N', 'Y', 'BFA') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('BI', '56908AA37922661BE0404F8189D81F46', 1, 'Burundi', 'N', 'Y', 'BDI') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('KH', '56908AA37924661BE0404F8189D81F46', 1, 'Cambodia', 'N', 'Y', 'KHM') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('CM', '56908AA3792D661BE0404F8189D81F46', 1, 'Cameroon', 'N', 'Y', 'CMR') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('CA', '56908AA37923661BE0404F8189D81F46', 1, 'Canada', 'N', 'Y', 'CAN') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('CV', '56908AA37935661BE0404F8189D81F46', 1, 'Cape Verde', 'N', 'Y', 'CPV') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('KY', '56908AA3792B661BE0404F8189D81F46', 1, 'Cayman Islands', 'N', 'Y', 'CYM') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('CF', '56908AA37933661BE0404F8189D81F46', 1, 'Central African Republic', 'N', 'Y', 'CAF') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('TD', '56908AA37925661BE0404F8189D81F46', 1, 'Chad', 'N', 'Y', 'TCD') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('CL', '56908AA3792A661BE0404F8189D81F46', 1, 'Chile', 'N', 'Y', 'CHL') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('CN', '56908AA37929661BE0404F8189D81F46', 1, 'China', 'N', 'Y', 'CHN') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('CX', '56908AA37983661BE0404F8189D81F46', 1, 'Christmas Island', 'N', 'Y', 'CXR') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('CC', '56908AA3792C661BE0404F8189D81F46', 1, 'Cocos (Keeling) Islands', 'N', 'Y', 'CCK') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('CO', '56908AA3792F661BE0404F8189D81F46', 1, 'Colombia', 'N', 'Y', 'COL') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('KM', '56908AA3792E661BE0404F8189D81F46', 1, 'Comoros', 'N', 'Y', 'COM') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('CG', '56908AA37927661BE0404F8189D81F46', 1, 'Congo', 'N', 'Y', 'COG') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('CD', '56908AA37928661BE0404F8189D81F46', 1, 'Congo, The Democratic Republic Of The', 'N', 'Y', 'COD') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('CK', '56908AA37936661BE0404F8189D81F46', 1, 'Cook Islands', 'N', 'Y', 'COK') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('CR', '56908AA37932661BE0404F8189D81F46', 1, 'Costa Rica', 'N', 'Y', 'CRI') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('HR', '56908AA37968661BE0404F8189D81F46', 1, 'Croatia', 'N', 'Y', 'HRV') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('CU', '56908AA37934661BE0404F8189D81F46', 1, 'Cuba', 'N', 'Y', 'CUB') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('CY', '56908AA37937661BE0404F8189D81F46', 1, 'Cyprus', 'N', 'Y', 'CYP') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('CZ', '56908AA37946661BE0404F8189D81F46', 1, 'Czech Republic', 'N', 'Y', 'CZE') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('CI', '56908AA37973661BE0404F8189D81F46', 1, 'Côte D''Ivoire', 'N', 'Y', 'CIV') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('DK', '56908AA37939661BE0404F8189D81F46', 1, 'Denmark', 'N', 'Y', 'DNK') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('DJ', '56908AA3793A661BE0404F8189D81F46', 1, 'Djibouti', 'N', 'Y', 'DJI') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('DM', '56908AA3793B661BE0404F8189D81F46', 1, 'Dominica', 'N', 'Y', 'DMA') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('DO', '56908AA3793C661BE0404F8189D81F46', 1, 'Dominican Republic', 'N', 'Y', 'DOM') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('EC', '56908AA3793D661BE0404F8189D81F46', 1, 'Ecuador', 'N', 'Y', 'ECU') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('EG', '56908AA3793E661BE0404F8189D81F46', 1, 'Egypt', 'N', 'Y', 'EGY') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('SV', '56908AA37943661BE0404F8189D81F46', 1, 'El Salvador', 'N', 'Y', 'SLV') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('GQ', '56908AA37940661BE0404F8189D81F46', 1, 'Equatorial Guinea', 'N', 'Y', 'GNQ') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('ER', '56908AA37942661BE0404F8189D81F46', 1, 'Eritrea', 'N', 'Y', 'ERI') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('EE', '56908AA37941661BE0404F8189D81F46', 1, 'Estonia', 'N', 'Y', 'EST') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('ET', '56908AA37944661BE0404F8189D81F46', 1, 'Ethiopia', 'N', 'Y', 'ETH') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('FK', '56908AA37947661BE0404F8189D81F46', 1, 'Falkland Islands (Malvinas)', 'N', 'Y', 'FLK') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('FO', '56908AA3794C661BE0404F8189D81F46', 1, 'Faroe Islands', 'N', 'Y', 'FRO') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('FJ', '56908AA3794A661BE0404F8189D81F46', 1, 'Fiji', 'N', 'Y', 'FJI') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('FI', '56908AA37949661BE0404F8189D81F46', 1, 'Finland', 'N', 'Y', 'FIN') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('FR', '56908AA3794F661BE0404F8189D81F46', 1, 'France', 'N', 'Y', 'FRA') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('GF', '56908AA37948661BE0404F8189D81F46', 1, 'French Guiana', 'N', 'Y', 'GUF') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('PF', '56908AA3794D661BE0404F8189D81F46', 1, 'French Polynesia', 'N', 'Y', 'PYF') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('TF', '56908AA37950661BE0404F8189D81F46', 1, 'French Southern Territories', 'N', 'Y', 'ATF') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('GA', '56908AA37952661BE0404F8189D81F46', 1, 'Gabon', 'N', 'Y', 'GAB') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('GM', '56908AA37951661BE0404F8189D81F46', 1, 'Gambia', 'N', 'Y', 'GMB') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('GE', '56908AA37954661BE0404F8189D81F46', 1, 'Georgia', 'N', 'Y', 'GEO') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('DE', '56908AA3795A661BE0404F8189D81F46', 1, 'Germany', 'N', 'Y', 'DEU') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('GH', '56908AA37955661BE0404F8189D81F46', 1, 'Ghana', 'N', 'Y', 'GHA') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('GI', '56908AA37956661BE0404F8189D81F46', 1, 'Gibraltar', 'N', 'Y', 'GIB') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('GR', '56908AA3795E661BE0404F8189D81F46', 1, 'Greece', 'N', 'Y', 'GRC') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('GL', '56908AA37959661BE0404F8189D81F46', 1, 'Greenland', 'N', 'Y', 'GRL') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('GD', '56908AA37957661BE0404F8189D81F46', 1, 'Grenada', 'N', 'Y', 'GRD') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('GP', '56908AA3795C661BE0404F8189D81F46', 1, 'Guadeloupe', 'N', 'Y', 'GLP') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('GU', '56908AA3795D661BE0404F8189D81F46', 1, 'Guam', 'N', 'Y', 'GUM') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('GT', '56908AA3795F661BE0404F8189D81F46', 1, 'Guatemala', 'N', 'Y', 'GTM') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('GG', '56908AA37958661BE0404F8189D81F46', 1, 'Guernsey', 'N', 'Y', 'GGY') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('GN', '56908AA37960661BE0404F8189D81F46', 1, 'Guinea', 'N', 'Y', 'GIN') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('GW', '56908AA379C1661BE0404F8189D81F46', 1, 'Guinea-Bissau', 'N', 'Y', 'GNB') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('GY', '56908AA37961661BE0404F8189D81F46', 1, 'Guyana', 'N', 'Y', 'GUY') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('HT', '56908AA37963661BE0404F8189D81F46', 1, 'Haiti', 'N', 'Y', 'HTI') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('HM', '56908AA37965661BE0404F8189D81F46', 1, 'Heard and McDonald Islands', 'N', 'Y', 'HMD') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('VA', '56908AA379FA661BE0404F8189D81F46', 1, 'Holy See (Vatican City State)', 'N', 'Y', 'VAT') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('HN', '56908AA37966661BE0404F8189D81F46', 1, 'Honduras', 'N', 'Y', 'HND') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('HK', '56908AA37964661BE0404F8189D81F46', 1, 'Hong Kong', 'N', 'Y', 'HKG') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('HU', '56908AA37969661BE0404F8189D81F46', 1, 'Hungary', 'N', 'Y', 'HUN') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('IS', '56908AA3796A661BE0404F8189D81F46', 1, 'Iceland', 'N', 'Y', 'ISL') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('IN', '56908AA3796D661BE0404F8189D81F46', 1, 'India', 'N', 'Y', 'IND') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('ID', '56908AA3796B661BE0404F8189D81F46', 1, 'Indonesia', 'N', 'Y', 'IDN') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('IR', '56908AA37970661BE0404F8189D81F46', 1, 'Iran, Islamic Republic Of', 'N', 'Y', 'IRN') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('IQ', '56908AA37975661BE0404F8189D81F46', 1, 'Iraq', 'N', 'Y', 'IRQ') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('IE', '56908AA3793F661BE0404F8189D81F46', 1, 'Ireland', 'N', 'Y', 'IRL') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('IM', '56908AA3796C661BE0404F8189D81F46', 1, 'Isle of Man', 'N', 'Y', 'IMN') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('IL', '56908AA37971661BE0404F8189D81F46', 1, 'Israel', 'N', 'Y', 'ISR') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('IT', '56908AA37972661BE0404F8189D81F46', 1, 'Italy', 'N', 'Y', 'ITA') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('JM', '56908AA37978661BE0404F8189D81F46', 1, 'Jamaica', 'N', 'Y', 'JAM') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('JP', '56908AA37976661BE0404F8189D81F46', 1, 'Japan', 'N', 'Y', 'JPN') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('JE', '56908AA37977661BE0404F8189D81F46', 1, 'Jersey', 'N', 'Y', 'JEY') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('JO', '56908AA3797A661BE0404F8189D81F46', 1, 'Jordan', 'N', 'Y', 'JOR') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('KZ', '56908AA37985661BE0404F8189D81F46', 1, 'Kazakhstan', 'N', 'Y', 'KAZ') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('KE', '56908AA3797D661BE0404F8189D81F46', 1, 'Kenya', 'N', 'Y', 'KEN') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('KI', '56908AA37981661BE0404F8189D81F46', 1, 'Kiribati', 'N', 'Y', 'KIR') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('KP', '56908AA3797F661BE0404F8189D81F46', 1, 'Korea, Democratic People''s Republic Of', 'N', 'Y', 'PRK') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('KR', '56908AA37982661BE0404F8189D81F46', 1, 'Korea, Republic of', 'N', 'Y', 'KOR') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('KW', '56908AA37984661BE0404F8189D81F46', 1, 'Kuwait', 'N', 'Y', 'KWT') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('KG', '56908AA3797E661BE0404F8189D81F46', 1, 'Kyrgyzstan', 'N', 'Y', 'KGZ') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('LA', '56908AA37986661BE0404F8189D81F46', 1, 'Lao People''s Democratic Republic', 'N', 'Y', 'LAO') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('LV', '56908AA37988661BE0404F8189D81F46', 1, 'Latvia', 'N', 'Y', 'LVA') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('LB', '56908AA37987661BE0404F8189D81F46', 1, 'Lebanon', 'N', 'Y', 'LBN') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('LS', '56908AA3798E661BE0404F8189D81F46', 1, 'Lesotho', 'N', 'Y', 'LSO') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('LR', '56908AA3798A661BE0404F8189D81F46', 1, 'Liberia', 'N', 'Y', 'LBR') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('LY', '56908AA37990661BE0404F8189D81F46', 1, 'Libyan Arab Jamahiriya', 'N', 'Y', 'LBY') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('LI', '56908AA3798D661BE0404F8189D81F46', 1, 'Liechtenstein', 'N', 'Y', 'LIE') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('LT', '56908AA37989661BE0404F8189D81F46', 1, 'Lithuania', 'N', 'Y', 'LTU') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('LU', '56908AA3798F661BE0404F8189D81F46', 1, 'Luxembourg', 'N', 'Y', 'LUX') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('MO', '56908AA37993661BE0404F8189D81F46', 1, 'Macao', 'N', 'Y', 'MAC') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('MK', '56908AA37999661BE0404F8189D81F46', 1, 'Macedonia, the Fmr. Yugoslav Republic Of', 'N', 'Y', 'MKD') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('MG', '56908AA37991661BE0404F8189D81F46', 1, 'Madagascar', 'N', 'Y', 'MDG') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('MW', '56908AA37998661BE0404F8189D81F46', 1, 'Malawi', 'N', 'Y', 'MWI') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('MY', '56908AA379A5661BE0404F8189D81F46', 1, 'Malaysia', 'N', 'Y', 'MYS') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('MV', '56908AA379A2661BE0404F8189D81F46', 1, 'Maldives', 'N', 'Y', 'MDV') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('ML', '56908AA3799A661BE0404F8189D81F46', 1, 'Mali', 'N', 'Y', 'MLI') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('MT', '56908AA379A0661BE0404F8189D81F46', 1, 'Malta', 'N', 'Y', 'MLT') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('MH', '56908AA379C4661BE0404F8189D81F46', 1, 'Marshall Islands', 'N', 'Y', 'MHL') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('MQ', '56908AA37992661BE0404F8189D81F46', 1, 'Martinique', 'N', 'Y', 'MTQ') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('MR', '56908AA3799F661BE0404F8189D81F46', 1, 'Mauritania', 'N', 'Y', 'MRT') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('MU', '56908AA3799D661BE0404F8189D81F46', 1, 'Mauritius', 'N', 'Y', 'MUS') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('YT', '56908AA37995661BE0404F8189D81F46', 1, 'Mayotte', 'N', 'Y', 'MYT') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('MX', '56908AA379A4661BE0404F8189D81F46', 1, 'Mexico', 'N', 'Y', 'MEX') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('FM', '56908AA3794B661BE0404F8189D81F46', 1, 'Micronesia, Federated States Of', 'N', 'Y', 'FSM') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('MD', '56908AA37994661BE0404F8189D81F46', 1, 'Moldova, Republic of', 'N', 'Y', 'MDA') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('MC', '56908AA3799B661BE0404F8189D81F46', 1, 'Monaco', 'N', 'Y', 'MCO') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('MN', '56908AA37996661BE0404F8189D81F46', 1, 'Mongolia', 'N', 'Y', 'MNG') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('ME', '56908AA379A3661BE0404F8189D81F46', 1, 'Montenegro', 'N', 'Y', 'MNE') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('MS', '56908AA37997661BE0404F8189D81F46', 1, 'Montserrat', 'N', 'Y', 'MSR') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('MA', '56908AA3799C661BE0404F8189D81F46', 1, 'Morocco', 'N', 'Y', 'MAR') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('MZ', '56908AA379A6661BE0404F8189D81F46', 1, 'Mozambique', 'N', 'Y', 'MOZ') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('MM', '56908AA37917661BE0404F8189D81F46', 1, 'Myanmar', 'N', 'Y', 'MMR') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('NA', '56908AA379FB661BE0404F8189D81F46', 1, 'Namibia', 'N', 'Y', 'NAM') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('NR', '56908AA379B1661BE0404F8189D81F46', 1, 'Nauru', 'N', 'Y', 'NRU') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('NP', '56908AA379B0661BE0404F8189D81F46', 1, 'Nepal', 'N', 'Y', 'NPL') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('NL', '56908AA379AE661BE0404F8189D81F46', 1, 'Netherlands', 'N', 'Y', 'NLD') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('AN', '56908AA379A7661BE0404F8189D81F46', 1, 'Netherlands Antilles', 'N', 'Y', 'ANT') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('NC', '56908AA379A8661BE0404F8189D81F46', 1, 'New Caledonia', 'N', 'Y', 'NCL') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('NZ', '56908AA379B4661BE0404F8189D81F46', 1, 'New Zealand', 'N', 'Y', 'NZL') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('NI', '56908AA379B3661BE0404F8189D81F46', 1, 'Nicaragua', 'N', 'Y', 'NIC') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('NE', '56908AA379AB661BE0404F8189D81F46', 1, 'Niger', 'N', 'Y', 'NER') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('NG', '56908AA379AD661BE0404F8189D81F46', 1, 'Nigeria', 'N', 'Y', 'NGA') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('NU', '56908AA379A9661BE0404F8189D81F46', 1, 'Niue', 'N', 'Y', 'NIU') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('NF', '56908AA379AA661BE0404F8189D81F46', 1, 'Norfolk Island', 'N', 'Y', 'NFK') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('MP', '56908AA37930661BE0404F8189D81F46', 1, 'Northern Mariana Islands', 'N', 'Y', 'MNP') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('NO', '56908AA379AF661BE0404F8189D81F46', 1, 'Norway', 'N', 'Y', 'NOR') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('OM', '56908AA379A1661BE0404F8189D81F46', 1, 'Oman', 'N', 'Y', 'OMN') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('PK', '56908AA379BB661BE0404F8189D81F46', 1, 'Pakistan', 'N', 'Y', 'PAK') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('PW', '56908AA379C0661BE0404F8189D81F46', 1, 'Palau', 'N', 'Y', 'PLW') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('PS', '56908AA37962661BE0404F8189D81F46', 1, 'Palestinian Territory, Occupied', 'N', 'Y', 'PSE') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('PA', '56908AA379BD661BE0404F8189D81F46', 1, 'Panama', 'N', 'Y', 'PAN') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('PG', '56908AA379BF661BE0404F8189D81F46', 1, 'Papua New Guinea', 'N', 'Y', 'PNG') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('PY', '56908AA379B6661BE0404F8189D81F46', 1, 'Paraguay', 'N', 'Y', 'PRY') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('PE', '56908AA379B8661BE0404F8189D81F46', 1, 'Peru', 'N', 'Y', 'PER') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('PH', '56908AA379C6661BE0404F8189D81F46', 1, 'Philippines', 'N', 'Y', 'PHL') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('PN', '56908AA379B7661BE0404F8189D81F46', 1, 'Pitcairn', 'N', 'Y', 'PCN') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('PL', '56908AA379BC661BE0404F8189D81F46', 1, 'Poland', 'N', 'Y', 'POL') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('PT', '56908AA379BE661BE0404F8189D81F46', 1, 'Portugal', 'N', 'Y', 'PRT') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('PR', '56908AA379C7661BE0404F8189D81F46', 1, 'Puerto Rico', 'N', 'Y', 'PRI') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('QA', '56908AA379C2661BE0404F8189D81F46', 1, 'Qatar', 'N', 'Y', 'QAT') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('RO', '56908AA379C5661BE0404F8189D81F46', 1, 'Romania', 'N', 'Y', 'ROU') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('RU', '56908AA379C8661BE0404F8189D81F46', 1, 'Russian Federation', 'N', 'Y', 'RUS') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('RW', '56908AA379C9661BE0404F8189D81F46', 1, 'Rwanda', 'N', 'Y', 'RWA') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('RE', '56908AA379C3661BE0404F8189D81F46', 1, 'Réunion', 'N', 'Y', 'REU') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('BL', '56908AA3791B661BE0404F8189D81F46', 1, 'Saint Barthélemy', 'N', 'Y', 'BLM') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('SH', '56908AA379D0661BE0404F8189D81F46', 1, 'St. Helena, Ascension, Tristan Da Cunha', 'N', 'Y', 'SHN') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('KN', '56908AA379CC661BE0404F8189D81F46', 1, 'Saint Kitts And Nevis', 'N', 'Y', 'KNA') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('LC', '56908AA379D8661BE0404F8189D81F46', 1, 'Saint Lucia', 'N', 'Y', 'LCA') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('MF', '56908AA3791D661BE0404F8189D81F46', 1, 'Saint Martin', 'N', 'Y', 'MAF') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('PM', '56908AA379CB661BE0404F8189D81F46', 1, 'Saint Pierre And Miquelon', 'N', 'Y', 'SPM') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('VC', '56908AA379F5661BE0404F8189D81F46', 1, 'Saint Vincent And The Grenedines', 'N', 'Y', 'VCT') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('WS', '56908AA37A00661BE0404F8189D81F46', 1, 'Samoa', 'N', 'Y', 'WSM') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('SM', '56908AA379D3661BE0404F8189D81F46', 1, 'San Marino', 'N', 'Y', 'SMR') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('ST', '56908AA379E7661BE0404F8189D81F46', 1, 'Sao Tome and Principe', 'N', 'Y', 'STP') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('SA', '56908AA379CA661BE0404F8189D81F46', 1, 'Saudi Arabia', 'N', 'Y', 'SAU') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('SN', '56908AA379CF661BE0404F8189D81F46', 1, 'Senegal', 'N', 'Y', 'SEN') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('RS', '56908AA379D7661BE0404F8189D81F46', 1, 'Serbia', 'N', 'Y', 'SRB') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('SC', '56908AA379CD661BE0404F8189D81F46', 1, 'Seychelles', 'N', 'Y', 'SYC') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('SL', '56908AA379D2661BE0404F8189D81F46', 1, 'Sierra Leone', 'N', 'Y', 'SLE') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('SG', '56908AA379D4661BE0404F8189D81F46', 1, 'Singapore', 'N', 'Y', 'SGP') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('SK', '56908AA3798B661BE0404F8189D81F46', 1, 'Slovakia', 'N', 'Y', 'SVK') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('SI', '56908AA379D1661BE0404F8189D81F46', 1, 'Slovenia', 'N', 'Y', 'SVN') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('SB', '56908AA3791A661BE0404F8189D81F46', 1, 'Solomon Islands', 'N', 'Y', 'SLB') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('SO', '56908AA379D5661BE0404F8189D81F46', 1, 'Somalia', 'N', 'Y', 'SOM') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('ZA', '56908AA379CE661BE0404F8189D81F46', 1, 'South Africa', 'N', 'Y', 'ZAF') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('GS', '56908AA37931661BE0404F8189D81F46', 1, 'South Georgia and South Sandwich Islands', 'N', 'Y', 'SGS') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('ES', '56908AA379D6661BE0404F8189D81F46', 1, 'Spain', 'N', 'Y', 'ESP') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('LK', '56908AA37926661BE0404F8189D81F46', 1, 'Sri Lanka', 'N', 'Y', 'LKA') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('SD', '56908AA379D9661BE0404F8189D81F46', 1, 'Sudan', 'N', 'Y', 'SDN') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('SR', '56908AA379B2661BE0404F8189D81F46', 1, 'Suriname', 'N', 'Y', 'SUR') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('SJ', '56908AA379DA661BE0404F8189D81F46', 1, 'Svalbard And Jan Mayen', 'N', 'Y', 'SJM') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('SZ', '56908AA37A01661BE0404F8189D81F46', 1, 'Swaziland', 'N', 'Y', 'SWZ') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('SE', '56908AA379DB661BE0404F8189D81F46', 1, 'Sweden', 'N', 'Y', 'SWE') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('CH', '56908AA379DD661BE0404F8189D81F46', 1, 'Switzerland', 'N', 'Y', 'CHE') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('SY', '56908AA379DC661BE0404F8189D81F46', 1, 'Syrian Arab Republic', 'N', 'Y', 'SYR') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('TW', '56908AA379EB661BE0404F8189D81F46', 1, 'Taiwan, Province Of China', 'N', 'Y', 'TWN') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('TJ', '56908AA379E2661BE0404F8189D81F46', 1, 'Tajikistan', 'N', 'Y', 'TJK') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('TZ', '56908AA379ED661BE0404F8189D81F46', 1, 'Tanzania, United Republic of', 'N', 'Y', 'TZA') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('TH', '56908AA379E1661BE0404F8189D81F46', 1, 'Thailand', 'N', 'Y', 'THA') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('TL', '56908AA37945661BE0404F8189D81F46', 1, 'Timor-Leste', 'N', 'Y', 'TLS') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('TG', '56908AA379E6661BE0404F8189D81F46', 1, 'Togo', 'N', 'Y', 'TGO') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('TK', '56908AA379E4661BE0404F8189D81F46', 1, 'Tokelau', 'N', 'Y', 'TKL') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('TO', '56908AA379E5661BE0404F8189D81F46', 1, 'Tonga', 'N', 'Y', 'TON') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('TT', '56908AA379DF661BE0404F8189D81F46', 1, 'Trinidad and Tobago', 'N', 'Y', 'TTO') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('TN', '56908AA379E8661BE0404F8189D81F46', 1, 'Tunisia', 'N', 'Y', 'TUN') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('TR', '56908AA379E9661BE0404F8189D81F46', 1, 'Turkey', 'N', 'Y', 'TUR') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('TM', '56908AA379EC661BE0404F8189D81F46', 1, 'Turkmenistan', 'N', 'Y', 'TKM') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('TC', '56908AA379E3661BE0404F8189D81F46', 1, 'Turks and Caicos Islands', 'N', 'Y', 'TCA') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('TV', '56908AA379EA661BE0404F8189D81F46', 1, 'Tuvalu', 'N', 'Y', 'TUV') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('UG', '56908AA379EE661BE0404F8189D81F46', 1, 'Uganda', 'N', 'Y', 'UGA') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('UA', '56908AA379F0661BE0404F8189D81F46', 1, 'Ukraine', 'N', 'Y', 'UKR') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('AE', '56908AA379DE661BE0404F8189D81F46', 1, 'United Arab Emirates', 'N', 'Y', 'ARE') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('GB', '56908AA379EF661BE0404F8189D81F46', 1, 'United Kingdom', 'N', 'Y', 'GBR') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('UM', '56908AA3799E661BE0404F8189D81F46', 1, 'United States Minor Outlying Islands', 'N', 'Y', 'UMI') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('UY', '56908AA379F3661BE0404F8189D81F46', 1, 'Uruguay', 'N', 'Y', 'URY') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('UZ', '56908AA379F4661BE0404F8189D81F46', 1, 'Uzbekistan', 'N', 'Y', 'UZB') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('VU', '56908AA379AC661BE0404F8189D81F46', 1, 'Vanuatu', 'N', 'Y', 'VUT') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('VE', '56908AA379F6661BE0404F8189D81F46', 1, 'Venezuela, Bolivarian Republic of', 'N', 'Y', 'VEN') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('VN', '56908AA379F8661BE0404F8189D81F46', 1, 'Viet Nam', 'N', 'Y', 'VNM') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('VG', '56908AA379F7661BE0404F8189D81F46', 1, 'Virgin Islands, British', 'N', 'Y', 'VGB') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('VI', '56908AA379F9661BE0404F8189D81F46', 1, 'Virgin Islands, U.S.', 'N', 'Y', 'VIR') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('WF', '56908AA379FD661BE0404F8189D81F46', 1, 'Wallis and Futuna', 'N', 'Y', 'WLF') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('EH', '56908AA379FE661BE0404F8189D81F46', 1, 'Western Sahara', 'N', 'Y', 'ESH') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('YE', '56908AA37A02661BE0404F8189D81F46', 1, 'Yemen', 'N', 'Y', 'YEM') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('ZM', '56908AA37A04661BE0404F8189D81F46', 1, 'Zambia', 'N', 'Y', 'ZMB') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('ZW', '56908AA37A05661BE0404F8189D81F46', 1, 'Zimbabwe', 'N', 'Y', 'ZWE') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('AX', '56908AA3794E661BE0404F8189D81F46', 1, 'Ã…land Islands', 'N', 'Y', 'ALA') / INSERT INTO KR_COUNTRY_T(POSTAL_CNTRY_CD, OBJ_ID, VER_NBR, POSTAL_CNTRY_NM, PSTL_CNTRY_RSTRC_IND, ACTV_IND, ALT_POSTAL_CNTRY_CD) VALUES('ZZ', '56908AA379B5661BE0404F8189D81F46', 1, 'Other Countries', 'N', 'Y', 'ZZZ') / --714 is the permission for looking up a pessimistic lock delete from KRIM_PERM_ATTR_DATA_T where PERM_ID = '714' / delete from KRIM_ROLE_PERM_T where PERM_ID = '714' / delete from KRIM_PERM_T where PERM_ID = '714' /
            Hide
            jjhanso Jeremy Hanson added a comment -

            SQL has been run against master dbs.

            Show
            jjhanso Jeremy Hanson added a comment - SQL has been run against master dbs.
            Hide
            jjhanso Jeremy Hanson added a comment -

            This is done for today. There may be minor bug fixes that get done on 1.0.3, so I'm leaving this open until 1.0.3 is officially releases.

            Show
            jjhanso Jeremy Hanson added a comment - This is done for today. There may be minor bug fixes that get done on 1.0.3, so I'm leaving this open until 1.0.3 is officially releases.
            Hide
            jjhanso Jeremy Hanson added a comment -

            latest merge command: svn merge -r 14215:HEAD https://test.kuali.org/svn/rice/branches/rice-release-1-0-3-br/

            Show
            jjhanso Jeremy Hanson added a comment - latest merge command: svn merge -r 14215:HEAD https://test.kuali.org/svn/rice/branches/rice-release-1-0-3-br/
            Hide
            jjhanso Jeremy Hanson added a comment -

            merge results

            C:\java\projects\rice-1.1.0>svn merge -r 14521:HEAD https://test.kuali.org/svn/rice/branches/rice-release-1-0-3-br/
            — Merging r14522 through r14646 into '.':
            U ksb\src\test\java\org\kuali\rice\ksb\testclient1\Storage.java
            U ksb\src\test\java\org\kuali\rice\ksb\testclient1\InboxResourceImpl.java
            U ksb\src\test\java\org\kuali\rice\ksb\testclient1\BaseballCardCollectionServiceImpl.java
            U ksb\src\test\java\org\kuali\rice\ksb\testclient1\MessageResourceImpl.java
            U ksb\src\test\java\org\kuali\rice\ksb\messaging\RestServiceDefinitionTest.java
            U ksb\src\test\java\org\kuali\rice\ksb\messaging\exceptionhandling\TestExceptionHandlerServiceImpl.java
            U ksb\src\test\java\org\kuali\rice\ksb\messaging\remotedservices\BaseballCard.java
            U ksb\src\test\java\org\kuali\rice\ksb\messaging\remotedservices\Inbox.java
            U ksb\src\test\java\org\kuali\rice\ksb\messaging\remotedservices\Message.java
            U ksb\src\test\java\org\kuali\rice\ksb\messaging\remotedservices\InboxResource.java
            U ksb\src\test\java\org\kuali\rice\ksb\messaging\remotedservices\MessageResource.java
            U ksb\src\test\java\org\kuali\rice\ksb\messaging\remotedservices\BaseballCardCollectionService.java
            U ksb\src\test\java\org\kuali\rice\ksb\messaging\ServiceUpdateAndRemovalTest.java
            Conflict discovered in 'ksb/pom.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C ksb\pom.xml
            U kim\src\test\java\org\kuali\rice\kim\test\bo\group\impl\GroupAttributeDataImplTest.java
            U kim\src\test\java\org\kuali\rice\kim\test\service\PersonServiceImplTest.java
            U kim\src\test\java\org\kuali\rice\kim\test\service\IdentityArchiveServiceTest.java
            U kim\src\test\java\org\kuali\rice\kim\test\service\PermissionServiceRemoteTest.java
            U kim\src\test\java\org\kuali\rice\kim\test\service\GroupServiceRemoteTest.java
            U kim\src\test\java\org\kuali\rice\kim\test\service\RoleServiceRemoteTest.java
            U kim\src\test\java\org\kuali\rice\kim\test\GroupMemberImplTest.java
            U kim\src\test\java\org\kuali\rice\kim\service\KIMServiceLocatorTest.java
            U kim\src\test\java\org\kuali\rice\kim\util\KimCommonUtilsTest.java
            U kim\src\test\resources\KIMTestHarnessSpringBeans.xml
            Conflict discovered in 'kim/pom.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C kim\pom.xml
            U sampleapp\scripts\sql\mysql\create_travel_tables.sql
            U sampleapp\scripts\sql\mysql\default_travel_data.sql
            U sampleapp\scripts\sql\oracle\default_travel_data.sql
            A sampleapp\scripts\docTypes
            A sampleapp\scripts\docTypes\TravelRequestDocType.xml
            U sampleapp\src\main\java\edu\sampleu\travel\bo\TravelAccountUseRate.java
            U sampleapp\src\main\resources\edu\sampleu\travel\datadictionary\FiscalOfficerMaintenanceDocument.xml
            U sampleapp\src\main\resources\edu\sampleu\travel\datadictionary\FiscalOfficer-Extension.xml
            Conflict discovered in 'sampleapp/pom.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C sampleapp\pom.xml
            U kew\src\test\java\org\kuali\rice\kew\workgroup\GroupXmlImportJAXBTest.java
            U kew\src\test\java\org\kuali\rice\kew\docmentlink\DocumentLinkTest.java
            D kew\src\test\java\org\kuali\rice\kew\test\web\framework\Filter.java
            D kew\src\test\java\org\kuali\rice\kew\test\web\TestServletTest.java
            D kew\src\test\java\org\kuali\rice\kew\test\web\TestServlet.java
            D kew\src\test\java\org\kuali\rice\kew\test\web\framework\LocalWorkflowInteractionController.java
            D kew\src\test\java\org\kuali\rice\kew\test\web\ChainingFilter.java
            D kew\src\test\java\org\kuali\rice\kew\test\web\framework\LocalInteractionController.java
            D kew\src\test\java\org\kuali\rice\kew\test\web\framework\RegexReplacementFilter.java
            D kew\src\test\java\org\kuali\rice\kew\test\web\framework\ScriptAction.java
            D kew\src\test\java\org\kuali\rice\kew\test\web\framework\Script.java
            D kew\src\test\java\org\kuali\rice\kew\test\web\framework\ScriptState.java
            D kew\src\test\java\org\kuali\rice\kew\test\web\DelegatingWorkflowServlet.java
            D kew\src\test\java\org\kuali\rice\kew\test\web\framework\schemes
            D kew\src\test\java\org\kuali\rice\kew\test\web\framework\PropertyScheme.java
            D kew\src\test\java\org\kuali\rice\kew\test\web\framework\Util.java
            D kew\src\test\java\org\kuali\rice\kew\test\web\framework\actions
            D kew\src\test\java\org\kuali\rice\kew\test\web\framework\InteractionController.java
            D kew\src\test\java\org\kuali\rice\kew\test\web\framework\Property.java
            U kew\src\test\java\org\kuali\rice\kew\mail\EmailContentServiceTest.java
            U kew\src\test\java\org\kuali\rice\kew\actions\SimpleDocumentActionsWebServiceTest.java
            U kew\src\test\java\org\kuali\rice\kew\actions\ReturnToPreviousTestSplit.java
            U kew\src\test\java\org\kuali\rice\kew\xml\TestGroupNamespaceURIHandler.java
            U kew\src\test\java\org\kuali\rice\kew\role\service\impl\ActionRequestDerivedRoleTypeServiceImplTest.java
            D kew\src\test\java\org\kuali\rice\kew\edl\EDocLiteScriptedTest.java
            U kew\src\test\java\org\kuali\rice\kew\rule\RuleTestUtils.java
            U kew\src\test\java\mocks\MockJavaMailSender.java
            U kew\src\test\java\mocks\MockMailer.java
            D kew\src\test\resources\org\kuali\rice\kew\test\web
            U kew\src\test\resources\org\kuali\rice\kew\batch\data\widgetsTest.xml
            U kew\src\test\resources\org\kuali\rice\kew\docsearch\xml\SearchableAttributesSpringBeans.xml
            U kew\src\test\resources\org\kuali\rice\kew\docsearch\SearchableTrimTest.xml
            U kew\src\test\resources\org\kuali\rice\kew\workgroup\GroupXmlImportJAXBTest.xml
            U kew\src\test\resources\org\kuali\rice\kew\xml\TestKEWAppDocStatus.xml
            U kew\src\test\resources\org\kuali\rice\kew\role\service\impl\ActionRequestDerivedRoleTypeServiceImplTest.xml
            D kew\src\test\resources\org\kuali\rice\kew\edl\GradSchoolEDL.xml
            D kew\src\test\resources\org\kuali\rice\kew\edl\GradSchoolScript.xml
            D kew\src\test\resources\org\kuali\rice\kew\edl\GradSchoolRoutingConfiguration.xml
            D kew\src\test\resources\org\kuali\rice\kew\edl\GradSchoolTestUsersAndGroups.xml
            D kew\src\test\resources\org\kuali\rice\kew\edl\GradSchoolRules.xml
            U kew\src\test\resources\org\kuali\rice\kew\config\OverrideTestSpringBeans.xml
            U kew\src\test\resources\org\kuali\rice\kew\routeheader\AppDocStatusTestConfig.xml
            U kew\src\test\resources\org\kuali\rice\core\util\RiceServiceOverrideTestSpringBeans.xml
            Conflict discovered in 'kew/pom.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C kew\pom.xml
            U scripts\dataset\bootstrap-server-dataset-cleanup.sql
            U scripts\upgrades\1.0.2 to 1.0.3\db-updates-client\mysql\2010-09-09.sql
            U scripts\upgrades\1.0.2 to 1.0.3\db-updates-client\oracle\2010-09-09.sql
            U scripts\upgrades\1.0.2 to 1.0.3\db-updates\mysql\2010-06-30.sql
            U scripts\upgrades\1.0.2 to 1.0.3\db-updates\mysql\2010-05-14.sql
            U scripts\upgrades\1.0.2 to 1.0.3\db-updates\mysql\2010-06-23.sql
            U scripts\upgrades\1.0.2 to 1.0.3\db-updates\mysql\2010-09-02.sql
            U scripts\upgrades\1.0.2 to 1.0.3\db-updates\mysql\2010-09-14.sql
            U scripts\upgrades\1.0.2 to 1.0.3\db-updates\mysql\2010-09-24.sql
            U scripts\upgrades\1.0.2 to 1.0.3\db-updates\mysql\2010-09-09.sql
            U scripts\upgrades\1.0.2 to 1.0.3\db-updates\mysql\2010-09-28.sql
            U scripts\upgrades\1.0.2 to 1.0.3\db-updates\oracle\2010-06-30.sql
            U scripts\upgrades\1.0.2 to 1.0.3\db-updates\oracle\2010-05-14.sql
            U scripts\upgrades\1.0.2 to 1.0.3\db-updates\oracle\2010-06-23.sql
            U scripts\upgrades\1.0.2 to 1.0.3\db-updates\oracle\2010-09-14.sql
            U scripts\upgrades\1.0.2 to 1.0.3\db-updates\oracle\2010-09-24.sql
            U scripts\upgrades\1.0.2 to 1.0.3\db-updates\oracle\2010-09-09.sql
            U scripts\upgrades\1.0.2 to 1.0.3\db-updates\oracle\2010-09-28.sql
            C scripts\upgrades\1.0.2 to 1.0.3\final
            U scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\01-04-2010.sql
            U scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\12-07-2009.sql
            U scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\12-16-2009.sql
            U scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\02-02-2010.sql
            U scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\12-09-2009.sql
            U scripts\upgrades\1.0.1.1 to 1.0.2\db-updates\2009-10-02.sql
            U scripts\upgrades\1.0.1.1 to 1.0.2\db-updates\2010-03-19.sql
            U scripts\upgrades\1.0.1.1 to 1.0.2\db-updates\2009-10-05.sql
            A scripts\upgrades\1.0.1.1 to 1.0.2\final\update_final_mysql.sql
            C scripts\upgrades\1.0.1.1 to 1.0.2\final\update_client_final_mysql.sql
            C scripts\upgrades\1.0.1.1 to 1.0.2\final\update_client_final_oracle.sql
            C scripts\upgrades\1.0.1.1 to 1.0.2\final\udpate_final_mysql.sql
            U scripts\createproject.groovy
            Conflict discovered in 'pom.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C pom.xml
            U kns\src\test\java\org\kuali\rice\kns\test\document\SearchAttributeIndexTestDocument.java
            U kns\src\test\java\org\kuali\rice\kns\test\document\AccountStateKeyValues.java
            U kns\src\test\java\org\kuali\rice\kns\test\document\AccountWithDDAttributesDocument.java
            U kns\src\test\java\org\kuali\rice\kns\bo\AttributeReferenceElementsTest.java
            U kns\src\test\java\org\kuali\rice\kns\bo\PostalCodeImplTest.java
            U kns\src\test\java\org\kuali\rice\kns\bo\PersistableAttachmentBaseTest.java
            U kns\src\test\java\org\kuali\rice\kns\bo\SessionDocumentTest.java
            Conflict discovered in 'kns/src/test/java/org/kuali/rice/kns/bo/StateImplTest.java'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C kns\src\test\java\org\kuali\rice\kns\bo\StateImplTest.java
            Conflict discovered in 'kns/src/test/java/org/kuali/rice/kns/bo/CountryImplTest.java'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C kns\src\test\java\org\kuali\rice\kns\bo\CountryImplTest.java
            U kns\src\test\java\org\kuali\rice\kns\bo\DocumentAttachmentTest.java
            Conflict discovered in 'kns/src/test/java/org/kuali/rice/kns/bo/NoteTypeTest.java'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C kns\src\test\java\org\kuali\rice\kns\bo\NoteTypeTest.java
            U kns\src\test\java\org\kuali\rice\kns\bo\AttachmentTest.java
            U kns\src\test\java\org\kuali\rice\kns\bo\BusinessObjectAttributeEntryTest.java
            U kns\src\test\java\org\kuali\rice\kns\bo\CampusImplTest.java
            U kns\src\test\java\org\kuali\rice\kns\bo\LookupResultsTest.java
            Conflict discovered in 'kns/src/test/java/org/kuali/rice/kns/bo/CampusTypeImplTest.java'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C kns\src\test\java\org\kuali\rice\kns\bo\CampusTypeImplTest.java
            U kns\src\test\java\org\kuali\rice\kns\bo\AttributeReferenceDummyTest.java
            U kns\src\test\java\org\kuali\rice\kns\service\InactivateableFromToServiceTest.java
            U kns\src\test\java\org\kuali\rice\kns\workflow\SearchAttributeIndexRequestTest.java
            U kns\src\test\java\org\kuali\rice\kns\workflow\DataDictionarySearchableAttributeTest.java
            U kns\src\test\java\org\kuali\rice\kns\util\PatternedStringBuilderTest.java
            U kns\src\test\resources\KR-Test-ApplicationResources.properties
            U kns\src\test\resources\testAccountUseRate.sql
            U kns\src\test\resources\org\kuali\rice\kns\test\DefaultSuiteTestData.sql
            U kns\src\test\resources\org\kuali\rice\kns\test\document\SearchAttributeIndexTestDocument.xml
            U kns\src\test\resources\org\kuali\rice\kns\test\document\LookupResultsDDBo.xml
            U kns\src\test\resources\org\kuali\rice\kns\test\document\AccountWithDDAttributesDocument.xml
            Conflict discovered in 'kns/pom.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C kns\pom.xml
            Conflict discovered in 'kcb/pom.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C kcb\pom.xml
            U impl\src\test\java\org\kuali\rice\core\xml\TestSchemaValidationErrorHandler.java
            U impl\src\test\java\org\kuali\rice\core\xml\TestSchemaLSResourceResolver.java
            U impl\src\test\resources\org\kuali\rice\core\xml\GroupInstance1.xml
            U impl\src\test\resources\org\kuali\rice\core\xml\GroupInstance2.xml
            U impl\src\test\resources\org\kuali\rice\core\xml\Groups-1.0.3.xml
            U impl\src\test\resources\org\kuali\rice\core\xml\BadGroup-1.0.3a.xsd
            U impl\src\test\resources\org\kuali\rice\core\config\jaxb-test-circular.xml
            U impl\src\test\resources\org\kuali\rice\core\config\jaxb-test-context.xml
            U impl\src\test\resources\org\kuali\rice\core\config\jaxb-test-config.xml
            U impl\src\test\resources\org\kuali\rice\core\config\jaxb-test-circular2.xml
            U impl\src\test\resources\org\kuali\rice\core\config\jaxb-test-import-config.xml
            U impl\src\test\resources\org\kuali\rice\core\config\jaxb-test-override.xml
            U impl\src\main\java\org\kuali\rice\ksb\messaging\serviceexporters\AbstractWebServiceExporter.java
            U impl\src\main\java\org\kuali\rice\ksb\messaging\FlattenedServiceDefinition.java
            U impl\src\main\java\org\kuali\rice\ksb\messaging\serviceconnectors\ResourceFacadeImpl.java
            Conflict discovered in 'impl/src/main/java/org/kuali/rice/kim/bo/entity/impl/KimDefaultableEntityDataBase.java'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\src\main\java\org\kuali\rice\kim\bo\entity\impl\KimDefaultableEntityDataBase.java
            U impl\src\main\java\org\kuali\rice\kim\service\impl\PersonServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kim\service\impl\UiDocumentServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kim\lookup\RoleMemberLookupableHelperServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kim\util\KualiDateMask.java
            U impl\src\main\java\org\kuali\rice\kim\web\struts\action\IdentityManagementRoleDocumentAction.java
            U impl\src\main\java\org\kuali\rice\kim\document\rule\ActiveRoleMemberHelper.java
            U impl\src\main\java\org\kuali\rice\kew\documentlink\service\impl\DocumentLinkServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kew\documentlink\service\DocumentLinkService.java
            U impl\src\main\java\org\kuali\rice\kew\documentlink\dao\DocumentLinkDAO.java
            U impl\src\main\java\org\kuali\rice\kew\documentlink\dao\impl\DocumentLinkDAOJpaImpl.java
            U impl\src\main\java\org\kuali\rice\kew\documentlink\dao\impl\DocumentLinkDAOOjbImpl.java
            U impl\src\main\java\org\kuali\rice\kew\documentlink\dao\impl\DocumentLinkDaoUtil.java
            U impl\src\main\java\org\kuali\rice\kew\documentlink\DocumentLink.java
            U impl\src\main\java\org\kuali\rice\kew\routelog\web\RouteLogAction.java
            U impl\src\main\java\org\kuali\rice\kew\doctype\ApplicationDocumentStatusId.java
            U impl\src\main\java\org\kuali\rice\kew\doctype\ApplicationDocumentStatus.java
            U impl\src\main\java\org\kuali\rice\kew\doctype\LazyLoadSecurityAttribute.java
            U impl\src\main\java\org\kuali\rice\kew\ria\bo\RIADocTypeMap.java
            U impl\src\main\java\org\kuali\rice\kew\ria\service\RIAServiceLocator.java
            U impl\src\main\java\org\kuali\rice\kew\ria\service\impl\RIADocumentServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kew\ria\service\RIADocumentService.java
            U impl\src\main\java\org\kuali\rice\kew\ria\valuefinder\YesNoValueFinder.java
            U impl\src\main\java\org\kuali\rice\kew\ria\valuefinder\RIADocTypeMapNextIdFinder.java
            U impl\src\main\java\org\kuali\rice\kew\ria\valuefinder\SequenceNextIdFinder.java
            U impl\src\main\java\org\kuali\rice\kew\ria\RIAConstants.java
            U impl\src\main\java\org\kuali\rice\kew\ria\authorizer\RIADocumentAuthorizer.java
            U impl\src\main\java\org\kuali\rice\kew\ria\web\RIADocumentAction.java
            U impl\src\main\java\org\kuali\rice\kew\ria\web\RIADocumentForm.java
            U impl\src\main\java\org\kuali\rice\kew\ria\document\RIADocument.java
            U impl\src\main\java\org\kuali\rice\kew\mail\service\impl\EmailToList.java
            U impl\src\main\java\org\kuali\rice\kew\mail\service\impl\EmailBcList.java
            U impl\src\main\java\org\kuali\rice\kew\mail\service\impl\EmailCcList.java
            U impl\src\main\java\org\kuali\rice\kew\actionrequest\ActionRequestValue.java
            U impl\src\main\java\org\kuali\rice\kew\docsearch\DocumentLookupCriteriaProcessorKEWAdapter.java
            U impl\src\main\java\org\kuali\rice\kew\docsearch\StandardDocumentSearchResultProcessor.java
            U impl\src\main\java\org\kuali\rice\kew\docsearch\StandardDocumentSearchGenerator.java
            U impl\src\main\java\org\kuali\rice\kew\service\impl\WorkflowUtilityWebServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kew\xml\GroupXmlJAXBParser.java
            U impl\src\main\java\org\kuali\rice\kew\xml\GroupNamespaceURIFilter.java
            U impl\src\main\java\org\kuali\rice\kew\xml\TestGroupNamespaceURIFilter.java
            U impl\src\main\java\org\kuali\rice\kew\xml\AbstractTransformationFilter.java
            U impl\src\main\java\org\kuali\rice\kew\xml\GroupNamespaceURIMemberTransformationFilterPOC.java
            U impl\src\main\java\org\kuali\rice\kew\xml\GroupNamespaceURIAllInOneFilterPOC.java
            U impl\src\main\java\org\kuali\rice\kew\xml\GroupNamespaceURITransformationFilterPOC.java
            U impl\src\main\java\org\kuali\rice\kew\xml\GroupNamespaceURIHandlerPOC.java
            U impl\src\main\java\org\kuali\rice\kew\xml\GroupNamespaceURIEliminationFilterPOC.java
            U impl\src\main\java\org\kuali\rice\kew\edl\components\RefreshFromLookupComponent.java
            U impl\src\main\java\org\kuali\rice\kew\edl\components\WorkflowDocumentState.java
            U impl\src\main\java\org\kuali\rice\kew\edl\components\EstablishUserAction.java
            U impl\src\main\java\org\kuali\rice\kew\edl\components\PerformLookupComponent.java
            U impl\src\main\java\org\kuali\rice\kew\routeheader\DocumentStatusTransition.java
            U impl\src\main\java\org\kuali\rice\kew\rule\service\impl\RuleDelegationCacheProcessorImpl.java
            U impl\src\main\java\org\kuali\rice\kew\rule\service\RuleDelegationCacheProcessor.java
            U impl\src\main\java\org\kuali\rice\kew\rule\dao\impl\RuleDelegationDAOOjbImpl.java
            U impl\src\main\java\org\kuali\rice\core\xml\XMLInputFilterDefinition.java
            U impl\src\main\java\org\kuali\rice\core\xml\InitialXMLFilter.java
            U impl\src\main\java\org\kuali\rice\core\xml\PassthruXMLFilter.java
            U impl\src\main\java\org\kuali\rice\core\xml\schema\SchemaValidationErrorHandler.java
            U impl\src\main\java\org\kuali\rice\core\xml\schema\RiceSchemaValidationFilter.java
            U impl\src\main\java\org\kuali\rice\core\xml\schema\RiceSchemaValidationEventCollector.java
            U impl\src\main\java\org\kuali\rice\core\xml\schema\SchemaLSResourceResolver.java
            U impl\src\main\java\org\kuali\rice\core\xml\schema\RiceXmlSchemaFactory.java
            U impl\src\main\java\org\kuali\rice\core\xml\ChainedXMLFilter.java
            U impl\src\main\java\org\kuali\rice\core\xml\XMLExporterBase.java
            U impl\src\main\java\org\kuali\rice\core\xml\XMLInputFilterEntry.java
            U impl\src\main\java\org\kuali\rice\core\xml\XMLImportExportServiceBase.java
            U impl\src\main\java\org\kuali\rice\core\xml\ChainedXMLFilterBase.java
            U impl\src\main\java\org\kuali\rice\core\xml\XMLImporterBase.java
            U impl\src\main\java\org\kuali\rice\core\xml\XMLRenameFilter.java
            U impl\src\main\java\org\kuali\rice\core\config\event\RiceConfigEventListener.java
            U impl\src\main\java\org\kuali\rice\core\config\logging\Log4jLifeCycle.java
            U impl\src\main\java\org\kuali\rice\core\config\spring\RiceConfigPropertyPlaceholderConfigurer.java
            U impl\src\main\java\org\kuali\rice\core\config\spring\RiceConfigBeanDefinitionVisitor.java
            U impl\src\main\java\org\kuali\rice\core\versions\VersionHelper.java
            U impl\src\main\java\org\kuali\rice\core\versions\annotations\DeprecatedSince.java
            U impl\src\main\java\org\kuali\rice\core\versions\annotations\SupportedSince.java
            U impl\src\main\java\org\kuali\rice\core\util\KeyValue.java
            U impl\src\main\java\org\kuali\rice\kns\datadictionary\FieldOverride.java
            U impl\src\main\java\org\kuali\rice\kns\datadictionary\RIADataDictionaryMapper.java
            U impl\src\main\java\org\kuali\rice\kns\datadictionary\DataDictionaryMapper.java
            U impl\src\main\java\org\kuali\rice\kns\datadictionary\DataDictionaryIndex.java
            U impl\src\main\java\org\kuali\rice\kns\datadictionary\impl\FieldOverrideForListElementDeleteImpl.java
            U impl\src\main\java\org\kuali\rice\kns\datadictionary\impl\FieldOverrideForValueReplaceImpl.java
            U impl\src\main\java\org\kuali\rice\kns\datadictionary\impl\BeanOverrideImpl.java
            U impl\src\main\java\org\kuali\rice\kns\datadictionary\impl\FieldOverrideForListElementInsertImpl.java
            U impl\src\main\java\org\kuali\rice\kns\datadictionary\impl\FieldOverrideForListElementBase.java
            U impl\src\main\java\org\kuali\rice\kns\datadictionary\impl\FieldOverrideForListElementReplaceImpl.java
            U impl\src\main\java\org\kuali\rice\kns\datadictionary\DataDictionary.java
            U impl\src\main\java\org\kuali\rice\kns\datadictionary\MaintainableFieldDefinition.java
            U impl\src\main\java\org\kuali\rice\kns\datadictionary\BeanOverride.java
            U impl\src\main\java\org\kuali\rice\kns\datadictionary\DataDictionaryIndexMapper.java
            U impl\src\main\java\org\kuali\rice\kns\service\impl\InactivateableFromToServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kns\service\impl\DocumentAdHocServiceImpl.java
            U impl\src\main\java\org\kuali\rice\kns\service\InactivateableFromToService.java
            U impl\src\main\java\org\kuali\rice\kns\service\MaintenanceDocumentDictionaryService.java
            U impl\src\main\java\org\kuali\rice\kns\service\DocumentAdHocService.java
            U impl\src\main\java\org\kuali\rice\kns\lookup\LookupResultsSupportStrategyService.java
            U impl\src\main\java\org\kuali\rice\kns\util\ObjectUtils.java
            U impl\src\main\java\org\kuali\rice\kns\util\RiceKeyConstants.java
            U impl\src\main\java\org\kuali\rice\kns\util\SessionTicket.java
            U impl\src\main\java\org\kuali\rice\kns\web\struts\form\AuthorizationExceptionForm.java
            U impl\src\main\java\org\kuali\rice\kns\web\struts\form\KualiLogoutForm.java
            U impl\src\main\java\org\kuali\rice\kns\web\struts\form\InquiryForm.java
            U impl\src\main\java\org\kuali\rice\kns\web\struts\pojo\AuthorizationExceptionHandler.java
            U impl\src\main\java\org\kuali\rice\kns\web\struts\action\KualiMaintenanceDocumentAction.java
            U impl\src\main\java\org\kuali\rice\kns\web\struts\action\KualiPropertyMessageResources.java
            U impl\src\main\java\org\kuali\rice\kns\web\struts\action\AuthorizationExceptionAction.java
            U impl\src\main\java\org\kuali\rice\kns\web\struts\action\KualiLogoutAction.java
            U impl\src\main\java\org\kuali\rice\kns\web\filter\AutoLoginFilter.java
            U impl\src\main\java\org\kuali\rice\kns\web\format\ArrayFormatter.java
            U impl\src\main\java\org\kuali\rice\kns\web\ui\PropertyRenderingConfigElement.java
            U impl\src\main\resources\schema\Core-1.0.3.xsd
            U impl\src\main\resources\schema\Group-1.0.3.xsd
            U impl\src\main\resources\schema\config.xsd
            U impl\src\main\resources\schema\AttributeSet-1.0.3.xsd
            U impl\src\main\resources\schema\Groups-1.0.3.xsd
            U impl\src\main\resources\schema\data-1.0.3.xsd
            U impl\src\main\resources\schema\group-1.0.3.a.xsd
            U impl\src\main\resources\KR-ApplicationResources.properties
            U impl\src\main\resources\KIM-ApplicationResources.properties
            U impl\src\main\resources\org\kuali\rice\kcb\config\KCBSpringBeans-test.xml
            U impl\src\main\resources\org\kuali\rice\ksb\config\KSBThinClientSpringBeans.xml
            U impl\src\main\resources\org\kuali\rice\kim\bo\datadictionary\ResponsibilityImpl.xml
            U impl\src\main\resources\org\kuali\rice\kim\bo\datadictionary\PermissionImpl.xml
            U impl\src\main\resources\org\kuali\rice\kew\bo\datadictionary\DocSearchCriteriaDTO.xml
            U impl\src\main\resources\org\kuali\rice\kew\dwr-core.xml
            U impl\src\main\resources\org\kuali\rice\kew\edl\default-widgets.xml
            U impl\src\main\resources\org\kuali\rice\kew\config\KEWSpringBeans.xml
            U impl\src\main\resources\org\kuali\rice\kew\config\KEWServiceBusSOAPDefaultSpringBeans.xml
            U impl\src\main\resources\org\kuali\rice\kew\config\OJB-repository-kew.xml
            U impl\src\main\resources\org\kuali\rice\kew\config\KEWServiceBusSpringBeans.xml
            U impl\src\main\resources\org\kuali\rice\kew\ria\bo\datadictionary\RIADocTypeMap.xml
            U impl\src\main\resources\org\kuali\rice\kew\ria\document\datadictionary\RIADocTypeMapMaintenanceDocument.xml
            U impl\src\main\resources\org\kuali\rice\core\config-coded-defaults.xml
            U impl\src\main\resources\org\kuali\rice\core\RiceDataSourceSpringBeans.xml
            U impl\src\main\resources\org\kuali\rice\core\RiceDataSourceStandaloneClientSpringBeans.xml.template
            U impl\src\main\resources\org\kuali\rice\core\RiceJTASpringBeans.xml
            U impl\src\main\resources\org\kuali\rice\kns\bo\datadictionary\Country.xml
            Conflict discovered in 'impl/pom.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C impl\pom.xml
            U config\ria\ria-acrobat.js
            U config\ria\RIADocumentBootstrap.xml
            U config\templates\createproject.launch.template.xml
            U config\templates\createproject.SpringBeans.template.xml
            U config\templates\createproject.standalone.config.template.xml
            U api\src\main\java\org\kuali\rice\ksb\messaging\serviceconnectors\ResourceFacade.java
            U api\src\main\java\org\kuali\rice\kim\xml\KimNamespaceConstants.java
            U api\src\main\java\org\kuali\rice\kew\dto\DocumentStatusTransitionDTO.java
            U api\src\main\java\org\kuali\rice\kew\dto\DocumentLinkDTO.java
            U api\src\main\java\org\kuali\rice\kew\util\KEWConstants.java
            U api\src\main\java\org\kuali\rice\core\xml\CoreNamespaceConstants.java
            U api\src\main\java\org\kuali\rice\core\xml\dto\DataXmlDto.java
            U api\src\main\java\org\kuali\rice\core\jaxb\StringMapEntryList.java
            U api\src\main\java\org\kuali\rice\core\jaxb\JaxbDateAdapter.java
            U api\src\main\java\org\kuali\rice\core\jaxb\JaxbStringMapAdapter.java
            U api\src\main\java\org\kuali\rice\core\exception\RiceRemoteServiceConnectionException.java
            U api\src\main\java\org\kuali\rice\kns\util\KNSConstants.java
            Conflict discovered in 'api/pom.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C api\pom.xml
            Conflict discovered in 'README.txt'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C README.txt
            Conflict discovered in 'ken/pom.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C ken\pom.xml
            U web\src\test\resources\org\kuali\rice\web\test\DefaultSuiteTestData.sql
            C web\src\main\webapp\kcb\tlds
            C web\src\main\webapp\ksb\WEB-INF\tld
            U web\src\main\webapp\ksb\WEB-INF\jsp\config\ConfigViewer.jsp
            C web\src\main\webapp\kim\WEB-INF\tld
            U web\src\main\webapp\rice-portal\css\portal.css
            U web\src\main\webapp\kew\WEB-INF\jsp\routelog\ActionRequest.jsp
            U web\src\main\webapp\kew\WEB-INF\jsp\ria\riaDocument.jsp
            U web\src\main\webapp\kew\scripts\prototype.js
            U web\src\main\webapp\kew\scripts\edoclite1.js
            U web\src\main\webapp\kew\scripts\ria\plugins\pdf-plugin\pdf-plugin.js
            U web\src\main\webapp\kew\scripts\ria\plugins\pdf-plugin\pdfobject.js
            U web\src\main\webapp\kew\scripts\ria\plugins\pdf-plugin\jquery.browser.min.js
            U web\src\main\webapp\kew\scripts\ria\plugins\vimeo-plugin\swfobject.js
            U web\src\main\webapp\kew\scripts\ria\plugins\vimeo-plugin\vimeo-plugin.js
            U web\src\main\webapp\kew\scripts\ria\work\ria.js
            U web\src\main\webapp\kew\scripts\ria\work\index.html
            U web\src\main\webapp\kew\scripts\ria\ria.js
            U web\src\main\webapp\kew\css\ria.css
            U web\src\main\webapp\WEB-INF\jsp\recurseCheckTabHighlight.jsp
            U web\src\main\webapp\WEB-INF\jsp\recurseRowDisplay.jsp
            U web\src\main\webapp\WEB-INF\tags\rice-portal\channel\main\workflow.tag
            U web\src\main\webapp\WEB-INF\tags\rice-portal\iframePortletContainer.tag
            U web\src\main\webapp\WEB-INF\tags\kr\page.tag
            U web\src\main\webapp\WEB-INF\tags\kr\subtab.tag
            U web\src\main\webapp\WEB-INF\tags\kr\auditSet.tag
            U web\src\main\webapp\WEB-INF\tags\kr\rowDisplay.tag
            U web\src\main\webapp\WEB-INF\tags\kr\documentControls.tag
            U web\src\main\webapp\WEB-INF\tags\kr\tab.tag
            U web\src\main\webapp\WEB-INF\tags\kr\htmlAttributeLabel.tag
            U web\src\main\webapp\WEB-INF\tags\kr\help.tag
            U web\src\main\webapp\WEB-INF\tags\kr\editablePropertiesGuid.tag
            U web\src\main\webapp\WEB-INF\tags\kr\tabTop.tag
            U web\src\main\webapp\WEB-INF\tags\kr\lookup.tag
            C web\src\main\webapp\kr\WEB-INF\tlds
            U web\src\main\webapp\kr\WEB-INF\jsp\AuthorizationException.jsp
            U web\src\main\webapp\kr\css\kuali.css
            C web\src\main\webapp\ken\tlds
            Conflict discovered in 'web/pom.xml'.
            Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: p
            C web\pom.xml
            Summary of conflicts:
            Text conflicts: 17
            Tree conflicts: 9

            Show
            jjhanso Jeremy Hanson added a comment - merge results C:\java\projects\rice-1.1.0>svn merge -r 14521:HEAD https://test.kuali.org/svn/rice/branches/rice-release-1-0-3-br/ — Merging r14522 through r14646 into '.': U ksb\src\test\java\org\kuali\rice\ksb\testclient1\Storage.java U ksb\src\test\java\org\kuali\rice\ksb\testclient1\InboxResourceImpl.java U ksb\src\test\java\org\kuali\rice\ksb\testclient1\BaseballCardCollectionServiceImpl.java U ksb\src\test\java\org\kuali\rice\ksb\testclient1\MessageResourceImpl.java U ksb\src\test\java\org\kuali\rice\ksb\messaging\RestServiceDefinitionTest.java U ksb\src\test\java\org\kuali\rice\ksb\messaging\exceptionhandling\TestExceptionHandlerServiceImpl.java U ksb\src\test\java\org\kuali\rice\ksb\messaging\remotedservices\BaseballCard.java U ksb\src\test\java\org\kuali\rice\ksb\messaging\remotedservices\Inbox.java U ksb\src\test\java\org\kuali\rice\ksb\messaging\remotedservices\Message.java U ksb\src\test\java\org\kuali\rice\ksb\messaging\remotedservices\InboxResource.java U ksb\src\test\java\org\kuali\rice\ksb\messaging\remotedservices\MessageResource.java U ksb\src\test\java\org\kuali\rice\ksb\messaging\remotedservices\BaseballCardCollectionService.java U ksb\src\test\java\org\kuali\rice\ksb\messaging\ServiceUpdateAndRemovalTest.java Conflict discovered in 'ksb/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C ksb\pom.xml U kim\src\test\java\org\kuali\rice\kim\test\bo\group\impl\GroupAttributeDataImplTest.java U kim\src\test\java\org\kuali\rice\kim\test\service\PersonServiceImplTest.java U kim\src\test\java\org\kuali\rice\kim\test\service\IdentityArchiveServiceTest.java U kim\src\test\java\org\kuali\rice\kim\test\service\PermissionServiceRemoteTest.java U kim\src\test\java\org\kuali\rice\kim\test\service\GroupServiceRemoteTest.java U kim\src\test\java\org\kuali\rice\kim\test\service\RoleServiceRemoteTest.java U kim\src\test\java\org\kuali\rice\kim\test\GroupMemberImplTest.java U kim\src\test\java\org\kuali\rice\kim\service\KIMServiceLocatorTest.java U kim\src\test\java\org\kuali\rice\kim\util\KimCommonUtilsTest.java U kim\src\test\resources\KIMTestHarnessSpringBeans.xml Conflict discovered in 'kim/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C kim\pom.xml U sampleapp\scripts\sql\mysql\create_travel_tables.sql U sampleapp\scripts\sql\mysql\default_travel_data.sql U sampleapp\scripts\sql\oracle\default_travel_data.sql A sampleapp\scripts\docTypes A sampleapp\scripts\docTypes\TravelRequestDocType.xml U sampleapp\src\main\java\edu\sampleu\travel\bo\TravelAccountUseRate.java U sampleapp\src\main\resources\edu\sampleu\travel\datadictionary\FiscalOfficerMaintenanceDocument.xml U sampleapp\src\main\resources\edu\sampleu\travel\datadictionary\FiscalOfficer-Extension.xml Conflict discovered in 'sampleapp/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C sampleapp\pom.xml U kew\src\test\java\org\kuali\rice\kew\workgroup\GroupXmlImportJAXBTest.java U kew\src\test\java\org\kuali\rice\kew\docmentlink\DocumentLinkTest.java D kew\src\test\java\org\kuali\rice\kew\test\web\framework\Filter.java D kew\src\test\java\org\kuali\rice\kew\test\web\TestServletTest.java D kew\src\test\java\org\kuali\rice\kew\test\web\TestServlet.java D kew\src\test\java\org\kuali\rice\kew\test\web\framework\LocalWorkflowInteractionController.java D kew\src\test\java\org\kuali\rice\kew\test\web\ChainingFilter.java D kew\src\test\java\org\kuali\rice\kew\test\web\framework\LocalInteractionController.java D kew\src\test\java\org\kuali\rice\kew\test\web\framework\RegexReplacementFilter.java D kew\src\test\java\org\kuali\rice\kew\test\web\framework\ScriptAction.java D kew\src\test\java\org\kuali\rice\kew\test\web\framework\Script.java D kew\src\test\java\org\kuali\rice\kew\test\web\framework\ScriptState.java D kew\src\test\java\org\kuali\rice\kew\test\web\DelegatingWorkflowServlet.java D kew\src\test\java\org\kuali\rice\kew\test\web\framework\schemes D kew\src\test\java\org\kuali\rice\kew\test\web\framework\PropertyScheme.java D kew\src\test\java\org\kuali\rice\kew\test\web\framework\Util.java D kew\src\test\java\org\kuali\rice\kew\test\web\framework\actions D kew\src\test\java\org\kuali\rice\kew\test\web\framework\InteractionController.java D kew\src\test\java\org\kuali\rice\kew\test\web\framework\Property.java U kew\src\test\java\org\kuali\rice\kew\mail\EmailContentServiceTest.java U kew\src\test\java\org\kuali\rice\kew\actions\SimpleDocumentActionsWebServiceTest.java U kew\src\test\java\org\kuali\rice\kew\actions\ReturnToPreviousTestSplit.java U kew\src\test\java\org\kuali\rice\kew\xml\TestGroupNamespaceURIHandler.java U kew\src\test\java\org\kuali\rice\kew\role\service\impl\ActionRequestDerivedRoleTypeServiceImplTest.java D kew\src\test\java\org\kuali\rice\kew\edl\EDocLiteScriptedTest.java U kew\src\test\java\org\kuali\rice\kew\rule\RuleTestUtils.java U kew\src\test\java\mocks\MockJavaMailSender.java U kew\src\test\java\mocks\MockMailer.java D kew\src\test\resources\org\kuali\rice\kew\test\web U kew\src\test\resources\org\kuali\rice\kew\batch\data\widgetsTest.xml U kew\src\test\resources\org\kuali\rice\kew\docsearch\xml\SearchableAttributesSpringBeans.xml U kew\src\test\resources\org\kuali\rice\kew\docsearch\SearchableTrimTest.xml U kew\src\test\resources\org\kuali\rice\kew\workgroup\GroupXmlImportJAXBTest.xml U kew\src\test\resources\org\kuali\rice\kew\xml\TestKEWAppDocStatus.xml U kew\src\test\resources\org\kuali\rice\kew\role\service\impl\ActionRequestDerivedRoleTypeServiceImplTest.xml D kew\src\test\resources\org\kuali\rice\kew\edl\GradSchoolEDL.xml D kew\src\test\resources\org\kuali\rice\kew\edl\GradSchoolScript.xml D kew\src\test\resources\org\kuali\rice\kew\edl\GradSchoolRoutingConfiguration.xml D kew\src\test\resources\org\kuali\rice\kew\edl\GradSchoolTestUsersAndGroups.xml D kew\src\test\resources\org\kuali\rice\kew\edl\GradSchoolRules.xml U kew\src\test\resources\org\kuali\rice\kew\config\OverrideTestSpringBeans.xml U kew\src\test\resources\org\kuali\rice\kew\routeheader\AppDocStatusTestConfig.xml U kew\src\test\resources\org\kuali\rice\core\util\RiceServiceOverrideTestSpringBeans.xml Conflict discovered in 'kew/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C kew\pom.xml U scripts\dataset\bootstrap-server-dataset-cleanup.sql U scripts\upgrades\1.0.2 to 1.0.3\db-updates-client\mysql\2010-09-09.sql U scripts\upgrades\1.0.2 to 1.0.3\db-updates-client\oracle\2010-09-09.sql U scripts\upgrades\1.0.2 to 1.0.3\db-updates\mysql\2010-06-30.sql U scripts\upgrades\1.0.2 to 1.0.3\db-updates\mysql\2010-05-14.sql U scripts\upgrades\1.0.2 to 1.0.3\db-updates\mysql\2010-06-23.sql U scripts\upgrades\1.0.2 to 1.0.3\db-updates\mysql\2010-09-02.sql U scripts\upgrades\1.0.2 to 1.0.3\db-updates\mysql\2010-09-14.sql U scripts\upgrades\1.0.2 to 1.0.3\db-updates\mysql\2010-09-24.sql U scripts\upgrades\1.0.2 to 1.0.3\db-updates\mysql\2010-09-09.sql U scripts\upgrades\1.0.2 to 1.0.3\db-updates\mysql\2010-09-28.sql U scripts\upgrades\1.0.2 to 1.0.3\db-updates\oracle\2010-06-30.sql U scripts\upgrades\1.0.2 to 1.0.3\db-updates\oracle\2010-05-14.sql U scripts\upgrades\1.0.2 to 1.0.3\db-updates\oracle\2010-06-23.sql U scripts\upgrades\1.0.2 to 1.0.3\db-updates\oracle\2010-09-14.sql U scripts\upgrades\1.0.2 to 1.0.3\db-updates\oracle\2010-09-24.sql U scripts\upgrades\1.0.2 to 1.0.3\db-updates\oracle\2010-09-09.sql U scripts\upgrades\1.0.2 to 1.0.3\db-updates\oracle\2010-09-28.sql C scripts\upgrades\1.0.2 to 1.0.3\final U scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\01-04-2010.sql U scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\12-07-2009.sql U scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\12-16-2009.sql U scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\02-02-2010.sql U scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\12-09-2009.sql U scripts\upgrades\1.0.1.1 to 1.0.2\db-updates\2009-10-02.sql U scripts\upgrades\1.0.1.1 to 1.0.2\db-updates\2010-03-19.sql U scripts\upgrades\1.0.1.1 to 1.0.2\db-updates\2009-10-05.sql A scripts\upgrades\1.0.1.1 to 1.0.2\final\update_final_mysql.sql C scripts\upgrades\1.0.1.1 to 1.0.2\final\update_client_final_mysql.sql C scripts\upgrades\1.0.1.1 to 1.0.2\final\update_client_final_oracle.sql C scripts\upgrades\1.0.1.1 to 1.0.2\final\udpate_final_mysql.sql U scripts\createproject.groovy Conflict discovered in 'pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C pom.xml U kns\src\test\java\org\kuali\rice\kns\test\document\SearchAttributeIndexTestDocument.java U kns\src\test\java\org\kuali\rice\kns\test\document\AccountStateKeyValues.java U kns\src\test\java\org\kuali\rice\kns\test\document\AccountWithDDAttributesDocument.java U kns\src\test\java\org\kuali\rice\kns\bo\AttributeReferenceElementsTest.java U kns\src\test\java\org\kuali\rice\kns\bo\PostalCodeImplTest.java U kns\src\test\java\org\kuali\rice\kns\bo\PersistableAttachmentBaseTest.java U kns\src\test\java\org\kuali\rice\kns\bo\SessionDocumentTest.java Conflict discovered in 'kns/src/test/java/org/kuali/rice/kns/bo/StateImplTest.java'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C kns\src\test\java\org\kuali\rice\kns\bo\StateImplTest.java Conflict discovered in 'kns/src/test/java/org/kuali/rice/kns/bo/CountryImplTest.java'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C kns\src\test\java\org\kuali\rice\kns\bo\CountryImplTest.java U kns\src\test\java\org\kuali\rice\kns\bo\DocumentAttachmentTest.java Conflict discovered in 'kns/src/test/java/org/kuali/rice/kns/bo/NoteTypeTest.java'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C kns\src\test\java\org\kuali\rice\kns\bo\NoteTypeTest.java U kns\src\test\java\org\kuali\rice\kns\bo\AttachmentTest.java U kns\src\test\java\org\kuali\rice\kns\bo\BusinessObjectAttributeEntryTest.java U kns\src\test\java\org\kuali\rice\kns\bo\CampusImplTest.java U kns\src\test\java\org\kuali\rice\kns\bo\LookupResultsTest.java Conflict discovered in 'kns/src/test/java/org/kuali/rice/kns/bo/CampusTypeImplTest.java'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C kns\src\test\java\org\kuali\rice\kns\bo\CampusTypeImplTest.java U kns\src\test\java\org\kuali\rice\kns\bo\AttributeReferenceDummyTest.java U kns\src\test\java\org\kuali\rice\kns\service\InactivateableFromToServiceTest.java U kns\src\test\java\org\kuali\rice\kns\workflow\SearchAttributeIndexRequestTest.java U kns\src\test\java\org\kuali\rice\kns\workflow\DataDictionarySearchableAttributeTest.java U kns\src\test\java\org\kuali\rice\kns\util\PatternedStringBuilderTest.java U kns\src\test\resources\KR-Test-ApplicationResources.properties U kns\src\test\resources\testAccountUseRate.sql U kns\src\test\resources\org\kuali\rice\kns\test\DefaultSuiteTestData.sql U kns\src\test\resources\org\kuali\rice\kns\test\document\SearchAttributeIndexTestDocument.xml U kns\src\test\resources\org\kuali\rice\kns\test\document\LookupResultsDDBo.xml U kns\src\test\resources\org\kuali\rice\kns\test\document\AccountWithDDAttributesDocument.xml Conflict discovered in 'kns/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C kns\pom.xml Conflict discovered in 'kcb/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C kcb\pom.xml U impl\src\test\java\org\kuali\rice\core\xml\TestSchemaValidationErrorHandler.java U impl\src\test\java\org\kuali\rice\core\xml\TestSchemaLSResourceResolver.java U impl\src\test\resources\org\kuali\rice\core\xml\GroupInstance1.xml U impl\src\test\resources\org\kuali\rice\core\xml\GroupInstance2.xml U impl\src\test\resources\org\kuali\rice\core\xml\Groups-1.0.3.xml U impl\src\test\resources\org\kuali\rice\core\xml\BadGroup-1.0.3a.xsd U impl\src\test\resources\org\kuali\rice\core\config\jaxb-test-circular.xml U impl\src\test\resources\org\kuali\rice\core\config\jaxb-test-context.xml U impl\src\test\resources\org\kuali\rice\core\config\jaxb-test-config.xml U impl\src\test\resources\org\kuali\rice\core\config\jaxb-test-circular2.xml U impl\src\test\resources\org\kuali\rice\core\config\jaxb-test-import-config.xml U impl\src\test\resources\org\kuali\rice\core\config\jaxb-test-override.xml U impl\src\main\java\org\kuali\rice\ksb\messaging\serviceexporters\AbstractWebServiceExporter.java U impl\src\main\java\org\kuali\rice\ksb\messaging\FlattenedServiceDefinition.java U impl\src\main\java\org\kuali\rice\ksb\messaging\serviceconnectors\ResourceFacadeImpl.java Conflict discovered in 'impl/src/main/java/org/kuali/rice/kim/bo/entity/impl/KimDefaultableEntityDataBase.java'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\java\org\kuali\rice\kim\bo\entity\impl\KimDefaultableEntityDataBase.java U impl\src\main\java\org\kuali\rice\kim\service\impl\PersonServiceImpl.java U impl\src\main\java\org\kuali\rice\kim\service\impl\UiDocumentServiceImpl.java U impl\src\main\java\org\kuali\rice\kim\lookup\RoleMemberLookupableHelperServiceImpl.java U impl\src\main\java\org\kuali\rice\kim\util\KualiDateMask.java U impl\src\main\java\org\kuali\rice\kim\web\struts\action\IdentityManagementRoleDocumentAction.java U impl\src\main\java\org\kuali\rice\kim\document\rule\ActiveRoleMemberHelper.java U impl\src\main\java\org\kuali\rice\kew\documentlink\service\impl\DocumentLinkServiceImpl.java U impl\src\main\java\org\kuali\rice\kew\documentlink\service\DocumentLinkService.java U impl\src\main\java\org\kuali\rice\kew\documentlink\dao\DocumentLinkDAO.java U impl\src\main\java\org\kuali\rice\kew\documentlink\dao\impl\DocumentLinkDAOJpaImpl.java U impl\src\main\java\org\kuali\rice\kew\documentlink\dao\impl\DocumentLinkDAOOjbImpl.java U impl\src\main\java\org\kuali\rice\kew\documentlink\dao\impl\DocumentLinkDaoUtil.java U impl\src\main\java\org\kuali\rice\kew\documentlink\DocumentLink.java U impl\src\main\java\org\kuali\rice\kew\routelog\web\RouteLogAction.java U impl\src\main\java\org\kuali\rice\kew\doctype\ApplicationDocumentStatusId.java U impl\src\main\java\org\kuali\rice\kew\doctype\ApplicationDocumentStatus.java U impl\src\main\java\org\kuali\rice\kew\doctype\LazyLoadSecurityAttribute.java U impl\src\main\java\org\kuali\rice\kew\ria\bo\RIADocTypeMap.java U impl\src\main\java\org\kuali\rice\kew\ria\service\RIAServiceLocator.java U impl\src\main\java\org\kuali\rice\kew\ria\service\impl\RIADocumentServiceImpl.java U impl\src\main\java\org\kuali\rice\kew\ria\service\RIADocumentService.java U impl\src\main\java\org\kuali\rice\kew\ria\valuefinder\YesNoValueFinder.java U impl\src\main\java\org\kuali\rice\kew\ria\valuefinder\RIADocTypeMapNextIdFinder.java U impl\src\main\java\org\kuali\rice\kew\ria\valuefinder\SequenceNextIdFinder.java U impl\src\main\java\org\kuali\rice\kew\ria\RIAConstants.java U impl\src\main\java\org\kuali\rice\kew\ria\authorizer\RIADocumentAuthorizer.java U impl\src\main\java\org\kuali\rice\kew\ria\web\RIADocumentAction.java U impl\src\main\java\org\kuali\rice\kew\ria\web\RIADocumentForm.java U impl\src\main\java\org\kuali\rice\kew\ria\document\RIADocument.java U impl\src\main\java\org\kuali\rice\kew\mail\service\impl\EmailToList.java U impl\src\main\java\org\kuali\rice\kew\mail\service\impl\EmailBcList.java U impl\src\main\java\org\kuali\rice\kew\mail\service\impl\EmailCcList.java U impl\src\main\java\org\kuali\rice\kew\actionrequest\ActionRequestValue.java U impl\src\main\java\org\kuali\rice\kew\docsearch\DocumentLookupCriteriaProcessorKEWAdapter.java U impl\src\main\java\org\kuali\rice\kew\docsearch\StandardDocumentSearchResultProcessor.java U impl\src\main\java\org\kuali\rice\kew\docsearch\StandardDocumentSearchGenerator.java U impl\src\main\java\org\kuali\rice\kew\service\impl\WorkflowUtilityWebServiceImpl.java U impl\src\main\java\org\kuali\rice\kew\xml\GroupXmlJAXBParser.java U impl\src\main\java\org\kuali\rice\kew\xml\GroupNamespaceURIFilter.java U impl\src\main\java\org\kuali\rice\kew\xml\TestGroupNamespaceURIFilter.java U impl\src\main\java\org\kuali\rice\kew\xml\AbstractTransformationFilter.java U impl\src\main\java\org\kuali\rice\kew\xml\GroupNamespaceURIMemberTransformationFilterPOC.java U impl\src\main\java\org\kuali\rice\kew\xml\GroupNamespaceURIAllInOneFilterPOC.java U impl\src\main\java\org\kuali\rice\kew\xml\GroupNamespaceURITransformationFilterPOC.java U impl\src\main\java\org\kuali\rice\kew\xml\GroupNamespaceURIHandlerPOC.java U impl\src\main\java\org\kuali\rice\kew\xml\GroupNamespaceURIEliminationFilterPOC.java U impl\src\main\java\org\kuali\rice\kew\edl\components\RefreshFromLookupComponent.java U impl\src\main\java\org\kuali\rice\kew\edl\components\WorkflowDocumentState.java U impl\src\main\java\org\kuali\rice\kew\edl\components\EstablishUserAction.java U impl\src\main\java\org\kuali\rice\kew\edl\components\PerformLookupComponent.java U impl\src\main\java\org\kuali\rice\kew\routeheader\DocumentStatusTransition.java U impl\src\main\java\org\kuali\rice\kew\rule\service\impl\RuleDelegationCacheProcessorImpl.java U impl\src\main\java\org\kuali\rice\kew\rule\service\RuleDelegationCacheProcessor.java U impl\src\main\java\org\kuali\rice\kew\rule\dao\impl\RuleDelegationDAOOjbImpl.java U impl\src\main\java\org\kuali\rice\core\xml\XMLInputFilterDefinition.java U impl\src\main\java\org\kuali\rice\core\xml\InitialXMLFilter.java U impl\src\main\java\org\kuali\rice\core\xml\PassthruXMLFilter.java U impl\src\main\java\org\kuali\rice\core\xml\schema\SchemaValidationErrorHandler.java U impl\src\main\java\org\kuali\rice\core\xml\schema\RiceSchemaValidationFilter.java U impl\src\main\java\org\kuali\rice\core\xml\schema\RiceSchemaValidationEventCollector.java U impl\src\main\java\org\kuali\rice\core\xml\schema\SchemaLSResourceResolver.java U impl\src\main\java\org\kuali\rice\core\xml\schema\RiceXmlSchemaFactory.java U impl\src\main\java\org\kuali\rice\core\xml\ChainedXMLFilter.java U impl\src\main\java\org\kuali\rice\core\xml\XMLExporterBase.java U impl\src\main\java\org\kuali\rice\core\xml\XMLInputFilterEntry.java U impl\src\main\java\org\kuali\rice\core\xml\XMLImportExportServiceBase.java U impl\src\main\java\org\kuali\rice\core\xml\ChainedXMLFilterBase.java U impl\src\main\java\org\kuali\rice\core\xml\XMLImporterBase.java U impl\src\main\java\org\kuali\rice\core\xml\XMLRenameFilter.java U impl\src\main\java\org\kuali\rice\core\config\event\RiceConfigEventListener.java U impl\src\main\java\org\kuali\rice\core\config\logging\Log4jLifeCycle.java U impl\src\main\java\org\kuali\rice\core\config\spring\RiceConfigPropertyPlaceholderConfigurer.java U impl\src\main\java\org\kuali\rice\core\config\spring\RiceConfigBeanDefinitionVisitor.java U impl\src\main\java\org\kuali\rice\core\versions\VersionHelper.java U impl\src\main\java\org\kuali\rice\core\versions\annotations\DeprecatedSince.java U impl\src\main\java\org\kuali\rice\core\versions\annotations\SupportedSince.java U impl\src\main\java\org\kuali\rice\core\util\KeyValue.java U impl\src\main\java\org\kuali\rice\kns\datadictionary\FieldOverride.java U impl\src\main\java\org\kuali\rice\kns\datadictionary\RIADataDictionaryMapper.java U impl\src\main\java\org\kuali\rice\kns\datadictionary\DataDictionaryMapper.java U impl\src\main\java\org\kuali\rice\kns\datadictionary\DataDictionaryIndex.java U impl\src\main\java\org\kuali\rice\kns\datadictionary\impl\FieldOverrideForListElementDeleteImpl.java U impl\src\main\java\org\kuali\rice\kns\datadictionary\impl\FieldOverrideForValueReplaceImpl.java U impl\src\main\java\org\kuali\rice\kns\datadictionary\impl\BeanOverrideImpl.java U impl\src\main\java\org\kuali\rice\kns\datadictionary\impl\FieldOverrideForListElementInsertImpl.java U impl\src\main\java\org\kuali\rice\kns\datadictionary\impl\FieldOverrideForListElementBase.java U impl\src\main\java\org\kuali\rice\kns\datadictionary\impl\FieldOverrideForListElementReplaceImpl.java U impl\src\main\java\org\kuali\rice\kns\datadictionary\DataDictionary.java U impl\src\main\java\org\kuali\rice\kns\datadictionary\MaintainableFieldDefinition.java U impl\src\main\java\org\kuali\rice\kns\datadictionary\BeanOverride.java U impl\src\main\java\org\kuali\rice\kns\datadictionary\DataDictionaryIndexMapper.java U impl\src\main\java\org\kuali\rice\kns\service\impl\InactivateableFromToServiceImpl.java U impl\src\main\java\org\kuali\rice\kns\service\impl\DocumentAdHocServiceImpl.java U impl\src\main\java\org\kuali\rice\kns\service\InactivateableFromToService.java U impl\src\main\java\org\kuali\rice\kns\service\MaintenanceDocumentDictionaryService.java U impl\src\main\java\org\kuali\rice\kns\service\DocumentAdHocService.java U impl\src\main\java\org\kuali\rice\kns\lookup\LookupResultsSupportStrategyService.java U impl\src\main\java\org\kuali\rice\kns\util\ObjectUtils.java U impl\src\main\java\org\kuali\rice\kns\util\RiceKeyConstants.java U impl\src\main\java\org\kuali\rice\kns\util\SessionTicket.java U impl\src\main\java\org\kuali\rice\kns\web\struts\form\AuthorizationExceptionForm.java U impl\src\main\java\org\kuali\rice\kns\web\struts\form\KualiLogoutForm.java U impl\src\main\java\org\kuali\rice\kns\web\struts\form\InquiryForm.java U impl\src\main\java\org\kuali\rice\kns\web\struts\pojo\AuthorizationExceptionHandler.java U impl\src\main\java\org\kuali\rice\kns\web\struts\action\KualiMaintenanceDocumentAction.java U impl\src\main\java\org\kuali\rice\kns\web\struts\action\KualiPropertyMessageResources.java U impl\src\main\java\org\kuali\rice\kns\web\struts\action\AuthorizationExceptionAction.java U impl\src\main\java\org\kuali\rice\kns\web\struts\action\KualiLogoutAction.java U impl\src\main\java\org\kuali\rice\kns\web\filter\AutoLoginFilter.java U impl\src\main\java\org\kuali\rice\kns\web\format\ArrayFormatter.java U impl\src\main\java\org\kuali\rice\kns\web\ui\PropertyRenderingConfigElement.java U impl\src\main\resources\schema\Core-1.0.3.xsd U impl\src\main\resources\schema\Group-1.0.3.xsd U impl\src\main\resources\schema\config.xsd U impl\src\main\resources\schema\AttributeSet-1.0.3.xsd U impl\src\main\resources\schema\Groups-1.0.3.xsd U impl\src\main\resources\schema\data-1.0.3.xsd U impl\src\main\resources\schema\group-1.0.3.a.xsd U impl\src\main\resources\KR-ApplicationResources.properties U impl\src\main\resources\KIM-ApplicationResources.properties U impl\src\main\resources\org\kuali\rice\kcb\config\KCBSpringBeans-test.xml U impl\src\main\resources\org\kuali\rice\ksb\config\KSBThinClientSpringBeans.xml U impl\src\main\resources\org\kuali\rice\kim\bo\datadictionary\ResponsibilityImpl.xml U impl\src\main\resources\org\kuali\rice\kim\bo\datadictionary\PermissionImpl.xml U impl\src\main\resources\org\kuali\rice\kew\bo\datadictionary\DocSearchCriteriaDTO.xml U impl\src\main\resources\org\kuali\rice\kew\dwr-core.xml U impl\src\main\resources\org\kuali\rice\kew\edl\default-widgets.xml U impl\src\main\resources\org\kuali\rice\kew\config\KEWSpringBeans.xml U impl\src\main\resources\org\kuali\rice\kew\config\KEWServiceBusSOAPDefaultSpringBeans.xml U impl\src\main\resources\org\kuali\rice\kew\config\OJB-repository-kew.xml U impl\src\main\resources\org\kuali\rice\kew\config\KEWServiceBusSpringBeans.xml U impl\src\main\resources\org\kuali\rice\kew\ria\bo\datadictionary\RIADocTypeMap.xml U impl\src\main\resources\org\kuali\rice\kew\ria\document\datadictionary\RIADocTypeMapMaintenanceDocument.xml U impl\src\main\resources\org\kuali\rice\core\config-coded-defaults.xml U impl\src\main\resources\org\kuali\rice\core\RiceDataSourceSpringBeans.xml U impl\src\main\resources\org\kuali\rice\core\RiceDataSourceStandaloneClientSpringBeans.xml.template U impl\src\main\resources\org\kuali\rice\core\RiceJTASpringBeans.xml U impl\src\main\resources\org\kuali\rice\kns\bo\datadictionary\Country.xml Conflict discovered in 'impl/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\pom.xml U config\ria\ria-acrobat.js U config\ria\RIADocumentBootstrap.xml U config\templates\createproject.launch.template.xml U config\templates\createproject.SpringBeans.template.xml U config\templates\createproject.standalone.config.template.xml U api\src\main\java\org\kuali\rice\ksb\messaging\serviceconnectors\ResourceFacade.java U api\src\main\java\org\kuali\rice\kim\xml\KimNamespaceConstants.java U api\src\main\java\org\kuali\rice\kew\dto\DocumentStatusTransitionDTO.java U api\src\main\java\org\kuali\rice\kew\dto\DocumentLinkDTO.java U api\src\main\java\org\kuali\rice\kew\util\KEWConstants.java U api\src\main\java\org\kuali\rice\core\xml\CoreNamespaceConstants.java U api\src\main\java\org\kuali\rice\core\xml\dto\DataXmlDto.java U api\src\main\java\org\kuali\rice\core\jaxb\StringMapEntryList.java U api\src\main\java\org\kuali\rice\core\jaxb\JaxbDateAdapter.java U api\src\main\java\org\kuali\rice\core\jaxb\JaxbStringMapAdapter.java U api\src\main\java\org\kuali\rice\core\exception\RiceRemoteServiceConnectionException.java U api\src\main\java\org\kuali\rice\kns\util\KNSConstants.java Conflict discovered in 'api/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C api\pom.xml Conflict discovered in 'README.txt'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C README.txt Conflict discovered in 'ken/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C ken\pom.xml U web\src\test\resources\org\kuali\rice\web\test\DefaultSuiteTestData.sql C web\src\main\webapp\kcb\tlds C web\src\main\webapp\ksb\WEB-INF\tld U web\src\main\webapp\ksb\WEB-INF\jsp\config\ConfigViewer.jsp C web\src\main\webapp\kim\WEB-INF\tld U web\src\main\webapp\rice-portal\css\portal.css U web\src\main\webapp\kew\WEB-INF\jsp\routelog\ActionRequest.jsp U web\src\main\webapp\kew\WEB-INF\jsp\ria\riaDocument.jsp U web\src\main\webapp\kew\scripts\prototype.js U web\src\main\webapp\kew\scripts\edoclite1.js U web\src\main\webapp\kew\scripts\ria\plugins\pdf-plugin\pdf-plugin.js U web\src\main\webapp\kew\scripts\ria\plugins\pdf-plugin\pdfobject.js U web\src\main\webapp\kew\scripts\ria\plugins\pdf-plugin\jquery.browser.min.js U web\src\main\webapp\kew\scripts\ria\plugins\vimeo-plugin\swfobject.js U web\src\main\webapp\kew\scripts\ria\plugins\vimeo-plugin\vimeo-plugin.js U web\src\main\webapp\kew\scripts\ria\work\ria.js U web\src\main\webapp\kew\scripts\ria\work\index.html U web\src\main\webapp\kew\scripts\ria\ria.js U web\src\main\webapp\kew\css\ria.css U web\src\main\webapp\WEB-INF\jsp\recurseCheckTabHighlight.jsp U web\src\main\webapp\WEB-INF\jsp\recurseRowDisplay.jsp U web\src\main\webapp\WEB-INF\tags\rice-portal\channel\main\workflow.tag U web\src\main\webapp\WEB-INF\tags\rice-portal\iframePortletContainer.tag U web\src\main\webapp\WEB-INF\tags\kr\page.tag U web\src\main\webapp\WEB-INF\tags\kr\subtab.tag U web\src\main\webapp\WEB-INF\tags\kr\auditSet.tag U web\src\main\webapp\WEB-INF\tags\kr\rowDisplay.tag U web\src\main\webapp\WEB-INF\tags\kr\documentControls.tag U web\src\main\webapp\WEB-INF\tags\kr\tab.tag U web\src\main\webapp\WEB-INF\tags\kr\htmlAttributeLabel.tag U web\src\main\webapp\WEB-INF\tags\kr\help.tag U web\src\main\webapp\WEB-INF\tags\kr\editablePropertiesGuid.tag U web\src\main\webapp\WEB-INF\tags\kr\tabTop.tag U web\src\main\webapp\WEB-INF\tags\kr\lookup.tag C web\src\main\webapp\kr\WEB-INF\tlds U web\src\main\webapp\kr\WEB-INF\jsp\AuthorizationException.jsp U web\src\main\webapp\kr\css\kuali.css C web\src\main\webapp\ken\tlds Conflict discovered in 'web/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C web\pom.xml Summary of conflicts: Text conflicts: 17 Tree conflicts: 9
            Hide
            jjhanso Jeremy Hanson added a comment -

            no database changes needed on the last merge. Changes have been committed, so this jira is complete.

            Show
            jjhanso Jeremy Hanson added a comment - no database changes needed on the last merge. Changes have been committed, so this jira is complete.

              People

              • Assignee:
                jjhanso Jeremy Hanson
                Reporter:
                ewestfal Eric Westfall
              • Votes:
                0 Vote for this issue
                Watchers:
                0 Start watching this issue

                Dates

                • Created:
                  Updated:
                  Resolved: