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

      We need to merge the latest changes from 1.0.x.kc branch into the 1.1.0 branch.

      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 - - edited

          The merge command for this is the following:

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

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

          output from the merge command:

          C:\java\projects\rice-1.1.0-merge>svn merge -r 10839:HEAD https://svn.kuali.org/rice/branches/rice-release-1-0-kc-br/
          — Merging r10840 through r11809 into '.':
          U ksb\src\test\java\org\kuali\rice\ksb\messaging\ServiceUpdateAndRemovalTest.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\UiDocumentServiceImplTest.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\RoleServiceRemoteTest.java
          D kim\src\test\java\org\kuali\rice\kim\test\service\RoleServiceImplTest.java
          A kim\src\test\java\org\kuali\rice\kim\service
          A kim\src\test\java\org\kuali\rice\kim\service\impl
          A kim\src\test\java\org\kuali\rice\kim\service\impl\RoleServiceImplTest.java
          U kim\src\test\resources\org\kuali\rice\kim\test\DefaultSuiteTestData.sql
          U kim\src\test\resources\org\kuali\rice\kim\test\DefaultSuiteTestData.xml
          U kew\src\test\java\org\kuali\rice\kew\mail\EmailContentServiceTest.java
          U kew\src\test\java\org\kuali\rice\kew\docsearch\xml\StandardGenericXMLSearchableAttributeRangesTest.java
          U kew\src\test\java\org\kuali\rice\kew\docsearch\xml\StandardGenericXMLSearchableAttributeTest.java
          U kew\src\test\java\org\kuali\rice\kew\actions\ReturnToPreviousTestSplit.java
          U kew\src\test\java\org\kuali\rice\kew\xml\export\DocumentTypeXmlExporterTest.java
          U kew\src\test\java\org\kuali\rice\kew\rule\RuleTestUtils.java
          A scripts\dataset\dist-build.properties
          A scripts\dataset\dist-impex-build.properties
          U scripts\dataset\demo-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
          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-02-2009.sql
          U scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\12-04-2009.sql
          U scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\12-22-2009.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
          A 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
          A scripts\upgrades\1.0.1 to 1.0.1.1\final\update_final_mysql.sql
          A scripts\upgrades\1.0.1 to 1.0.1.1\final\update_final_oracle.sql
          U 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\service\NamespaceWildcardAllowedAndOrStringExactMatchPermissionTypeServiceImplTest.java
          A kns\src\test\java\org\kuali\rice\kns\lookup\LookupResultsDDBo.java
          A kns\src\test\java\org\kuali\rice\kns\lookup\LookupResultsDDBoLookupableHelperServiceImpl.java
          A kns\src\test\java\org\kuali\rice\kns\lookup\LookupResultsServiceTest.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\resources\KnsTestSpringBeans.xml
          A kns\src\test\resources\org\kuali\rice\kns\test\document\LookupResultsDDBo.xml
          Conflict discovered in 'build.xml'.
          Select: (p) postpone, (df) diff-full, (e) edit,
          (mc) mine-conflict, (tc) theirs-conflict,
          (s) show all options: p
          C build.xml
          U NOTICE.txt
          U .classpath
          A impl\src\test\java\org\kuali\rice\core\config\PropertyHolder.java
          A impl\src\test\java\org\kuali\rice\core\config\JAXBConfigImplTest.java
          A impl\src\test\resources\org\kuali\rice\core\config\jaxb-test-circular.xml
          A impl\src\test\resources\org\kuali\rice\core\config\jaxb-test-context.xml
          A impl\src\test\resources\org\kuali\rice\core\config\jaxb-test-config.xml
          A impl\src\test\resources\org\kuali\rice\core\config\jaxb-test-import-config.xml
          A impl\src\test\resources\org\kuali\rice\core\config\jaxb-test-override.xml
          U impl\src\main\java\org\apache\ojb\broker\platforms\KualiMySQLSequenceManagerImpl.java
          U impl\src\main\java\org\kuali\rice\kcb\service\GlobalKCBServiceLocator.java
          U impl\src\main\java\org\kuali\rice\ksb\messaging\FlattenedServiceDefinition.java
          U impl\src\main\java\org\kuali\rice\ksb\messaging\BusClientFailureProxy.java
          U impl\src\main\java\org\kuali\rice\ksb\messaging\quartz\KSBSchedulerFactoryBean.java
          U impl\src\main\java\org\kuali\rice\ksb\messaging\RemoteResourceServiceLocatorImpl.java
          U impl\src\main\java\org\kuali\rice\kim\bo\entity\impl\KimEntityExternalIdentifierImpl.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
          A impl\src\main\java\org\kuali\rice\kim\service\impl\GroupUpdateServiceImpl.java
          A impl\src\main\java\org\kuali\rice\kim\service\impl\PermissionServiceBase.java
          U impl\src\main\java\org\kuali\rice\kim\service\impl\RoleServiceImpl.java
          A impl\src\main\java\org\kuali\rice\kim\service\impl\RoleUpdateServiceImpl.java
          A impl\src\main\java\org\kuali\rice\kim\service\impl\GroupServiceBase.java
          A impl\src\main\java\org\kuali\rice\kim\service\impl\RoleServiceBase.java
          U impl\src\main\java\org\kuali\rice\kim\service\impl\ResponsibilityServiceImpl.java
          A impl\src\main\java\org\kuali\rice\kim\service\impl\ResponsibilityUpdateServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kim\service\impl\PermissionServiceImpl.java
          A impl\src\main\java\org\kuali\rice\kim\service\impl\ResponsibilityServiceBase.java
          A impl\src\main\java\org\kuali\rice\kim\service\impl\PermissionUpdateServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kim\dao\impl\KimRoleDaoOjb.java
          U impl\src\main\java\org\kuali\rice\kim\config\KIMThinClientConfigurer.java
          U impl\src\main\java\org\kuali\rice\kim\lookup\KimTypeLookupableHelperServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kim\rules\ui\PersonDocumentGroupRule.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
          U impl\src\main\java\org\kuali\rice\kim\document\IdentityManagementPersonDocument.java
          Conflict discovered in 'impl/src/main/java/org/kuali/rice/kew/doctype/bo/DocumentType.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\doctype\bo\DocumentType.java
          U impl\src\main\java\org\kuali\rice\kew\actionlist\web\ActionListAction.java
          U impl\src\main\java\org\kuali\rice\kew\document\RoutingRuleDelegationMaintainableBusRule.java
          U impl\src\main\java\org\kuali\rice\kew\document\RoutingRuleMaintainableBusRule.java
          U impl\src\main\java\org\kuali\rice\kew\docsearch\SearchableAttributeDateTimeValue.java
          U impl\src\main\java\org\kuali\rice\kew\edl\components\NoteConfigComponent.java
          U impl\src\main\java\org\kuali\rice\kew\routeheader\service\impl\WorkflowDocumentServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kew\rule\web\DocumentConfigurationViewAction.java
          U impl\src\main\java\org\kuali\rice\kew\rule\FlexRM.java
          U impl\src\main\java\org\kuali\rice\kew\rule\RuleRoutingAttribute.java
          U impl\src\main\java\org\kuali\rice\core\service\impl\DemonstrationGradeEncryptionServiceImpl.java
          U impl\src\main\java\org\kuali\rice\core\config\event\RiceConfigEventListener.java
          U impl\src\main\java\org\kuali\rice\core\config\RiceConfigurerBase.java
          A impl\src\main\java\org\kuali\rice\core\config\xsd
          A impl\src\main\java\org\kuali\rice\core\config\xsd\Param.java
          A impl\src\main\java\org\kuali\rice\core\config\xsd\Config.java
          A impl\src\main\java\org\kuali\rice\core\config\spring\RiceConfigPropertyPlaceholderConfigurer.java
          A impl\src\main\java\org\kuali\rice\core\config\spring\RiceConfigBeanDefinitionVisitor.java
          A impl\src\main\java\org\kuali\rice\core\config\spring\ConfigPropertyFactoryBean.java
          A impl\src\main\java\org\kuali\rice\core\config\AbstractBaseConfig.java
          A impl\src\main\java\org\kuali\rice\core\config\JAXBConfigImpl.java
          A impl\src\main\java\org\kuali\rice\core\exception\RiceRemoteServiceConnectionException.java
          U impl\src\main\java\org\kuali\rice\kns\maintenance\rules\MaintenanceDocumentRuleBase.java
          U impl\src\main\java\org\kuali\rice\kns\inquiry\KualiInquirableImpl.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\BusinessObjectAuthorizationServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kns\service\impl\MaintenanceDocumentDictionaryServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kns\service\impl\DictionaryValidationServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kns\lookup\LookupResultsService.java
          U impl\src\main\java\org\kuali\rice\kns\lookup\AbstractLookupableHelperServiceImpl.java
          A impl\src\main\java\org\kuali\rice\kns\lookup\DataDictionaryLookupResultsSupportStrategy.java
          A impl\src\main\java\org\kuali\rice\kns\lookup\LookupResultsSupportStrategyService.java
          U impl\src\main\java\org\kuali\rice\kns\lookup\LookupResultsServiceImpl.java
          A impl\src\main\java\org\kuali\rice\kns\lookup\PersistableBusinessObjectLookupResultsSupportStrategyImpl.java
          U impl\src\main\java\org\kuali\rice\kns\util\MessageMap.java
          U impl\src\main\java\org\kuali\rice\kns\util\RiceKeyConstants.java
          U impl\src\main\java\org\kuali\rice\kns\web\struts\action\KualiPropertyMessageResourcesFactory.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\KualiRequestProcessor.java
          U impl\src\main\java\org\kuali\rice\kns\document\MaintenanceDocumentBase.java
          U impl\src\main\resources\META-INF\test-config-defaults.xml
          U impl\src\main\resources\META-INF\common-config-defaults.xml
          A impl\src\main\resources\schema\config.xsd
          U impl\src\main\resources\KIM-ApplicationResources.properties
          U impl\src\main\resources\org\kuali\rice\ksb\config\KSBSpringBeans.xml
          U impl\src\main\resources\org\kuali\rice\ksb\config\KSBThinClientSpringBeans.xml
          U impl\src\main\resources\org\kuali\rice\kim\bo\datadictionary\PersonDocumentAffiliation.xml
          U impl\src\main\resources\org\kuali\rice\kim\config\KIMImplementationSpringBeans.xml
          U impl\src\main\resources\org\kuali\rice\kim\config\KIMThinClientSpringBeans.xml
          U impl\src\main\resources\org\kuali\rice\kew\config\KEWSpringBeans.xml
          U impl\src\main\resources\org\kuali\rice\kew\ApplicationResources.properties
          A impl\src\main\resources\org\kuali\rice\core\config-coded-defaults.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\PessimisticLock.xml
          U impl\src\main\resources\org\kuali\rice\kns\config\KNSSpringBeans.xml
          U api\src\main\java\org\kuali\rice\kim\bo\entity\KimEntityVisa.java
          U api\src\main\java\org\kuali\rice\kim\bo\entity\dto\KimEntityExternalIdentifierInfo.java
          U api\src\main\java\org\kuali\rice\kim\bo\entity\dto\KimEntityAffiliationInfo.java
          U api\src\main\java\org\kuali\rice\kim\bo\entity\dto\KimEntityAddressInfo.java
          U api\src\main\java\org\kuali\rice\kim\bo\entity\dto\KimEntityResidencyInfo.java
          U api\src\main\java\org\kuali\rice\kim\bo\entity\dto\KimEntityEmailInfo.java
          U api\src\main\java\org\kuali\rice\kim\bo\entity\dto\KimEntityCitizenshipInfo.java
          U api\src\main\java\org\kuali\rice\kim\bo\entity\dto\KimEntityEmploymentInformationInfo.java
          U api\src\main\java\org\kuali\rice\kim\bo\entity\dto\KimEntityBioDemographicsInfo.java
          U api\src\main\java\org\kuali\rice\kim\bo\entity\dto\KimEntityEthnicityInfo.java
          U api\src\main\java\org\kuali\rice\kim\bo\entity\dto\KimEntityVisaInfo.java
          U api\src\main\java\org\kuali\rice\kim\bo\entity\dto\KimEntityPhoneInfo.java
          U api\src\main\java\org\kuali\rice\kim\bo\entity\dto\KimEntityEntityTypeInfo.java
          U api\src\main\java\org\kuali\rice\kim\bo\entity\dto\KimEntityInfo.java
          U api\src\main\java\org\kuali\rice\kim\bo\entity\dto\KimEntityNameInfo.java
          U api\src\main\java\org\kuali\rice\kim\bo\entity\dto\KimEntityNamePrincipalNameInfo.java
          U api\src\main\java\org\kuali\rice\kim\bo\entity\dto\KimEntityEntityTypeDefaultInfo.java
          U api\src\main\java\org\kuali\rice\kim\bo\entity\dto\KimEntityDefaultInfo.java
          U api\src\main\java\org\kuali\rice\kim\bo\entity\dto\KimPrincipalInfo.java
          D api\src\main\java\org\kuali\rice\kim\bo\entity\dto\DtoUtils.java
          U api\src\main\java\org\kuali\rice\kim\bo\entity\KimEntityPhone.java
          U api\src\main\java\org\kuali\rice\kim\bo\entity\KimEntityEntityType.java
          U api\src\main\java\org\kuali\rice\kim\bo\entity\KimEntity.java
          U api\src\main\java\org\kuali\rice\kim\bo\entity\KimEntityName.java
          U api\src\main\java\org\kuali\rice\kim\bo\entity\KimEntityNamePrincipalName.java
          U api\src\main\java\org\kuali\rice\kim\bo\entity\KimPrincipal.java
          U api\src\main\java\org\kuali\rice\kim\bo\entity\KimEntityResidency.java
          U api\src\main\java\org\kuali\rice\kim\bo\entity\KimEntityExternalIdentifier.java
          U api\src\main\java\org\kuali\rice\kim\bo\entity\KimEntityAffiliation.java
          U api\src\main\java\org\kuali\rice\kim\bo\entity\KimEntityAddress.java
          U api\src\main\java\org\kuali\rice\kim\bo\entity\KimEntityEmail.java
          U api\src\main\java\org\kuali\rice\kim\bo\entity\KimEntityCitizenship.java
          U api\src\main\java\org\kuali\rice\kim\bo\entity\KimEntityPrivacyPreferences.java
          U api\src\main\java\org\kuali\rice\kim\bo\entity\KimEntityEmploymentInformation.java
          U api\src\main\java\org\kuali\rice\kim\bo\entity\KimEntityBioDemographics.java
          U api\src\main\java\org\kuali\rice\kim\bo\entity\KimEntityEthnicity.java
          U api\src\main\java\org\kuali\rice\kim\service\PermissionService.java
          U api\src\main\java\org\kuali\rice\kim\service\PermissionUpdateService.java
          U api\src\main\java\org\kuali\rice\kim\service\IdentityManagementNotificationService.java
          U api\src\main\java\org\kuali\rice\kim\service\RoleManagementService.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\util\KEWConstants.java
          U api\src\main\java\org\kuali\rice\core\resourceloader\BaseResourceLoader.java
          U README.txt
          U web\src\main\webapp\kew\WEB-INF\jsp\ActionList\ActionList.jsp
          U web\src\main\webapp\WEB-INF\tags\kim\roleDelegations.tag
          U web\src\main\webapp\WEB-INF\tags\kim\personRoleQualifier.tag
          U web\src\main\webapp\WEB-INF\tags\kim\roleAssignees.tag
          U web\src\main\webapp\WEB-INF\tags\kr\auditErrors.tag
          Conflict discovered in 'web/src/main/webapp/kr/WEB-INF/struts-config.xml'.
          Select: (p) postpone, (df) diff-full, (e) edit,
          (mc) mine-conflict, (tc) theirs-conflict,
          (s) show all options: p
          C web\src\main\webapp\kr\WEB-INF\struts-config.xml
          U web\RiceHelp.zip
          Summary of conflicts:
          Text conflicts: 4

          Show
          jjhanso Jeremy Hanson added a comment - - edited output from the merge command: C:\java\projects\rice-1.1.0-merge>svn merge -r 10839:HEAD https://svn.kuali.org/rice/branches/rice-release-1-0-kc-br/ — Merging r10840 through r11809 into '.': U ksb\src\test\java\org\kuali\rice\ksb\messaging\ServiceUpdateAndRemovalTest.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\UiDocumentServiceImplTest.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\RoleServiceRemoteTest.java D kim\src\test\java\org\kuali\rice\kim\test\service\RoleServiceImplTest.java A kim\src\test\java\org\kuali\rice\kim\service A kim\src\test\java\org\kuali\rice\kim\service\impl A kim\src\test\java\org\kuali\rice\kim\service\impl\RoleServiceImplTest.java U kim\src\test\resources\org\kuali\rice\kim\test\DefaultSuiteTestData.sql U kim\src\test\resources\org\kuali\rice\kim\test\DefaultSuiteTestData.xml U kew\src\test\java\org\kuali\rice\kew\mail\EmailContentServiceTest.java U kew\src\test\java\org\kuali\rice\kew\docsearch\xml\StandardGenericXMLSearchableAttributeRangesTest.java U kew\src\test\java\org\kuali\rice\kew\docsearch\xml\StandardGenericXMLSearchableAttributeTest.java U kew\src\test\java\org\kuali\rice\kew\actions\ReturnToPreviousTestSplit.java U kew\src\test\java\org\kuali\rice\kew\xml\export\DocumentTypeXmlExporterTest.java U kew\src\test\java\org\kuali\rice\kew\rule\RuleTestUtils.java A scripts\dataset\dist-build.properties A scripts\dataset\dist-impex-build.properties U scripts\dataset\demo-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 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-02-2009.sql U scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\12-04-2009.sql U scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\12-22-2009.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 A 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 A scripts\upgrades\1.0.1 to 1.0.1.1\final\update_final_mysql.sql A scripts\upgrades\1.0.1 to 1.0.1.1\final\update_final_oracle.sql U 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\service\NamespaceWildcardAllowedAndOrStringExactMatchPermissionTypeServiceImplTest.java A kns\src\test\java\org\kuali\rice\kns\lookup\LookupResultsDDBo.java A kns\src\test\java\org\kuali\rice\kns\lookup\LookupResultsDDBoLookupableHelperServiceImpl.java A kns\src\test\java\org\kuali\rice\kns\lookup\LookupResultsServiceTest.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\resources\KnsTestSpringBeans.xml A kns\src\test\resources\org\kuali\rice\kns\test\document\LookupResultsDDBo.xml Conflict discovered in 'build.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C build.xml U NOTICE.txt U .classpath A impl\src\test\java\org\kuali\rice\core\config\PropertyHolder.java A impl\src\test\java\org\kuali\rice\core\config\JAXBConfigImplTest.java A impl\src\test\resources\org\kuali\rice\core\config\jaxb-test-circular.xml A impl\src\test\resources\org\kuali\rice\core\config\jaxb-test-context.xml A impl\src\test\resources\org\kuali\rice\core\config\jaxb-test-config.xml A impl\src\test\resources\org\kuali\rice\core\config\jaxb-test-import-config.xml A impl\src\test\resources\org\kuali\rice\core\config\jaxb-test-override.xml U impl\src\main\java\org\apache\ojb\broker\platforms\KualiMySQLSequenceManagerImpl.java U impl\src\main\java\org\kuali\rice\kcb\service\GlobalKCBServiceLocator.java U impl\src\main\java\org\kuali\rice\ksb\messaging\FlattenedServiceDefinition.java U impl\src\main\java\org\kuali\rice\ksb\messaging\BusClientFailureProxy.java U impl\src\main\java\org\kuali\rice\ksb\messaging\quartz\KSBSchedulerFactoryBean.java U impl\src\main\java\org\kuali\rice\ksb\messaging\RemoteResourceServiceLocatorImpl.java U impl\src\main\java\org\kuali\rice\kim\bo\entity\impl\KimEntityExternalIdentifierImpl.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 A impl\src\main\java\org\kuali\rice\kim\service\impl\GroupUpdateServiceImpl.java A impl\src\main\java\org\kuali\rice\kim\service\impl\PermissionServiceBase.java U impl\src\main\java\org\kuali\rice\kim\service\impl\RoleServiceImpl.java A impl\src\main\java\org\kuali\rice\kim\service\impl\RoleUpdateServiceImpl.java A impl\src\main\java\org\kuali\rice\kim\service\impl\GroupServiceBase.java A impl\src\main\java\org\kuali\rice\kim\service\impl\RoleServiceBase.java U impl\src\main\java\org\kuali\rice\kim\service\impl\ResponsibilityServiceImpl.java A impl\src\main\java\org\kuali\rice\kim\service\impl\ResponsibilityUpdateServiceImpl.java U impl\src\main\java\org\kuali\rice\kim\service\impl\PermissionServiceImpl.java A impl\src\main\java\org\kuali\rice\kim\service\impl\ResponsibilityServiceBase.java A impl\src\main\java\org\kuali\rice\kim\service\impl\PermissionUpdateServiceImpl.java U impl\src\main\java\org\kuali\rice\kim\dao\impl\KimRoleDaoOjb.java U impl\src\main\java\org\kuali\rice\kim\config\KIMThinClientConfigurer.java U impl\src\main\java\org\kuali\rice\kim\lookup\KimTypeLookupableHelperServiceImpl.java U impl\src\main\java\org\kuali\rice\kim\rules\ui\PersonDocumentGroupRule.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 U impl\src\main\java\org\kuali\rice\kim\document\IdentityManagementPersonDocument.java Conflict discovered in 'impl/src/main/java/org/kuali/rice/kew/doctype/bo/DocumentType.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\doctype\bo\DocumentType.java U impl\src\main\java\org\kuali\rice\kew\actionlist\web\ActionListAction.java U impl\src\main\java\org\kuali\rice\kew\document\RoutingRuleDelegationMaintainableBusRule.java U impl\src\main\java\org\kuali\rice\kew\document\RoutingRuleMaintainableBusRule.java U impl\src\main\java\org\kuali\rice\kew\docsearch\SearchableAttributeDateTimeValue.java U impl\src\main\java\org\kuali\rice\kew\edl\components\NoteConfigComponent.java U impl\src\main\java\org\kuali\rice\kew\routeheader\service\impl\WorkflowDocumentServiceImpl.java U impl\src\main\java\org\kuali\rice\kew\rule\web\DocumentConfigurationViewAction.java U impl\src\main\java\org\kuali\rice\kew\rule\FlexRM.java U impl\src\main\java\org\kuali\rice\kew\rule\RuleRoutingAttribute.java U impl\src\main\java\org\kuali\rice\core\service\impl\DemonstrationGradeEncryptionServiceImpl.java U impl\src\main\java\org\kuali\rice\core\config\event\RiceConfigEventListener.java U impl\src\main\java\org\kuali\rice\core\config\RiceConfigurerBase.java A impl\src\main\java\org\kuali\rice\core\config\xsd A impl\src\main\java\org\kuali\rice\core\config\xsd\Param.java A impl\src\main\java\org\kuali\rice\core\config\xsd\Config.java A impl\src\main\java\org\kuali\rice\core\config\spring\RiceConfigPropertyPlaceholderConfigurer.java A impl\src\main\java\org\kuali\rice\core\config\spring\RiceConfigBeanDefinitionVisitor.java A impl\src\main\java\org\kuali\rice\core\config\spring\ConfigPropertyFactoryBean.java A impl\src\main\java\org\kuali\rice\core\config\AbstractBaseConfig.java A impl\src\main\java\org\kuali\rice\core\config\JAXBConfigImpl.java A impl\src\main\java\org\kuali\rice\core\exception\RiceRemoteServiceConnectionException.java U impl\src\main\java\org\kuali\rice\kns\maintenance\rules\MaintenanceDocumentRuleBase.java U impl\src\main\java\org\kuali\rice\kns\inquiry\KualiInquirableImpl.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\BusinessObjectAuthorizationServiceImpl.java U impl\src\main\java\org\kuali\rice\kns\service\impl\MaintenanceDocumentDictionaryServiceImpl.java U impl\src\main\java\org\kuali\rice\kns\service\impl\DictionaryValidationServiceImpl.java U impl\src\main\java\org\kuali\rice\kns\lookup\LookupResultsService.java U impl\src\main\java\org\kuali\rice\kns\lookup\AbstractLookupableHelperServiceImpl.java A impl\src\main\java\org\kuali\rice\kns\lookup\DataDictionaryLookupResultsSupportStrategy.java A impl\src\main\java\org\kuali\rice\kns\lookup\LookupResultsSupportStrategyService.java U impl\src\main\java\org\kuali\rice\kns\lookup\LookupResultsServiceImpl.java A impl\src\main\java\org\kuali\rice\kns\lookup\PersistableBusinessObjectLookupResultsSupportStrategyImpl.java U impl\src\main\java\org\kuali\rice\kns\util\MessageMap.java U impl\src\main\java\org\kuali\rice\kns\util\RiceKeyConstants.java U impl\src\main\java\org\kuali\rice\kns\web\struts\action\KualiPropertyMessageResourcesFactory.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\KualiRequestProcessor.java U impl\src\main\java\org\kuali\rice\kns\document\MaintenanceDocumentBase.java U impl\src\main\resources\META-INF\test-config-defaults.xml U impl\src\main\resources\META-INF\common-config-defaults.xml A impl\src\main\resources\schema\config.xsd U impl\src\main\resources\KIM-ApplicationResources.properties U impl\src\main\resources\org\kuali\rice\ksb\config\KSBSpringBeans.xml U impl\src\main\resources\org\kuali\rice\ksb\config\KSBThinClientSpringBeans.xml U impl\src\main\resources\org\kuali\rice\kim\bo\datadictionary\PersonDocumentAffiliation.xml U impl\src\main\resources\org\kuali\rice\kim\config\KIMImplementationSpringBeans.xml U impl\src\main\resources\org\kuali\rice\kim\config\KIMThinClientSpringBeans.xml U impl\src\main\resources\org\kuali\rice\kew\config\KEWSpringBeans.xml U impl\src\main\resources\org\kuali\rice\kew\ApplicationResources.properties A impl\src\main\resources\org\kuali\rice\core\config-coded-defaults.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\PessimisticLock.xml U impl\src\main\resources\org\kuali\rice\kns\config\KNSSpringBeans.xml U api\src\main\java\org\kuali\rice\kim\bo\entity\KimEntityVisa.java U api\src\main\java\org\kuali\rice\kim\bo\entity\dto\KimEntityExternalIdentifierInfo.java U api\src\main\java\org\kuali\rice\kim\bo\entity\dto\KimEntityAffiliationInfo.java U api\src\main\java\org\kuali\rice\kim\bo\entity\dto\KimEntityAddressInfo.java U api\src\main\java\org\kuali\rice\kim\bo\entity\dto\KimEntityResidencyInfo.java U api\src\main\java\org\kuali\rice\kim\bo\entity\dto\KimEntityEmailInfo.java U api\src\main\java\org\kuali\rice\kim\bo\entity\dto\KimEntityCitizenshipInfo.java U api\src\main\java\org\kuali\rice\kim\bo\entity\dto\KimEntityEmploymentInformationInfo.java U api\src\main\java\org\kuali\rice\kim\bo\entity\dto\KimEntityBioDemographicsInfo.java U api\src\main\java\org\kuali\rice\kim\bo\entity\dto\KimEntityEthnicityInfo.java U api\src\main\java\org\kuali\rice\kim\bo\entity\dto\KimEntityVisaInfo.java U api\src\main\java\org\kuali\rice\kim\bo\entity\dto\KimEntityPhoneInfo.java U api\src\main\java\org\kuali\rice\kim\bo\entity\dto\KimEntityEntityTypeInfo.java U api\src\main\java\org\kuali\rice\kim\bo\entity\dto\KimEntityInfo.java U api\src\main\java\org\kuali\rice\kim\bo\entity\dto\KimEntityNameInfo.java U api\src\main\java\org\kuali\rice\kim\bo\entity\dto\KimEntityNamePrincipalNameInfo.java U api\src\main\java\org\kuali\rice\kim\bo\entity\dto\KimEntityEntityTypeDefaultInfo.java U api\src\main\java\org\kuali\rice\kim\bo\entity\dto\KimEntityDefaultInfo.java U api\src\main\java\org\kuali\rice\kim\bo\entity\dto\KimPrincipalInfo.java D api\src\main\java\org\kuali\rice\kim\bo\entity\dto\DtoUtils.java U api\src\main\java\org\kuali\rice\kim\bo\entity\KimEntityPhone.java U api\src\main\java\org\kuali\rice\kim\bo\entity\KimEntityEntityType.java U api\src\main\java\org\kuali\rice\kim\bo\entity\KimEntity.java U api\src\main\java\org\kuali\rice\kim\bo\entity\KimEntityName.java U api\src\main\java\org\kuali\rice\kim\bo\entity\KimEntityNamePrincipalName.java U api\src\main\java\org\kuali\rice\kim\bo\entity\KimPrincipal.java U api\src\main\java\org\kuali\rice\kim\bo\entity\KimEntityResidency.java U api\src\main\java\org\kuali\rice\kim\bo\entity\KimEntityExternalIdentifier.java U api\src\main\java\org\kuali\rice\kim\bo\entity\KimEntityAffiliation.java U api\src\main\java\org\kuali\rice\kim\bo\entity\KimEntityAddress.java U api\src\main\java\org\kuali\rice\kim\bo\entity\KimEntityEmail.java U api\src\main\java\org\kuali\rice\kim\bo\entity\KimEntityCitizenship.java U api\src\main\java\org\kuali\rice\kim\bo\entity\KimEntityPrivacyPreferences.java U api\src\main\java\org\kuali\rice\kim\bo\entity\KimEntityEmploymentInformation.java U api\src\main\java\org\kuali\rice\kim\bo\entity\KimEntityBioDemographics.java U api\src\main\java\org\kuali\rice\kim\bo\entity\KimEntityEthnicity.java U api\src\main\java\org\kuali\rice\kim\service\PermissionService.java U api\src\main\java\org\kuali\rice\kim\service\PermissionUpdateService.java U api\src\main\java\org\kuali\rice\kim\service\IdentityManagementNotificationService.java U api\src\main\java\org\kuali\rice\kim\service\RoleManagementService.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\util\KEWConstants.java U api\src\main\java\org\kuali\rice\core\resourceloader\BaseResourceLoader.java U README.txt U web\src\main\webapp\kew\WEB-INF\jsp\ActionList\ActionList.jsp U web\src\main\webapp\WEB-INF\tags\kim\roleDelegations.tag U web\src\main\webapp\WEB-INF\tags\kim\personRoleQualifier.tag U web\src\main\webapp\WEB-INF\tags\kim\roleAssignees.tag U web\src\main\webapp\WEB-INF\tags\kr\auditErrors.tag Conflict discovered in 'web/src/main/webapp/kr/WEB-INF/struts-config.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C web\src\main\webapp\kr\WEB-INF\struts-config.xml U web\RiceHelp.zip Summary of conflicts: Text conflicts: 4
          Hide
          jjhanso Jeremy Hanson added a comment -

          This is the only sql to run on the master db:

          ALTER TABLE ACCT_DD_ATTR_DOC MODIFY ACCT_UPDATE_DT_TM DATE
          /

          Show
          jjhanso Jeremy Hanson added a comment - This is the only sql to run on the master db: ALTER TABLE ACCT_DD_ATTR_DOC MODIFY ACCT_UPDATE_DT_TM DATE /
          Hide
          jjhanso Jeremy Hanson added a comment -

          Merge changes have been committed.

          Show
          jjhanso Jeremy Hanson added a comment - Merge changes have been committed.
          Hide
          jjhanso Jeremy Hanson added a comment -

          SQL has been applied to Rice110DBA.

          Show
          jjhanso Jeremy Hanson added a comment - SQL has been applied to Rice110DBA.
          Hide
          jjhanso Jeremy Hanson added a comment -

          Resolving this issue. Please reopen if any problems are found.

          Show
          jjhanso Jeremy Hanson added a comment - Resolving this issue. 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: