Details

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

      Description

      We need to merge the latest changes from 1.0.1.1 branch into the 1.0.x branch for KC/KS.

      See these notes on the subversion merge process:

      https://test.kuali.org/confluence/x/KYApAQ

      Remember to make DB changes to master KC database.

        Attachments

          Activity

          Hide
          jjhanso Jeremy Hanson added a comment -

          The merge command is the following:

          svn merge -r 9933:HEAD https://test.kuali.org/svn/rice/branches/rice-release-1-0-1-1-br

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

          Output from the merge:

          C:\java\projects\rice-1.0.kc>svn merge -r 9933:HEAD https://test.kuali.org/svn/rice/branches/rice-release-1-0-1-1-br
          — Merging r9934 through r10833 into '.':
          A ksb\src\test\java\org\kuali\rice\ksb\messaging\ServiceUpdateAndRemovalTest.java
          U ksb\src\test\resources\META-INF\ksb-test-config.xml
          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
          A kim\src\test\java\org\kuali\rice\kim\test\service\IdentityArchiveServiceTest.java
          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 kew\src\test\java\org\kuali\rice\kew\doctype\DocumentTypeTest.java
          A kew\src\test\java\org\kuali\rice\kew\mail\EmailContentServiceTest.java
          U kew\src\test\java\org\kuali\rice\kew\docsearch\DocumentSearchTestBase.java
          U kew\src\test\java\org\kuali\rice\kew\docsearch\TestXMLSearchableAttributeDateTime.java
          U kew\src\test\java\org\kuali\rice\kew\docsearch\SearchableAttributeTest.java
          U kew\src\test\java\org\kuali\rice\kew\docsearch\TestXMLSearchableAttributeLong.java
          U kew\src\test\java\org\kuali\rice\kew\docsearch\TestXMLSearchableAttributeFloat.java
          U kew\src\test\java\org\kuali\rice\kew\docsearch\TestXMLSearchableAttributeString.java
          U kew\src\test\java\org\kuali\rice\kew\docsearch\MockSearchableAttribute.java
          U kew\src\test\java\org\kuali\rice\kew\docsearch\DocumentSearchSecurityTest.java
          U kew\src\test\java\org\kuali\rice\kew\actions\ReturnToPreviousNodeActionTest.java
          A kew\src\test\java\org\kuali\rice\kew\actions\ReturnToPreviousTestSplit.java
          U kew\src\test\java\org\kuali\rice\kew\actions\AdHocRouteTest.java
          U kew\src\test\java\org\kuali\rice\kew\xml\export\DocumentTypeXmlExporterTest.java
          U kew\src\test\java\org\kuali\rice\kew\rule\AddRuleDelegationTest.java
          A kew\src\test\java\org\kuali\rice\kew\rule\RuleTestUtils.java
          U kew\src\test\java\mocks\MockDocumentRequeuerImpl.java
          A kew\src\test\resources\org\kuali\rice\kew\mail\EmailContentServiceTestConfig.xml
          U kew\src\test\resources\org\kuali\rice\kew\actions\ActionsConfig.xml
          U kew\src\test\resources\org\kuali\rice\kew\xml\export\DocTypeExportConfig.xml
          U kew\src\test\resources\org\kuali\rice\kew\server\WorkflowUtilityConfig.xml
          U kew\src\test\resources\org\kuali\rice\kew\doctype\DocTypeWithMostParams1.xml
          U kew\src\test\resources\org\kuali\rice\kew\doctype\DocTypeWithMostParams2.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
          Conflict discovered in 'scripts/launch/rice - JettyServer.launch'.
          Select: (p) postpone, (df) diff-full, (e) edit,
          (mc) mine-conflict, (tc) theirs-conflict,
          (s) show all options: p
          C scripts\launch\rice - JettyServer.launch
          A scripts\upgrades\1.0.1 to 1.0.1.1
          A scripts\upgrades\1.0.1 to 1.0.1.1\db-updates-client
          A scripts\upgrades\1.0.1 to 1.0.1.1\db-updates
          A scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\01-04-2010.sql
          A scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\12-02-2009.sql
          A scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\12-04-2009.sql
          A scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\12-22-2009.sql
          A scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\12-07-2009.sql
          A scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\12-16-2009.sql
          A scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\12-09-2009.sql
          A scripts\upgrades\1.0.1 to 1.0.1.1\final
          A scripts\upgrades\1.0.1 to 1.0.1.1\kfs-db-updates
          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
          A kns\src\test\java\org\kuali\rice\kns\test\document\SearchAttributeIndexTestDocument.java
          A kns\src\test\java\org\kuali\rice\kns\test\document\AccountStateKeyValues.java
          A kns\src\test\java\org\kuali\rice\kns\test\document\AccountWithDDAttributesDocument.java
          A kns\src\test\java\org\kuali\rice\kns\service\NamespaceWildcardAllowedAndOrStringExactMatchPermissionTypeServiceImplTest.java
          A kns\src\test\java\org\kuali\rice\kns\workflow\SearchAttributeIndexRequestTest.java
          A kns\src\test\java\org\kuali\rice\kns\workflow\DataDictionarySearchableAttributeTest.java
          U kns\src\test\resources\db\derby\kns.sql
          C kns\src\test\resources\configurationServiceData.xml
          U kns\src\test\resources\KnsTestSpringBeans.xml
          U kns\src\test\resources\org\kuali\rice\kns\test\DefaultSuiteTestData.sql
          U kns\src\test\resources\org\kuali\rice\kns\test\DefaultSuiteTestData.xml
          A kns\src\test\resources\org\kuali\rice\kns\test\document\SearchAttributeIndexTestDocument.xml
          A kns\src\test\resources\org\kuali\rice\kns\test\document\AccountWithDDAttributesDocument.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
          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\config\data\DefaultSuiteTestDataKNS.sql
          U impl\src\test\config\data\KRIM_ATTR_DEFN_T.sql
          U impl\src\main\java\org\kuali\rice\ksb\service\KSBServiceLocator.java
          U impl\src\main\java\org\kuali\rice\ksb\security\service\impl\DigitalSignatureServiceImpl.java
          U impl\src\main\java\org\kuali\rice\ksb\messaging\RoutingTableDiffCalculator.java
          U impl\src\main\java\org\kuali\rice\ksb\messaging\ServiceDefinition.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\RemotedServiceRegistryImpl.java
          A impl\src\main\java\org\kuali\rice\ksb\messaging\FlattenedServiceDefinition.java
          U impl\src\main\java\org\kuali\rice\ksb\messaging\KSBHttpInvokerRequestExecutor.java
          U impl\src\main\java\org\kuali\rice\ksb\messaging\quartz\KSBSchedulerFactoryBean.java
          U impl\src\main\java\org\kuali\rice\ksb\messaging\ServiceInfo.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\config\KSBThinClientConfigurer.java
          U impl\src\main\java\org\kuali\rice\ksb\util\KSBConstants.java
          U impl\src\main\java\org\kuali\rice\kim\inquiry\ResponsibilityInquirableImpl.java
          U impl\src\main\java\org\kuali\rice\kim\service\impl\GroupServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kim\service\impl\IdentityManagementNotificationServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kim\service\impl\RoleManagementServiceImpl.java
          Conflict discovered in 'impl/src/main/java/org/kuali/rice/kim/service/impl/RoleServiceImpl.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\RoleServiceImpl.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\ResponsibilityServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kim\service\impl\IdentityCurrentAndArchivedServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kim\service\impl\PermissionServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kim\service\impl\IdentityArchiveServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kim\service\support\impl\KimRoleTypeServiceBase.java
          U impl\src\main\java\org\kuali\rice\kim\service\support\impl\PassThruRoleTypeServiceBase.java
          U impl\src\main\java\org\kuali\rice\kim\service\support\impl\KimTypeServiceBase.java
          U impl\src\main\java\org\kuali\rice\kim\service\support\KimRoleTypeService.java
          U impl\src\main\java\org\kuali\rice\kim\dao\impl\KimRoleDaoOjb.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
          A impl\src\main\java\org\kuali\rice\kim\config\KIMThinClientConfigurer.java
          U impl\src\main\java\org\kuali\rice\kim\lookup\GroupLookupableHelperServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kim\util\KimCommonUtils.java
          U impl\src\main\java\org\kuali\rice\kew\dto\DTOConverter.java
          U impl\src\main\java\org\kuali\rice\kew\plugin\BasePluginRegistry.java
          U impl\src\main\java\org\kuali\rice\kew\exception\WorkflowServiceError.java
          U impl\src\main\java\org\kuali\rice\kew\exception\WorkflowServiceErrorImpl.java
          U impl\src\main\java\org\kuali\rice\kew\bo\lookup\DocSearchCriteriaDTOLookupableHelperServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kew\doctype\bo\DocumentType.java
          U impl\src\main\java\org\kuali\rice\kew\doctype\service\impl\DocumentTypeServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kew\doctype\service\impl\DocumentTypePermissionServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kew\doctype\service\DocumentTypePermissionService.java
          U impl\src\main\java\org\kuali\rice\kew\messaging\RouteDocumentMessageService.java
          U impl\src\main\java\org\kuali\rice\kew\document\DocumentTypeMaintainable.java
          U impl\src\main\java\org\kuali\rice\kew\actionrequest\bo\RuleMaintenanceActionRequestCodeValuesFinder.java
          U impl\src\main\java\org\kuali\rice\kew\actionrequest\service\impl\ActionRequestServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kew\actionrequest\service\ActionRequestService.java
          U impl\src\main\java\org\kuali\rice\kew\docsearch\SearchableAttributeLongValue.java
          U impl\src\main\java\org\kuali\rice\kew\docsearch\SearchableAttributeFloatValue.java
          U impl\src\main\java\org\kuali\rice\kew\docsearch\DocSearchUtils.java
          U impl\src\main\java\org\kuali\rice\kew\docsearch\SearchableAttribute.java
          U impl\src\main\java\org\kuali\rice\kew\docsearch\service\impl\DocumentSearchServiceImpl.java
          Conflict discovered in 'impl/src/main/java/org/kuali/rice/kew/docsearch/StandardDocumentSearchGenerator.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\kew\docsearch\StandardDocumentSearchGenerator.java
          U impl\src\main\java\org\kuali\rice\kew\documentoperation\web\DocumentOperationForm.java
          U impl\src\main\java\org\kuali\rice\kew\documentoperation\web\DocumentOperationAction.java
          U impl\src\main\java\org\kuali\rice\kew\actions\asyncservices\BlanketApproveProcessor.java
          U impl\src\main\java\org\kuali\rice\kew\actions\asyncservices\BlanketApproveProcessorService.java
          U impl\src\main\java\org\kuali\rice\kew\actions\CompleteAction.java
          U impl\src\main\java\org\kuali\rice\kew\actions\ReleaseWorkgroupAuthority.java
          U impl\src\main\java\org\kuali\rice\kew\actions\DisapproveAction.java
          U impl\src\main\java\org\kuali\rice\kew\actions\BlanketApproveAction.java
          U impl\src\main\java\org\kuali\rice\kew\actions\TakeWorkgroupAuthority.java
          U impl\src\main\java\org\kuali\rice\kew\actions\SuperUserActionTakenEvent.java
          U impl\src\main\java\org\kuali\rice\kew\actions\AcknowledgeAction.java
          U impl\src\main\java\org\kuali\rice\kew\actions\ActionRegistryImpl.java
          U impl\src\main\java\org\kuali\rice\kew\actions\RouteDocumentAction.java
          U impl\src\main\java\org\kuali\rice\kew\actions\SaveActionEvent.java
          U impl\src\main\java\org\kuali\rice\kew\actions\SuperUserReturnToPreviousNodeAction.java
          U impl\src\main\java\org\kuali\rice\kew\actions\ActionTakenEvent.java
          U impl\src\main\java\org\kuali\rice\kew\actions\MoveDocumentAction.java
          U impl\src\main\java\org\kuali\rice\kew\actions\ApproveAction.java
          Conflict discovered in 'impl/src/main/java/org/kuali/rice/kew/actions/AdHocAction.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\kew\actions\AdHocAction.java
          U impl\src\main\java\org\kuali\rice\kew\actions\LogDocumentActionAction.java
          U impl\src\main\java\org\kuali\rice\kew\actions\ReturnToPreviousNodeAction.java
          U impl\src\main\java\org\kuali\rice\kew\actions\CancelAction.java
          U impl\src\main\java\org\kuali\rice\kew\actions\RevokeAdHocAction.java
          U impl\src\main\java\org\kuali\rice\kew\actions\ClearFYIAction.java
          U impl\src\main\java\org\kuali\rice\kew\service\impl\WorkflowUtilityWebServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kew\xml\export\DocumentTypeXmlExporter.java
          U impl\src\main\java\org\kuali\rice\kew\xml\DocumentTypeXmlParser.java
          U impl\src\main\java\org\kuali\rice\kew\xml\XmlConstants.java
          Conflict discovered in 'impl/src/main/java/org/kuali/rice/kew/preferences/service/impl/PreferencesServiceImpl.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\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\engine\RouteContext.java
          U impl\src\main\java\org\kuali\rice\kew\config\ThinClientResourceLoader.java
          U impl\src\main\java\org\kuali\rice\kew\config\KEWConfigurer.java
          U impl\src\main\java\org\kuali\rice\kew\config\ThinClientKEWConfigurer.java
          U impl\src\main\java\org\kuali\rice\kew\routeheader\service\impl\WorkflowDocumentServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kew\routeheader\dao\impl\DocumentRouteHeaderDAOOjbImpl.java
          U impl\src\main\java\org\kuali\rice\kew\rule\WorkflowAttributeValidationError.java
          U impl\src\main\java\org\kuali\rice\kew\rule\RuleDelegation.java
          U impl\src\main\java\org\kuali\rice\kew\util\Utilities.java
          U impl\src\main\java\org\kuali\rice\core\jdbc\criteria\Criteria.java
          U impl\src\main\java\org\kuali\rice\core\jdbc\SqlBuilder.java
          U impl\src\main\java\org\kuali\rice\core\database\platform\OracleDatabasePlatform.java
          U impl\src\main\java\org\kuali\rice\core\database\platform\ANSISqlDatabasePlatform.java
          A impl\src\main\java\org\kuali\rice\core\config\event\RiceConfigEventListener.java
          A impl\src\main\java\org\kuali\rice\core\config\RiceConfigurerBase.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\resourceloader\BaseWrappingResourceLoader.java
          U impl\src\main\java\org\kuali\rice\kns\datadictionary\BusinessObjectEntry.java
          U impl\src\main\java\org\kuali\rice\kns\datadictionary\LookupDefinition.java
          U impl\src\main\java\org\kuali\rice\kns\datadictionary\DataDictionary.java
          U impl\src\main\java\org\kuali\rice\kns\bo\PersistableBusinessObjectBase.java
          U impl\src\main\java\org\kuali\rice\kns\service\DictionaryValidationService.java
          U impl\src\main\java\org\kuali\rice\kns\service\impl\AbstractStaticConfigurationServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kns\service\impl\DateTimeServiceImpl.java
          Conflict discovered in 'impl/src/main/java/org/kuali/rice/kns/service/impl/DictionaryValidationServiceImpl.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\service\impl\DictionaryValidationServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kns\workflow\attribute\DataDictionaryDocumentSearchCustomizer.java
          U impl\src\main\java\org\kuali\rice\kns\workflow\attribute\DataDictionarySearchableAttribute.java
          U impl\src\main\java\org\kuali\rice\kns\util\MessageMap.java
          D impl\src\main\java\org\kuali\rice\kns\util\properties\KualiPropertiesFactory.java
          U impl\src\main\java\org\kuali\rice\kns\web\struts\form\KualiHelpForm.java
          U impl\src\main\java\org\kuali\rice\kns\web\struts\action\KualiPropertyMessageResourcesFactory.java
          A 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\KualiHelpAction.java
          U impl\src\main\java\org\kuali\rice\kns\web\struts\action\KualiDocumentActionBase.java
          U impl\src\main\java\org\kuali\rice\kns\web\format\CurrencyFormatter.java
          U impl\src\main\java\org\kuali\rice\kns\document\authorization\DocumentAuthorizerBase.java
          Conflict discovered in 'impl/src/main/resources/META-INF/common-config-defaults.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\META-INF\common-config-defaults.xml
          U impl\src\main\resources\schema\DocumentType.xsd
          U impl\src\main\resources\KR-ApplicationResources.properties
          U impl\src\main\resources\org\kuali\rice\ksb\config\OJB-repository-ksb.xml
          U impl\src\main\resources\org\kuali\rice\kim\config\KIMImplementationSpringBeans.xml
          U impl\src\main\resources\org\kuali\rice\kim\config\KIMInterfaceSpringBeans.xml
          A impl\src\main\resources\org\kuali\rice\kim\config\KIMThinClientSpringBeans.xml
          U impl\src\main\resources\org\kuali\rice\kew\bo\datadictionary\DocumentType.xml
          U impl\src\main\resources\org\kuali\rice\kew\config\OJB-repository-kew.xml
          U impl\src\main\resources\org\kuali\rice\kew\document\datadictionary\DocumentTypeMaintenanceDocument.xml
          U impl\src\main\resources\org\kuali\rice\kns\bo\datadictionary\Campus.xml
          U impl\src\main\resources\org\kuali\rice\kns\document\datadictionary\CampusMaintenanceDocument.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\templates\createproject.config.template.xml
          U api\src\main\java\org\kuali\rice\kim\service\IdentityManagementNotificationService.java
          U api\src\main\java\org\kuali\rice\kim\service\RoleService.java
          U api\src\main\java\org\kuali\rice\kim\util\KIMWebServiceConstants.java
          U api\src\main\java\org\kuali\rice\kew\dto\DocumentTypeDTO.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 '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\java\org\kuali\rice\kew\docsearch\DocumentSearchActionTest.java
          D web\src\test\resources\configurationServiceData.xml
          D web\src\main\resources\configurationServiceData.xml
          U web\src\main\webapp\kew\WEB-INF\jsp\documentoperation\DocumentOperation.jsp
          U web\src\main\webapp\kew\WEB-INF\jsp\routelog\ActionRequests.jsp
          U web\src\main\webapp\kew\css\screen.css
          U web\src\main\webapp\WEB-INF\tags\kr\help.tag
          U web\src\main\webapp\kr\WEB-INF\jsp\KualiMultipleValueLookup.jsp
          U web\src\main\webapp\kr\WEB-INF\jsp\KualiLookup.jsp
          U web\src\main\webapp\kr\scripts\core.js
          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: 17
          Tree conflicts: 1

          Show
          jjhanso Jeremy Hanson added a comment - Output from the merge: C:\java\projects\rice-1.0.kc>svn merge -r 9933:HEAD https://test.kuali.org/svn/rice/branches/rice-release-1-0-1-1-br — Merging r9934 through r10833 into '.': A ksb\src\test\java\org\kuali\rice\ksb\messaging\ServiceUpdateAndRemovalTest.java U ksb\src\test\resources\META-INF\ksb-test-config.xml 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 A kim\src\test\java\org\kuali\rice\kim\test\service\IdentityArchiveServiceTest.java 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 kew\src\test\java\org\kuali\rice\kew\doctype\DocumentTypeTest.java A kew\src\test\java\org\kuali\rice\kew\mail\EmailContentServiceTest.java U kew\src\test\java\org\kuali\rice\kew\docsearch\DocumentSearchTestBase.java U kew\src\test\java\org\kuali\rice\kew\docsearch\TestXMLSearchableAttributeDateTime.java U kew\src\test\java\org\kuali\rice\kew\docsearch\SearchableAttributeTest.java U kew\src\test\java\org\kuali\rice\kew\docsearch\TestXMLSearchableAttributeLong.java U kew\src\test\java\org\kuali\rice\kew\docsearch\TestXMLSearchableAttributeFloat.java U kew\src\test\java\org\kuali\rice\kew\docsearch\TestXMLSearchableAttributeString.java U kew\src\test\java\org\kuali\rice\kew\docsearch\MockSearchableAttribute.java U kew\src\test\java\org\kuali\rice\kew\docsearch\DocumentSearchSecurityTest.java U kew\src\test\java\org\kuali\rice\kew\actions\ReturnToPreviousNodeActionTest.java A kew\src\test\java\org\kuali\rice\kew\actions\ReturnToPreviousTestSplit.java U kew\src\test\java\org\kuali\rice\kew\actions\AdHocRouteTest.java U kew\src\test\java\org\kuali\rice\kew\xml\export\DocumentTypeXmlExporterTest.java U kew\src\test\java\org\kuali\rice\kew\rule\AddRuleDelegationTest.java A kew\src\test\java\org\kuali\rice\kew\rule\RuleTestUtils.java U kew\src\test\java\mocks\MockDocumentRequeuerImpl.java A kew\src\test\resources\org\kuali\rice\kew\mail\EmailContentServiceTestConfig.xml U kew\src\test\resources\org\kuali\rice\kew\actions\ActionsConfig.xml U kew\src\test\resources\org\kuali\rice\kew\xml\export\DocTypeExportConfig.xml U kew\src\test\resources\org\kuali\rice\kew\server\WorkflowUtilityConfig.xml U kew\src\test\resources\org\kuali\rice\kew\doctype\DocTypeWithMostParams1.xml U kew\src\test\resources\org\kuali\rice\kew\doctype\DocTypeWithMostParams2.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 Conflict discovered in 'scripts/launch/rice - JettyServer.launch'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C scripts\launch\rice - JettyServer.launch A scripts\upgrades\1.0.1 to 1.0.1.1 A scripts\upgrades\1.0.1 to 1.0.1.1\db-updates-client A scripts\upgrades\1.0.1 to 1.0.1.1\db-updates A scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\01-04-2010.sql A scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\12-02-2009.sql A scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\12-04-2009.sql A scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\12-22-2009.sql A scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\12-07-2009.sql A scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\12-16-2009.sql A scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\12-09-2009.sql A scripts\upgrades\1.0.1 to 1.0.1.1\final A scripts\upgrades\1.0.1 to 1.0.1.1\kfs-db-updates 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 A kns\src\test\java\org\kuali\rice\kns\test\document\SearchAttributeIndexTestDocument.java A kns\src\test\java\org\kuali\rice\kns\test\document\AccountStateKeyValues.java A kns\src\test\java\org\kuali\rice\kns\test\document\AccountWithDDAttributesDocument.java A kns\src\test\java\org\kuali\rice\kns\service\NamespaceWildcardAllowedAndOrStringExactMatchPermissionTypeServiceImplTest.java A kns\src\test\java\org\kuali\rice\kns\workflow\SearchAttributeIndexRequestTest.java A kns\src\test\java\org\kuali\rice\kns\workflow\DataDictionarySearchableAttributeTest.java U kns\src\test\resources\db\derby\kns.sql C kns\src\test\resources\configurationServiceData.xml U kns\src\test\resources\KnsTestSpringBeans.xml U kns\src\test\resources\org\kuali\rice\kns\test\DefaultSuiteTestData.sql U kns\src\test\resources\org\kuali\rice\kns\test\DefaultSuiteTestData.xml A kns\src\test\resources\org\kuali\rice\kns\test\document\SearchAttributeIndexTestDocument.xml A kns\src\test\resources\org\kuali\rice\kns\test\document\AccountWithDDAttributesDocument.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 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\config\data\DefaultSuiteTestDataKNS.sql U impl\src\test\config\data\KRIM_ATTR_DEFN_T.sql U impl\src\main\java\org\kuali\rice\ksb\service\KSBServiceLocator.java U impl\src\main\java\org\kuali\rice\ksb\security\service\impl\DigitalSignatureServiceImpl.java U impl\src\main\java\org\kuali\rice\ksb\messaging\RoutingTableDiffCalculator.java U impl\src\main\java\org\kuali\rice\ksb\messaging\ServiceDefinition.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\RemotedServiceRegistryImpl.java A impl\src\main\java\org\kuali\rice\ksb\messaging\FlattenedServiceDefinition.java U impl\src\main\java\org\kuali\rice\ksb\messaging\KSBHttpInvokerRequestExecutor.java U impl\src\main\java\org\kuali\rice\ksb\messaging\quartz\KSBSchedulerFactoryBean.java U impl\src\main\java\org\kuali\rice\ksb\messaging\ServiceInfo.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\config\KSBThinClientConfigurer.java U impl\src\main\java\org\kuali\rice\ksb\util\KSBConstants.java U impl\src\main\java\org\kuali\rice\kim\inquiry\ResponsibilityInquirableImpl.java U impl\src\main\java\org\kuali\rice\kim\service\impl\GroupServiceImpl.java U impl\src\main\java\org\kuali\rice\kim\service\impl\IdentityManagementNotificationServiceImpl.java U impl\src\main\java\org\kuali\rice\kim\service\impl\RoleManagementServiceImpl.java Conflict discovered in 'impl/src/main/java/org/kuali/rice/kim/service/impl/RoleServiceImpl.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\RoleServiceImpl.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\ResponsibilityServiceImpl.java U impl\src\main\java\org\kuali\rice\kim\service\impl\IdentityCurrentAndArchivedServiceImpl.java U impl\src\main\java\org\kuali\rice\kim\service\impl\PermissionServiceImpl.java U impl\src\main\java\org\kuali\rice\kim\service\impl\IdentityArchiveServiceImpl.java U impl\src\main\java\org\kuali\rice\kim\service\support\impl\KimRoleTypeServiceBase.java U impl\src\main\java\org\kuali\rice\kim\service\support\impl\PassThruRoleTypeServiceBase.java U impl\src\main\java\org\kuali\rice\kim\service\support\impl\KimTypeServiceBase.java U impl\src\main\java\org\kuali\rice\kim\service\support\KimRoleTypeService.java U impl\src\main\java\org\kuali\rice\kim\dao\impl\KimRoleDaoOjb.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 A impl\src\main\java\org\kuali\rice\kim\config\KIMThinClientConfigurer.java U impl\src\main\java\org\kuali\rice\kim\lookup\GroupLookupableHelperServiceImpl.java U impl\src\main\java\org\kuali\rice\kim\util\KimCommonUtils.java U impl\src\main\java\org\kuali\rice\kew\dto\DTOConverter.java U impl\src\main\java\org\kuali\rice\kew\plugin\BasePluginRegistry.java U impl\src\main\java\org\kuali\rice\kew\exception\WorkflowServiceError.java U impl\src\main\java\org\kuali\rice\kew\exception\WorkflowServiceErrorImpl.java U impl\src\main\java\org\kuali\rice\kew\bo\lookup\DocSearchCriteriaDTOLookupableHelperServiceImpl.java U impl\src\main\java\org\kuali\rice\kew\doctype\bo\DocumentType.java U impl\src\main\java\org\kuali\rice\kew\doctype\service\impl\DocumentTypeServiceImpl.java U impl\src\main\java\org\kuali\rice\kew\doctype\service\impl\DocumentTypePermissionServiceImpl.java U impl\src\main\java\org\kuali\rice\kew\doctype\service\DocumentTypePermissionService.java U impl\src\main\java\org\kuali\rice\kew\messaging\RouteDocumentMessageService.java U impl\src\main\java\org\kuali\rice\kew\document\DocumentTypeMaintainable.java U impl\src\main\java\org\kuali\rice\kew\actionrequest\bo\RuleMaintenanceActionRequestCodeValuesFinder.java U impl\src\main\java\org\kuali\rice\kew\actionrequest\service\impl\ActionRequestServiceImpl.java U impl\src\main\java\org\kuali\rice\kew\actionrequest\service\ActionRequestService.java U impl\src\main\java\org\kuali\rice\kew\docsearch\SearchableAttributeLongValue.java U impl\src\main\java\org\kuali\rice\kew\docsearch\SearchableAttributeFloatValue.java U impl\src\main\java\org\kuali\rice\kew\docsearch\DocSearchUtils.java U impl\src\main\java\org\kuali\rice\kew\docsearch\SearchableAttribute.java U impl\src\main\java\org\kuali\rice\kew\docsearch\service\impl\DocumentSearchServiceImpl.java Conflict discovered in 'impl/src/main/java/org/kuali/rice/kew/docsearch/StandardDocumentSearchGenerator.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\kew\docsearch\StandardDocumentSearchGenerator.java U impl\src\main\java\org\kuali\rice\kew\documentoperation\web\DocumentOperationForm.java U impl\src\main\java\org\kuali\rice\kew\documentoperation\web\DocumentOperationAction.java U impl\src\main\java\org\kuali\rice\kew\actions\asyncservices\BlanketApproveProcessor.java U impl\src\main\java\org\kuali\rice\kew\actions\asyncservices\BlanketApproveProcessorService.java U impl\src\main\java\org\kuali\rice\kew\actions\CompleteAction.java U impl\src\main\java\org\kuali\rice\kew\actions\ReleaseWorkgroupAuthority.java U impl\src\main\java\org\kuali\rice\kew\actions\DisapproveAction.java U impl\src\main\java\org\kuali\rice\kew\actions\BlanketApproveAction.java U impl\src\main\java\org\kuali\rice\kew\actions\TakeWorkgroupAuthority.java U impl\src\main\java\org\kuali\rice\kew\actions\SuperUserActionTakenEvent.java U impl\src\main\java\org\kuali\rice\kew\actions\AcknowledgeAction.java U impl\src\main\java\org\kuali\rice\kew\actions\ActionRegistryImpl.java U impl\src\main\java\org\kuali\rice\kew\actions\RouteDocumentAction.java U impl\src\main\java\org\kuali\rice\kew\actions\SaveActionEvent.java U impl\src\main\java\org\kuali\rice\kew\actions\SuperUserReturnToPreviousNodeAction.java U impl\src\main\java\org\kuali\rice\kew\actions\ActionTakenEvent.java U impl\src\main\java\org\kuali\rice\kew\actions\MoveDocumentAction.java U impl\src\main\java\org\kuali\rice\kew\actions\ApproveAction.java Conflict discovered in 'impl/src/main/java/org/kuali/rice/kew/actions/AdHocAction.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\kew\actions\AdHocAction.java U impl\src\main\java\org\kuali\rice\kew\actions\LogDocumentActionAction.java U impl\src\main\java\org\kuali\rice\kew\actions\ReturnToPreviousNodeAction.java U impl\src\main\java\org\kuali\rice\kew\actions\CancelAction.java U impl\src\main\java\org\kuali\rice\kew\actions\RevokeAdHocAction.java U impl\src\main\java\org\kuali\rice\kew\actions\ClearFYIAction.java U impl\src\main\java\org\kuali\rice\kew\service\impl\WorkflowUtilityWebServiceImpl.java U impl\src\main\java\org\kuali\rice\kew\xml\export\DocumentTypeXmlExporter.java U impl\src\main\java\org\kuali\rice\kew\xml\DocumentTypeXmlParser.java U impl\src\main\java\org\kuali\rice\kew\xml\XmlConstants.java Conflict discovered in 'impl/src/main/java/org/kuali/rice/kew/preferences/service/impl/PreferencesServiceImpl.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\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\engine\RouteContext.java U impl\src\main\java\org\kuali\rice\kew\config\ThinClientResourceLoader.java U impl\src\main\java\org\kuali\rice\kew\config\KEWConfigurer.java U impl\src\main\java\org\kuali\rice\kew\config\ThinClientKEWConfigurer.java U impl\src\main\java\org\kuali\rice\kew\routeheader\service\impl\WorkflowDocumentServiceImpl.java U impl\src\main\java\org\kuali\rice\kew\routeheader\dao\impl\DocumentRouteHeaderDAOOjbImpl.java U impl\src\main\java\org\kuali\rice\kew\rule\WorkflowAttributeValidationError.java U impl\src\main\java\org\kuali\rice\kew\rule\RuleDelegation.java U impl\src\main\java\org\kuali\rice\kew\util\Utilities.java U impl\src\main\java\org\kuali\rice\core\jdbc\criteria\Criteria.java U impl\src\main\java\org\kuali\rice\core\jdbc\SqlBuilder.java U impl\src\main\java\org\kuali\rice\core\database\platform\OracleDatabasePlatform.java U impl\src\main\java\org\kuali\rice\core\database\platform\ANSISqlDatabasePlatform.java A impl\src\main\java\org\kuali\rice\core\config\event\RiceConfigEventListener.java A impl\src\main\java\org\kuali\rice\core\config\RiceConfigurerBase.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\resourceloader\BaseWrappingResourceLoader.java U impl\src\main\java\org\kuali\rice\kns\datadictionary\BusinessObjectEntry.java U impl\src\main\java\org\kuali\rice\kns\datadictionary\LookupDefinition.java U impl\src\main\java\org\kuali\rice\kns\datadictionary\DataDictionary.java U impl\src\main\java\org\kuali\rice\kns\bo\PersistableBusinessObjectBase.java U impl\src\main\java\org\kuali\rice\kns\service\DictionaryValidationService.java U impl\src\main\java\org\kuali\rice\kns\service\impl\AbstractStaticConfigurationServiceImpl.java U impl\src\main\java\org\kuali\rice\kns\service\impl\DateTimeServiceImpl.java Conflict discovered in 'impl/src/main/java/org/kuali/rice/kns/service/impl/DictionaryValidationServiceImpl.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\service\impl\DictionaryValidationServiceImpl.java U impl\src\main\java\org\kuali\rice\kns\workflow\attribute\DataDictionaryDocumentSearchCustomizer.java U impl\src\main\java\org\kuali\rice\kns\workflow\attribute\DataDictionarySearchableAttribute.java U impl\src\main\java\org\kuali\rice\kns\util\MessageMap.java D impl\src\main\java\org\kuali\rice\kns\util\properties\KualiPropertiesFactory.java U impl\src\main\java\org\kuali\rice\kns\web\struts\form\KualiHelpForm.java U impl\src\main\java\org\kuali\rice\kns\web\struts\action\KualiPropertyMessageResourcesFactory.java A 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\KualiHelpAction.java U impl\src\main\java\org\kuali\rice\kns\web\struts\action\KualiDocumentActionBase.java U impl\src\main\java\org\kuali\rice\kns\web\format\CurrencyFormatter.java U impl\src\main\java\org\kuali\rice\kns\document\authorization\DocumentAuthorizerBase.java Conflict discovered in 'impl/src/main/resources/META-INF/common-config-defaults.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\META-INF\common-config-defaults.xml U impl\src\main\resources\schema\DocumentType.xsd U impl\src\main\resources\KR-ApplicationResources.properties U impl\src\main\resources\org\kuali\rice\ksb\config\OJB-repository-ksb.xml U impl\src\main\resources\org\kuali\rice\kim\config\KIMImplementationSpringBeans.xml U impl\src\main\resources\org\kuali\rice\kim\config\KIMInterfaceSpringBeans.xml A impl\src\main\resources\org\kuali\rice\kim\config\KIMThinClientSpringBeans.xml U impl\src\main\resources\org\kuali\rice\kew\bo\datadictionary\DocumentType.xml U impl\src\main\resources\org\kuali\rice\kew\config\OJB-repository-kew.xml U impl\src\main\resources\org\kuali\rice\kew\document\datadictionary\DocumentTypeMaintenanceDocument.xml U impl\src\main\resources\org\kuali\rice\kns\bo\datadictionary\Campus.xml U impl\src\main\resources\org\kuali\rice\kns\document\datadictionary\CampusMaintenanceDocument.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\templates\createproject.config.template.xml U api\src\main\java\org\kuali\rice\kim\service\IdentityManagementNotificationService.java U api\src\main\java\org\kuali\rice\kim\service\RoleService.java U api\src\main\java\org\kuali\rice\kim\util\KIMWebServiceConstants.java U api\src\main\java\org\kuali\rice\kew\dto\DocumentTypeDTO.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 '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\java\org\kuali\rice\kew\docsearch\DocumentSearchActionTest.java D web\src\test\resources\configurationServiceData.xml D web\src\main\resources\configurationServiceData.xml U web\src\main\webapp\kew\WEB-INF\jsp\documentoperation\DocumentOperation.jsp U web\src\main\webapp\kew\WEB-INF\jsp\routelog\ActionRequests.jsp U web\src\main\webapp\kew\css\screen.css U web\src\main\webapp\WEB-INF\tags\kr\help.tag U web\src\main\webapp\kr\WEB-INF\jsp\KualiMultipleValueLookup.jsp U web\src\main\webapp\kr\WEB-INF\jsp\KualiLookup.jsp U web\src\main\webapp\kr\scripts\core.js 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: 17 Tree conflicts: 1
          Hide
          jjhanso Jeremy Hanson added a comment -

          SQL to perform against master coeus db:

          – 12-02-2009.sql
          KULRICE-3522 – Drop application URL from KIM attribute definition table
          alter table krim_attr_defn_t drop column appl_url
          /

          KULRICE-3685 – Kim entity tables missing foreign-key relationships
          ALTER TABLE KRIM_ENTITY_ETHNIC_T
          add CONSTRAINT KRIM_ENTITY_ETHNIC_TR1
          FOREIGN KEY (entity_id)
          REFERENCES KRIM_ENTITY_T(entity_id)
          /
          ALTER TABLE KRIM_ENTITY_RESIDENCY_T
          add CONSTRAINT KRIM_ENTITY_RESIDENCY_TR1
          FOREIGN KEY (entity_id)
          REFERENCES KRIM_ENTITY_T(entity_id)
          /
          ALTER TABLE KRIM_ENTITY_VISA_T
          add CONSTRAINT KRIM_ENTITY_VISA_TR1
          FOREIGN KEY (entity_id)
          REFERENCES KRIM_ENTITY_T(entity_id)
          /

          – 12-04-2009.sql
          DELETE FROM KRSB_SVC_DEF_T
          /
          ALTER TABLE KRSB_SVC_DEF_T DROP (SVC_DEF)
          /
          ALTER TABLE KRSB_SVC_DEF_T ADD (
          FLT_SVC_DEF_ID NUMBER(14, 0) NOT NULL,
          SVC_DEF_CHKSM VARCHAR2(30) NOT NULL
          )
          /
          CREATE UNIQUE INDEX KRSB_SVC_DEF_TI2 ON KRSB_SVC_DEF_T (FLT_SVC_DEF_ID)
          /
          CREATE TABLE KRSB_FLT_SVC_DEF_T (
          FLT_SVC_DEF_ID NUMBER(14, 0),
          FLT_SVC_DEF CLOB NOT NULL,
          CONSTRAINT KRSB_FLT_SVC_DEF_TP1 PRIMARY KEY (FLT_SVC_DEF_ID)
          )
          /
          CREATE SEQUENCE KRSB_FLT_SVC_DEF_S START WITH 1000 INCREMENT BY 1
          /

          – 12-07-2009.sql
          KULRICE-3700 – Add DataDictionarySearchableAttributeTest to the master databases and update validation params
          UPDATE KRNS_PARM_T SET TXT='MM/dd/yyyy;MM/dd/yyyy HH:mm:ss;MM/dd/yy;MM-dd-yy;MMddyy;MMMM dd;yyyy;MM/dd/yy HH:mm:ss;MM-dd-yy HH:mm:ss;MMddyy HH:mm:ss;MMMM dd HH:mm:ss;yyyy HH:mm:ss' WHERE NMSPC_CD='KR-NS' AND PARM_DTL_TYP_CD='All' AND PARM_NM='STRING_TO_DATE_FORMATS' AND APPL_NMSPC_CD='KUALI'
          /
          UPDATE KRNS_PARM_T SET TXT='MM/dd/yyyy hh:mm a;MM/dd/yyyy;MM/dd/yyyy HH:mm:ss;MM/dd/yy;MM-dd-yy;MMddyy;MMMM dd;yyyy;MM/dd/yy HH:mm:ss;MM-dd-yy HH:mm:ss;MMddyy HH:mm:ss;MMMM dd HH:mm:ss;yyyy HH:mm:ss' WHERE NMSPC_CD='KR-NS' AND PARM_DTL_TYP_CD='All' AND PARM_NM='STRING_TO_TIMESTAMP_FORMATS' AND APPL_NMSPC_CD='KUALI'
          /
          CREATE TABLE ACCT_DD_ATTR_DOC (
          DOC_HDR_ID VARCHAR2(14),
          OBJ_ID VARCHAR2(36),
          VER_NBR NUMBER(14),
          ACCT_NUM NUMBER(14) NOT NULL,
          ACCT_OWNR VARCHAR2(50) NOT NULL,
          ACCT_BAL NUMBER(16,2) NOT NULL,
          ACCT_OPN_DAT DATE NOT NULL,
          ACCT_STAT VARCHAR2(30) NOT NULL,
          ACCT_UPDATE_DT_TM TIMESTAMP,
          ACCT_AWAKE VARCHAR2(1),
          CONSTRAINT ACCT_DD_ATTR_DOC_PK PRIMARY KEY (DOC_HDR_ID)
          )
          /

          – 12-09-2009.sql
          create table TST_SEARCH_ATTR_INDX_TST_DOC_T (
          DOC_HDR_ID VARCHAR2(14),
          OBJ_ID VARCHAR2(36),
          VER_NBR NUMBER(14),
          RTE_LVL_CNT NUMBER(14),
          CNSTNT_STR VARCHAR2(50),
          RTD_STR VARCHAR2(50),
          HLD_RTD_STR VARCHAR2(50),
          RD_ACCS_CNT NUMBER(14),
          CONSTRAINT TST_SEARCH_ATTR_INDX_TST_DOC_T PRIMARY KEY (DOC_HDR_ID)
          )
          /

          – 12-16-2009.sql
          KULRICE-3773 – Apply the database changes resulting from the doc search date validation fixes to the master DBs
          UPDATE KRNS_PARM_T SET TXT='MM/dd/yy;MM/dd/yyyy;MM-dd-yy;MMddyy;MMMM dd;yyyy;MM/dd/yy HH:mm:ss;MM/dd/yyyy HH:mm:ss;MM-dd-yy HH:mm:ss;MMddyy HH:mm:ss;MMMM dd HH:mm:ss;yyyy HH:mm:ss' WHERE NMSPC_CD='KR-NS' AND PARM_DTL_TYP_CD='All' AND PARM_NM='STRING_TO_DATE_FORMATS' AND APPL_NMSPC_CD='KUALI'
          /
          UPDATE KRNS_PARM_T SET TXT='MM/dd/yyyy hh:mm a;MM/dd/yy;MM/dd/yyyy;MM-dd-yy;MMddyy;MMMM dd;yyyy;MM/dd/yy HH:mm:ss;MM/dd/yyyy HH:mm:ss;MM-dd-yy HH:mm:ss;MMddyy HH:mm:ss;MMMM dd HH:mm:ss;yyyy HH:mm:ss' WHERE NMSPC_CD='KR-NS' AND PARM_DTL_TYP_CD='All' AND PARM_NM='STRING_TO_TIMESTAMP_FORMATS' AND APPL_NMSPC_CD='KUALI'
          /

          – 12-22-2009.sql

          1. changes for KULRICE-3754
            alter table KREW_DOC_TYP_T add DOC_SEARCH_HELP_URL VARCHAR2(4000) DEFAULT NULL
            /

          – 01-04-2010.sql
          KULRICE-3780 – more date validation formats
          UPDATE KRNS_PARM_T SET TXT='MM/dd/yyyy hh:mm a;MM/dd/yy;MM/dd/yyyy;MM-dd-yy;MMddyy;MMMM dd;yyyy;MM/dd/yy HH:mm:ss;MM/dd/yyyy HH:mm:ss;MM-dd-yy HH:mm:ss;MMddyy HH:mm:ss;MMMM dd HH:mm:ss;yyyy HH:mm:ss' WHERE NMSPC_CD='KR-NS' AND PARM_DTL_TYP_CD='All' AND PARM_NM='STRING_TO_DATE_FORMATS' AND APPL_NMSPC_CD='KUALI'
          /

          Show
          jjhanso Jeremy Hanson added a comment - SQL to perform against master coeus db: – 12-02-2009.sql – KULRICE-3522 – Drop application URL from KIM attribute definition table alter table krim_attr_defn_t drop column appl_url / – KULRICE-3685 – Kim entity tables missing foreign-key relationships ALTER TABLE KRIM_ENTITY_ETHNIC_T add CONSTRAINT KRIM_ENTITY_ETHNIC_TR1 FOREIGN KEY (entity_id) REFERENCES KRIM_ENTITY_T(entity_id) / ALTER TABLE KRIM_ENTITY_RESIDENCY_T add CONSTRAINT KRIM_ENTITY_RESIDENCY_TR1 FOREIGN KEY (entity_id) REFERENCES KRIM_ENTITY_T(entity_id) / ALTER TABLE KRIM_ENTITY_VISA_T add CONSTRAINT KRIM_ENTITY_VISA_TR1 FOREIGN KEY (entity_id) REFERENCES KRIM_ENTITY_T(entity_id) / – 12-04-2009.sql DELETE FROM KRSB_SVC_DEF_T / ALTER TABLE KRSB_SVC_DEF_T DROP (SVC_DEF) / ALTER TABLE KRSB_SVC_DEF_T ADD ( FLT_SVC_DEF_ID NUMBER(14, 0) NOT NULL, SVC_DEF_CHKSM VARCHAR2(30) NOT NULL ) / CREATE UNIQUE INDEX KRSB_SVC_DEF_TI2 ON KRSB_SVC_DEF_T (FLT_SVC_DEF_ID) / CREATE TABLE KRSB_FLT_SVC_DEF_T ( FLT_SVC_DEF_ID NUMBER(14, 0), FLT_SVC_DEF CLOB NOT NULL, CONSTRAINT KRSB_FLT_SVC_DEF_TP1 PRIMARY KEY (FLT_SVC_DEF_ID) ) / CREATE SEQUENCE KRSB_FLT_SVC_DEF_S START WITH 1000 INCREMENT BY 1 / – 12-07-2009.sql – KULRICE-3700 – Add DataDictionarySearchableAttributeTest to the master databases and update validation params UPDATE KRNS_PARM_T SET TXT='MM/dd/yyyy;MM/dd/yyyy HH:mm:ss;MM/dd/yy;MM-dd-yy;MMddyy;MMMM dd;yyyy;MM/dd/yy HH:mm:ss;MM-dd-yy HH:mm:ss;MMddyy HH:mm:ss;MMMM dd HH:mm:ss;yyyy HH:mm:ss' WHERE NMSPC_CD='KR-NS' AND PARM_DTL_TYP_CD='All' AND PARM_NM='STRING_TO_DATE_FORMATS' AND APPL_NMSPC_CD='KUALI' / UPDATE KRNS_PARM_T SET TXT='MM/dd/yyyy hh:mm a;MM/dd/yyyy;MM/dd/yyyy HH:mm:ss;MM/dd/yy;MM-dd-yy;MMddyy;MMMM dd;yyyy;MM/dd/yy HH:mm:ss;MM-dd-yy HH:mm:ss;MMddyy HH:mm:ss;MMMM dd HH:mm:ss;yyyy HH:mm:ss' WHERE NMSPC_CD='KR-NS' AND PARM_DTL_TYP_CD='All' AND PARM_NM='STRING_TO_TIMESTAMP_FORMATS' AND APPL_NMSPC_CD='KUALI' / CREATE TABLE ACCT_DD_ATTR_DOC ( DOC_HDR_ID VARCHAR2(14), OBJ_ID VARCHAR2(36), VER_NBR NUMBER(14), ACCT_NUM NUMBER(14) NOT NULL, ACCT_OWNR VARCHAR2(50) NOT NULL, ACCT_BAL NUMBER(16,2) NOT NULL, ACCT_OPN_DAT DATE NOT NULL, ACCT_STAT VARCHAR2(30) NOT NULL, ACCT_UPDATE_DT_TM TIMESTAMP, ACCT_AWAKE VARCHAR2(1), CONSTRAINT ACCT_DD_ATTR_DOC_PK PRIMARY KEY (DOC_HDR_ID) ) / – 12-09-2009.sql create table TST_SEARCH_ATTR_INDX_TST_DOC_T ( DOC_HDR_ID VARCHAR2(14), OBJ_ID VARCHAR2(36), VER_NBR NUMBER(14), RTE_LVL_CNT NUMBER(14), CNSTNT_STR VARCHAR2(50), RTD_STR VARCHAR2(50), HLD_RTD_STR VARCHAR2(50), RD_ACCS_CNT NUMBER(14), CONSTRAINT TST_SEARCH_ATTR_INDX_TST_DOC_T PRIMARY KEY (DOC_HDR_ID) ) / – 12-16-2009.sql – KULRICE-3773 – Apply the database changes resulting from the doc search date validation fixes to the master DBs UPDATE KRNS_PARM_T SET TXT='MM/dd/yy;MM/dd/yyyy;MM-dd-yy;MMddyy;MMMM dd;yyyy;MM/dd/yy HH:mm:ss;MM/dd/yyyy HH:mm:ss;MM-dd-yy HH:mm:ss;MMddyy HH:mm:ss;MMMM dd HH:mm:ss;yyyy HH:mm:ss' WHERE NMSPC_CD='KR-NS' AND PARM_DTL_TYP_CD='All' AND PARM_NM='STRING_TO_DATE_FORMATS' AND APPL_NMSPC_CD='KUALI' / UPDATE KRNS_PARM_T SET TXT='MM/dd/yyyy hh:mm a;MM/dd/yy;MM/dd/yyyy;MM-dd-yy;MMddyy;MMMM dd;yyyy;MM/dd/yy HH:mm:ss;MM/dd/yyyy HH:mm:ss;MM-dd-yy HH:mm:ss;MMddyy HH:mm:ss;MMMM dd HH:mm:ss;yyyy HH:mm:ss' WHERE NMSPC_CD='KR-NS' AND PARM_DTL_TYP_CD='All' AND PARM_NM='STRING_TO_TIMESTAMP_FORMATS' AND APPL_NMSPC_CD='KUALI' / – 12-22-2009.sql changes for KULRICE-3754 alter table KREW_DOC_TYP_T add DOC_SEARCH_HELP_URL VARCHAR2(4000) DEFAULT NULL / – 01-04-2010.sql – KULRICE-3780 – more date validation formats UPDATE KRNS_PARM_T SET TXT='MM/dd/yyyy hh:mm a;MM/dd/yy;MM/dd/yyyy;MM-dd-yy;MMddyy;MMMM dd;yyyy;MM/dd/yy HH:mm:ss;MM/dd/yyyy HH:mm:ss;MM-dd-yy HH:mm:ss;MMddyy HH:mm:ss;MMMM dd HH:mm:ss;yyyy HH:mm:ss' WHERE NMSPC_CD='KR-NS' AND PARM_DTL_TYP_CD='All' AND PARM_NM='STRING_TO_DATE_FORMATS' AND APPL_NMSPC_CD='KUALI' /
          Hide
          jjhanso Jeremy Hanson added a comment -

          changes from merge committed to 1.0.x for KC branch.

          Show
          jjhanso Jeremy Hanson added a comment - changes from merge committed to 1.0.x for KC branch.
          Hide
          jjhanso Jeremy Hanson added a comment -

          SQL changes have been made to the master DB (rice100kcDBA).

          Show
          jjhanso Jeremy Hanson added a comment - SQL changes have been made to the master DB (rice100kcDBA).
          Hide
          jjhanso Jeremy Hanson added a comment -

          Resolving this jira as merge is complete. Please reopen if any problems are found.

          Show
          jjhanso Jeremy Hanson added a comment - Resolving this jira as merge is complete. Please reopen if any problems are found.

            People

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

              Dates

              • Created:
                Updated:
                Resolved: