Details

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

      Description

      See these notes on the subversion merge process:

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

      Remember to make changes to the 1.1.0 master database.

        Attachments

          Activity

          Hide
          jjhanso Jeremy Hanson added a comment -

          Merge command is:

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

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

          Need to run 2010-03-19.sql and 2010-04-15.sql against master db.

          Show
          jjhanso Jeremy Hanson added a comment - Need to run 2010-03-19.sql and 2010-04-15.sql against master db.
          Hide
          jjhanso Jeremy Hanson added a comment -

          merge output:

          C:\java\projects\rice-1.1.0>svn merge -r r11809:HEAD https://test.kuali.org/svn/rice/branches/rice-release-1-0-2-br/
          — Merging r11810 through r13079 into '.':
          U ksb\src\test\java\org\kuali\rice\ksb\server\KSBTestContextLoaderListener.java
          U ksb\src\test\java\org\kuali\rice\ksb\messaging\KSBTestUtils.java
          U ksb\src\test\java\org\kuali\rice\ksb\messaging\StoreAndForwardTest.java
          U ksb\src\test\java\org\kuali\rice\ksb\messaging\resourceloading\KSBResourceLoaderFactoryTest.java
          U ksb\src\test\java\org\kuali\rice\ksb\messaging\HttpInvokerConnectorConfigurationTest.java
          U ksb\src\test\java\org\kuali\rice\ksb\messaging\exceptionhandling\DefaultMessageExceptionHandlerTest.java
          U ksb\src\test\java\org\kuali\rice\ksb\messaging\ExceptionRetryCountTest.java
          U ksb\src\test\java\org\kuali\rice\ksb\messaging\Value1AndValue2PersistedOnMessageCall.java
          U ksb\src\test\java\org\kuali\rice\ksb\messaging\MessageFetcherTest.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
          U kim\src\test\java\org\kuali\rice\kim\service\impl\RoleServiceImplTest.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\plugin\ZipFilePluginLoaderTest.java
          U kew\src\test\java\org\kuali\rice\kew\docmentlink\DocumentLinkTest.java
          U kew\src\test\java\org\kuali\rice\kew\doctype\DocumentTypeTest.java
          U kew\src\test\java\org\kuali\rice\kew\actionlist\OutboxTest.java
          U kew\src\test\java\org\kuali\rice\kew\clientapp\ThinClientTest.java
          U kew\src\test\java\org\kuali\rice\kew\mail\EmailReminderLifecycleTest.java
          U kew\src\test\java\org\kuali\rice\kew\actions\FutureRequestsTest.java
          A kew\src\test\java\org\kuali\rice\kew\actions\SimpleBooleanSplitNode.java
          U kew\src\test\java\org\kuali\rice\kew\xml\DeprecatedDocumentTagsTest.java
          U kew\src\test\java\org\kuali\rice\kew\edl\EDLControllerTest.java
          U kew\src\test\java\org\kuali\rice\kew\edl\service\impl\StyleServiceImplTest.java
          U kew\src\test\java\org\kuali\rice\kew\edl\EDocLiteServiceImplTest.java
          U kew\src\test\java\org\kuali\rice\kew\rule\RuleXmlParserTest.java
          U kew\src\test\java\org\kuali\rice\kew\routeheader\RouteHeaderServiceTest.java
          U kew\src\test\java\org\kuali\rice\kew\routeheader\AppDocStatusTest.java
          U kew\src\test\resources\META-INF\kew-test-config.xml
          A kew\src\test\resources\org\kuali\rice\kew\actions\FutureRequestsConfig2.xml
          A kew\src\test\resources\org\kuali\rice\kew\actions\FutureRequestsConfig3.xml
          U kew\src\test\resources\org\kuali\rice\kew\xml\TestKEWAppDocStatus.xml
          U kew\src\test\resources\org\kuali\rice\kew\xml\DocumentStatusPolicyMissingStringValue.xml
          U kew\src\test\resources\org\kuali\rice\kew\xml\DocumentStatusPolicyInvalidStringValue.xml
          U kew\src\test\resources\org\kuali\rice\kew\routeheader\AppDocStatusTestConfig.xml
          U kew\pom.xml
          U scripts\dataset\demo-server-dataset-cleanup.sql
          A scripts\upgrades\1.0.1.1 to 1.0.2
          A scripts\upgrades\1.0.1.1 to 1.0.2\db-updates-client
          A scripts\upgrades\1.0.1.1 to 1.0.2\db-updates
          A scripts\upgrades\1.0.1.1 to 1.0.2\db-updates\2010-04-15.sql
          A scripts\upgrades\1.0.1.1 to 1.0.2\db-updates\2009-10-02.sql
          A scripts\upgrades\1.0.1.1 to 1.0.2\db-updates\2010-03-19.sql
          A 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
          A scripts\upgrades\1.0.1.1 to 1.0.2\final\udpate_final_mysql.sql
          A scripts\upgrades\1.0.1.1 to 1.0.2\final\update_final_oracle.sql
          D scripts\upgrades\1.0.0 to 1.0.kc
          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\datadictionary\validation\charlevel\AlphaNumericValidationPatternTest.java
          U kns\src\test\java\org\kuali\rice\kns\datadictionary\validation\charlevel\CharsetValidationPatternTest.java
          U kns\src\test\java\org\kuali\rice\kns\datadictionary\validation\charlevel\RegexValidationPatternTest.java
          U kns\src\test\java\org\kuali\rice\kns\datadictionary\validation\charlevel\NumericValidationPatternTest.java
          U kns\src\test\java\org\kuali\rice\kns\datadictionary\validation\charlevel\AnyCharacterValidationPatternTest.java
          U kns\src\test\java\org\kuali\rice\kns\datadictionary\validation\charlevel\AlphaValidationPatternTest.java
          U kns\src\test\java\org\kuali\rice\kns\datadictionary\validation\ValidationTestUtils.java
          U kns\src\test\java\org\kuali\rice\kns\test\document\AccountRequestDocumentWithCyclicalReference.java
          U kns\src\test\java\org\kuali\rice\kns\lookup\LookupResultsDDBo.java
          U kns\src\test\java\org\kuali\rice\kns\lookup\LookupResultsDDBoLookupableHelperServiceImpl.java
          U kns\src\test\java\org\kuali\rice\kns\lookup\LookupResultsServiceTest.java
          U kns\src\test\java\org\kuali\rice\kns\util\WebUtilsTest.java
          U kns\src\test\resources\KR-Test-ApplicationResources.properties
          U kns\src\test\resources\KnsTestSpringBeans.xml
          U kns\src\test\resources\org\kuali\rice\kns\test\document\AccountRequestDocument3.xml
          U kns\pom.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 kcb\src\test\resources\META-INF\kcb-test-config.xml
          U kcb\pom.xml
          U impl\src\test\java\org\kuali\rice\test\RiceTestCaseTest.java
          U impl\src\test\java\org\kuali\rice\core\config\BaseConfigTest.java
          U impl\src\test\java\org\kuali\rice\core\config\HierarchicalConfigParserTest.java
          U impl\src\test\java\org\kuali\rice\core\config\PropertyHolder.java
          Conflict discovered in 'impl/src/test/java/org/kuali/rice/core/config/JAXBConfigImplTest.java'.
          Select: (p) postpone, (df) diff-full, (e) edit,
          (mc) mine-conflict, (tc) theirs-conflict,
          (s) show all options: p
          C impl\src\test\java\org\kuali\rice\core\config\JAXBConfigImplTest.java
          A impl\src\test\resources\org\kuali\rice\core\config\jaxb-test-circular2.xml
          U impl\src\main\java\org\kuali\rice\kcb\config\KCBConfigurer.java
          U impl\src\main\java\org\kuali\rice\ksb\messaging\RoutingTableDiffCalculator.java
          U impl\src\main\java\org\kuali\rice\ksb\messaging\RemotedServiceRegistryImpl.java
          U impl\src\main\java\org\kuali\rice\ksb\messaging\web\ThreadPoolAction.java
          A impl\src\main\java\org\kuali\rice\ksb\messaging\web\ConfigViewerAction.java
          A impl\src\main\java\org\kuali\rice\ksb\messaging\web\ConfigViewerForm.java
          U impl\src\main\java\org\kuali\rice\ksb\messaging\service\impl\BusAdminServiceImpl.java
          U impl\src\main\java\org\kuali\rice\ksb\messaging\RunModeServiceExporter.java
          U impl\src\main\java\org\kuali\rice\ksb\messaging\config\KSBConfigurer.java
          U impl\src\main\java\org\kuali\rice\ksb\messaging\resourceloader\KSBResourceLoaderFactory.java
          U impl\src\main\java\org\kuali\rice\test\lifecycles\JettyServerLifecycle.java
          U impl\src\main\java\org\kuali\rice\test\RiceTestCase.java
          U impl\src\main\java\org\kuali\rice\test\ClearDatabaseLifecycle.java
          U impl\src\main\java\org\kuali\rice\kim\bo\ui\KimDocumentRoleMember.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\PermissionServiceBase.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\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\ResponsibilityUpdateServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kim\service\impl\ResponsibilityServiceBase.java
          U impl\src\main\java\org\kuali\rice\kim\service\impl\PermissionUpdateServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kim\service\KIMServiceLocator.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\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
          U impl\src\main\java\org\kuali\rice\kim\util\KualiDateMask.java
          U impl\src\main\java\org\kuali\rice\kim\web\struts\form\IdentityManagementDocumentFormBase.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\kew\dto\DTOConverter.java
          U impl\src\main\java\org\kuali\rice\kew\useroptions\UserOptionsServiceCache.java
          U impl\src\main\java\org\kuali\rice\kew\useroptions\UserOptionsServiceImpl.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\plugin\PluginConfig.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\messaging\RouteDocumentMessageService.java
          U impl\src\main\java\org\kuali\rice\kew\web\ApplicationInitializeListener.java
          U impl\src\main\java\org\kuali\rice\kew\docsearch\DocumentLookupCriteriaBuilder.java
          U impl\src\main\java\org\kuali\rice\kew\service\impl\WorkflowDocumentActionsWebServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kew\service\KEWServiceLocator.java
          U impl\src\main\java\org\kuali\rice\kew\edl\service\impl\StyleServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kew\engine\StandardWorkflowEngine.java
          U impl\src\main\java\org\kuali\rice\kew\engine\node\service\impl\RouteNodeServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kew\engine\node\service\RouteNodeService.java
          U impl\src\main\java\org\kuali\rice\kew\engine\node\RouteNodeUtils.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\DocumentStatusTransition.java
          U impl\src\main\java\org\kuali\rice\kew\util\XmlHelper.java
          U impl\src\main\java\org\kuali\rice\core\config\BaseConfig.java
          U impl\src\main\java\org\kuali\rice\core\config\RiceConfigurerBase.java
          U impl\src\main\java\org\kuali\rice\core\config\ConfigLogger.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\xsd\Param.java
          U impl\src\main\java\org\kuali\rice\core\config\xsd\Config.java
          U impl\src\main\java\org\kuali\rice\core\config\SimpleConfig.java
          U impl\src\main\java\org\kuali\rice\core\config\spring\ConfigFactoryBean.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
          A impl\src\main\java\org\kuali\rice\core\config\spring\SimpleConfigFactoryBean.java
          U impl\src\main\java\org\kuali\rice\core\config\AbstractBaseConfig.java
          U impl\src\main\java\org\kuali\rice\core\config\JAXBConfigImpl.java
          U impl\src\main\java\org\kuali\rice\core\ojb\BaseOjbConfigurer.java
          U impl\src\main\java\org\kuali\rice\core\util\KeyLabelPair.java
          A impl\src\main\java\org\kuali\rice\core\util\CollectionUtils.java
          A impl\src\main\java\org\kuali\rice\core\util\ImmutableProperties.java
          U impl\src\main\java\org\kuali\rice\core\web\listener\StandaloneInitializeListener.java
          U impl\src\main\java\org\kuali\rice\core\resourceloader\SpringBeanFactoryResourceLoader.java
          U impl\src\main\java\org\kuali\rice\core\resourceloader\RiceResourceLoaderFactory.java
          U impl\src\main\java\org\kuali\rice\kns\datadictionary\control\MultiselectControlDefinition.java
          U impl\src\main\java\org\kuali\rice\kns\datadictionary\control\ControlDefinitionBase.java
          U impl\src\main\java\org\kuali\rice\kns\datadictionary\control\ControlDefinition.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\ValidationPattern.java
          U impl\src\main\java\org\kuali\rice\kns\datadictionary\AttributeDefinition.java
          U impl\src\main\java\org\kuali\rice\kns\datadictionary\exporter\AttributesMapBuilder.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\PersistenceServiceStructureImplBase.java
          U impl\src\main\java\org\kuali\rice\kns\service\impl\DictionaryValidationServiceImpl.java
          Conflict discovered in 'impl/src/main/java/org/kuali/rice/kns/dao/proxy/LookupDaoProxy.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\LookupDaoProxy.java
          U impl\src\main\java\org\kuali\rice\kns\config\KNSConfigurer.java
          U impl\src\main\java\org\kuali\rice\kns\lookup\DataDictionaryLookupResultsSupportStrategy.java
          U impl\src\main\java\org\kuali\rice\kns\lookup\LookupResultsSupportStrategyService.java
          U impl\src\main\java\org\kuali\rice\kns\lookup\PersistableBusinessObjectLookupResultsSupportStrategyImpl.java
          U impl\src\main\java\org\kuali\rice\kns\workflow\service\impl\WorkflowDocumentServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kns\util\FieldUtils.java
          A impl\src\main\java\org\kuali\rice\kns\util\PagingBannerUtils.java
          U impl\src\main\java\org\kuali\rice\kns\util\WebUtils.java
          U impl\src\main\java\org\kuali\rice\kns\web\RiceConfigurationListener.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\KualiTransactionalDocumentFormBase.java
          U impl\src\main\java\org\kuali\rice\kns\web\struts\form\MultipleValueLookupForm.java
          U impl\src\main\java\org\kuali\rice\kns\web\struts\form\QuestionPromptForm.java
          U impl\src\main\java\org\kuali\rice\kns\web\struts\action\KualiAction.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\KualiInquiryAction.java
          A 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\ArrayFormatter.java
          U impl\src\main\java\org\kuali\rice\kns\web\format\Formatter.java
          U impl\src\main\java\org\kuali\rice\kns\web\ui\Field.java
          U impl\src\main\java\org\kuali\rice\ken\config\KENConfigurer.java
          U impl\src\main\resources\META-INF\test-config-defaults.xml
          U impl\src\main\resources\META-INF\common-config-defaults.xml
          U impl\src\main\resources\KR-ApplicationResources.properties
          A impl\src\main\resources\org\kuali\rice\kew\edl
          A 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\kns\bo\datadictionary\Parameter.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\pom.xml
          U api\src\main\java\org\kuali\rice\kim\util\KimConstants.java
          U api\src\main\java\org\kuali\rice\kew\service\WorkflowInfo.java
          U api\src\main\java\org\kuali\rice\kew\service\WorkflowDocument.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\jaxb\AttributeSetAdapter.java
          U api\src\main\java\org\kuali\rice\core\jaxb\StringEntityNameInfoMapEntry.java
          U api\src\main\java\org\kuali\rice\core\jaxb\StringToKimEntityNameInfoMapAdapter.java
          U api\src\main\java\org\kuali\rice\core\jaxb\SqlTimestampAdapter.java
          U api\src\main\java\org\kuali\rice\core\jaxb\StringToKimEntityNamePrincipalInfoMapAdapter.java
          U api\src\main\java\org\kuali\rice\core\jaxb\StringMapEntry.java
          U api\src\main\java\org\kuali\rice\core\jaxb\StringEntNmPrncpInfoMapEntry.java
          U api\src\main\java\org\kuali\rice\core\jaxb\MapStringStringAdapter.java
          U api\src\main\java\org\kuali\rice\core\jaxb\SqlDateAdapter.java
          U api\src\main\java\org\kuali\rice\core\config\Config.java
          U api\src\main\java\org\kuali\rice\kns\util\KNSConstants.java
          U api\pom.xml
          U ken\src\test\resources\META-INF\ken-test-config.xml
          U ken\pom.xml
          U web\src\test\java\org\kuali\rice\ken\KENWebServiceTest.java
          U web\src\test\java\org\kuali\rice\web\service\impl\DemonstrationGradeEncryptionServiceImplTest.java
          U web\src\main\resources\org\kuali\rice\standalone\config\standalone-config.xml
          U web\src\main\webapp\ksb\WEB-INF\struts-config.xml
          A web\src\main\webapp\ksb\WEB-INF\jsp\config
          A web\src\main\webapp\ksb\WEB-INF\jsp\config\ConfigViewer.jsp
          U web\src\main\webapp\kim\WEB-INF\struts-config.xml
          U web\src\main\webapp\WEB-INF\struts-config.xml
          U web\src\main\webapp\WEB-INF\tags\kim\responsibilityAction.tag
          U web\src\main\webapp\WEB-INF\tags\kim\roleDelegations.tag
          U web\src\main\webapp\WEB-INF\tags\kim\personEmpInfo.tag
          U web\src\main\webapp\WEB-INF\tags\kim\personRoleQualifier.tag
          U web\src\main\webapp\WEB-INF\tags\kim\personDelegationMemberQualifier.tag
          U web\src\main\webapp\WEB-INF\tags\kim\attributeLookup.tag
          U web\src\main\webapp\WEB-INF\tags\kim\roleResponsibilityAction.tag
          U web\src\main\webapp\WEB-INF\tags\kim\responsibilityActions.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\kr\auditMode.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\hiddenTab.tag
          U web\src\main\webapp\WEB-INF\tags\kr\auditSet.tag
          U web\src\main\webapp\WEB-INF\tags\kr\workflowWorkgroupLookup.tag
          U web\src\main\webapp\WEB-INF\tags\kr\enterKey.tag
          R web\src\main\webapp\WEB-INF\tags\kr\htmlControlAttribute.tag
          U web\src\main\webapp\WEB-INF\tags\kr\displayMultipleValueLookupResults.tag
          U web\src\main\webapp\WEB-INF\tags\kr\directInquiry.tag
          U web\src\main\webapp\WEB-INF\tags\kr\rowDisplay.tag
          U web\src\main\webapp\WEB-INF\tags\kr\auditRow.tag
          U web\src\main\webapp\WEB-INF\tags\kr\dateInputNoAttributeEntry.tag
          R web\src\main\webapp\WEB-INF\tags\kr\documentControls.tag
          U web\src\main\webapp\WEB-INF\tags\kr\tableRenderPagingBanner.tag
          U web\src\main\webapp\WEB-INF\tags\kr\tab.tag
          U web\src\main\webapp\WEB-INF\tags\kr\fileSize.tag
          U web\src\main\webapp\WEB-INF\tags\kr\fieldRadioValues.tag
          U web\src\main\webapp\WEB-INF\tags\kr\expandedTextArea.tag
          U web\src\main\webapp\WEB-INF\tags\kr\notes.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\hiddenLabel.tag
          U web\src\main\webapp\WEB-INF\tags\kr\editablePropertiesGuid.tag
          U web\src\main\webapp\WEB-INF\tags\kr\inquiry.tag
          U web\src\main\webapp\WEB-INF\tags\kr\checkErrors.tag
          U web\src\main\webapp\WEB-INF\tags\kr\documentPage.tag
          U web\src\main\webapp\WEB-INF\tags\kr\errors.tag
          U web\src\main\webapp\WEB-INF\tags\kr\dd\foreachEntry.tag
          U web\src\main\webapp\WEB-INF\tags\kr\fieldMultiSelectValues.tag
          U web\src\main\webapp\WEB-INF\tags\kr\user.tag
          U web\src\main\webapp\WEB-INF\tags\kr\fieldShowIcons.tag
          U web\src\main\webapp\WEB-INF\tags\kr\readonlyfield.tag
          U web\src\main\webapp\WEB-INF\tags\kr\hiddenDocumentFields.tag
          U web\src\main\webapp\WEB-INF\tags\kr\tabTop.tag
          U web\src\main\webapp\WEB-INF\tags\kr\dateInput.tag
          U web\src\main\webapp\WEB-INF\tags\kr\fieldSelectValues.tag
          U web\src\main\webapp\WEB-INF\tags\kr\lookup.tag
          R web\src\main\webapp\WEB-INF\tags\kr\multipleValueLookup.tag
          U web\src\main\webapp\WEB-INF\tags\kr\fieldShowReadOnly.tag
          U web\src\main\webapp\WEB-INF\tags\kr\fieldDefaultLabel.tag
          U web\src\main\webapp\WEB-INF\tags\kr\errorCount.tag
          U web\src\main\webapp\WEB-INF\tags\kr\auditErrors.tag
          A web\src\main\webapp\WEB-INF\tags\kr\fieldShowExpandedTextareaIcon.tag
          U web\src\main\webapp\kr\WEB-INF\tlds\kuali-func.tld
          U web\src\main\webapp\kr\WEB-INF\jsp\KualiMultipleValueLookup.jsp
          R web\src\main\webapp\kr\WEB-INF\jsp\TextArea.jsp
          U web\src\main\webapp\kr\WEB-INF\jsp\KualiLookup.jsp
          U web\src\main\webapp\kr\WEB-INF\jsp\KualiExceptionIncident.jsp
          U web\src\main\webapp\kr\scripts\core.js
          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
          — Merging r13080 through r13386 into '.':
          G 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
          G kim\src\test\java\org\kuali\rice\kim\service\impl\RoleServiceImplTest.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
          Conflict discovered in '.project'.
          Select: (p) postpone, (df) diff-full, (e) edit,
          (mc) mine-conflict, (tc) theirs-conflict,
          (s) show all options: p
          C .project
          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
          A scripts\launch\rice [standalone] - JettyServer.launch
          A scripts\launch\rice [sample app] - JettyServer.launch
          C scripts\launch\rice - JettyServer.launch
          Conflict discovered in 'scripts/createproject.groovy'.
          Select: (p) postpone, (df) diff-full, (e) edit,
          (mc) mine-conflict, (tc) theirs-conflict,
          (s) show all options: p
          C scripts\createproject.groovy
          G pom.xml
          U kns\src\test\resources\META-INF\kns-test-config.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
          G build.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 LICENSE.txt
          G impl\src\main\java\org\kuali\rice\kim\service\impl\RoleServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kew\docsearch\service\impl\SearchableAttributeProcessor.java
          U impl\src\main\java\org\kuali\rice\kew\actions\SaveActionEvent.java
          G impl\src\main\java\org\kuali\rice\core\config\JAXBConfigImpl.java
          G impl\src\main\resources\META-INF\common-config-defaults.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/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
          Conflict discovered in 'config/templates/createproject.config.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.config.template.xml
          U config\templates\sample-app-config.template.xml
          U api\src\main\java\org\kuali\rice\kcb\dto\MessageDTO.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
          U 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\java\org\kuali\rice\web\test\ServerTestBase.java
          U web\src\test\resources\META-INF\web-test-config.xml
          U web\src\main\config\example-config\rice-config.xml
          U web\src\main\resources\META-INF\standalone-config-defaults.xml
          G web\src\main\resources\org\kuali\rice\standalone\config\standalone-config.xml
          G web\pom.xml
          Summary of conflicts:
          Text conflicts: 20
          Tree conflicts: 1

          Show
          jjhanso Jeremy Hanson added a comment - merge output: C:\java\projects\rice-1.1.0>svn merge -r r11809:HEAD https://test.kuali.org/svn/rice/branches/rice-release-1-0-2-br/ — Merging r11810 through r13079 into '.': U ksb\src\test\java\org\kuali\rice\ksb\server\KSBTestContextLoaderListener.java U ksb\src\test\java\org\kuali\rice\ksb\messaging\KSBTestUtils.java U ksb\src\test\java\org\kuali\rice\ksb\messaging\StoreAndForwardTest.java U ksb\src\test\java\org\kuali\rice\ksb\messaging\resourceloading\KSBResourceLoaderFactoryTest.java U ksb\src\test\java\org\kuali\rice\ksb\messaging\HttpInvokerConnectorConfigurationTest.java U ksb\src\test\java\org\kuali\rice\ksb\messaging\exceptionhandling\DefaultMessageExceptionHandlerTest.java U ksb\src\test\java\org\kuali\rice\ksb\messaging\ExceptionRetryCountTest.java U ksb\src\test\java\org\kuali\rice\ksb\messaging\Value1AndValue2PersistedOnMessageCall.java U ksb\src\test\java\org\kuali\rice\ksb\messaging\MessageFetcherTest.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 U kim\src\test\java\org\kuali\rice\kim\service\impl\RoleServiceImplTest.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\plugin\ZipFilePluginLoaderTest.java U kew\src\test\java\org\kuali\rice\kew\docmentlink\DocumentLinkTest.java U kew\src\test\java\org\kuali\rice\kew\doctype\DocumentTypeTest.java U kew\src\test\java\org\kuali\rice\kew\actionlist\OutboxTest.java U kew\src\test\java\org\kuali\rice\kew\clientapp\ThinClientTest.java U kew\src\test\java\org\kuali\rice\kew\mail\EmailReminderLifecycleTest.java U kew\src\test\java\org\kuali\rice\kew\actions\FutureRequestsTest.java A kew\src\test\java\org\kuali\rice\kew\actions\SimpleBooleanSplitNode.java U kew\src\test\java\org\kuali\rice\kew\xml\DeprecatedDocumentTagsTest.java U kew\src\test\java\org\kuali\rice\kew\edl\EDLControllerTest.java U kew\src\test\java\org\kuali\rice\kew\edl\service\impl\StyleServiceImplTest.java U kew\src\test\java\org\kuali\rice\kew\edl\EDocLiteServiceImplTest.java U kew\src\test\java\org\kuali\rice\kew\rule\RuleXmlParserTest.java U kew\src\test\java\org\kuali\rice\kew\routeheader\RouteHeaderServiceTest.java U kew\src\test\java\org\kuali\rice\kew\routeheader\AppDocStatusTest.java U kew\src\test\resources\META-INF\kew-test-config.xml A kew\src\test\resources\org\kuali\rice\kew\actions\FutureRequestsConfig2.xml A kew\src\test\resources\org\kuali\rice\kew\actions\FutureRequestsConfig3.xml U kew\src\test\resources\org\kuali\rice\kew\xml\TestKEWAppDocStatus.xml U kew\src\test\resources\org\kuali\rice\kew\xml\DocumentStatusPolicyMissingStringValue.xml U kew\src\test\resources\org\kuali\rice\kew\xml\DocumentStatusPolicyInvalidStringValue.xml U kew\src\test\resources\org\kuali\rice\kew\routeheader\AppDocStatusTestConfig.xml U kew\pom.xml U scripts\dataset\demo-server-dataset-cleanup.sql A scripts\upgrades\1.0.1.1 to 1.0.2 A scripts\upgrades\1.0.1.1 to 1.0.2\db-updates-client A scripts\upgrades\1.0.1.1 to 1.0.2\db-updates A scripts\upgrades\1.0.1.1 to 1.0.2\db-updates\2010-04-15.sql A scripts\upgrades\1.0.1.1 to 1.0.2\db-updates\2009-10-02.sql A scripts\upgrades\1.0.1.1 to 1.0.2\db-updates\2010-03-19.sql A 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 A scripts\upgrades\1.0.1.1 to 1.0.2\final\udpate_final_mysql.sql A scripts\upgrades\1.0.1.1 to 1.0.2\final\update_final_oracle.sql D scripts\upgrades\1.0.0 to 1.0.kc 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\datadictionary\validation\charlevel\AlphaNumericValidationPatternTest.java U kns\src\test\java\org\kuali\rice\kns\datadictionary\validation\charlevel\CharsetValidationPatternTest.java U kns\src\test\java\org\kuali\rice\kns\datadictionary\validation\charlevel\RegexValidationPatternTest.java U kns\src\test\java\org\kuali\rice\kns\datadictionary\validation\charlevel\NumericValidationPatternTest.java U kns\src\test\java\org\kuali\rice\kns\datadictionary\validation\charlevel\AnyCharacterValidationPatternTest.java U kns\src\test\java\org\kuali\rice\kns\datadictionary\validation\charlevel\AlphaValidationPatternTest.java U kns\src\test\java\org\kuali\rice\kns\datadictionary\validation\ValidationTestUtils.java U kns\src\test\java\org\kuali\rice\kns\test\document\AccountRequestDocumentWithCyclicalReference.java U kns\src\test\java\org\kuali\rice\kns\lookup\LookupResultsDDBo.java U kns\src\test\java\org\kuali\rice\kns\lookup\LookupResultsDDBoLookupableHelperServiceImpl.java U kns\src\test\java\org\kuali\rice\kns\lookup\LookupResultsServiceTest.java U kns\src\test\java\org\kuali\rice\kns\util\WebUtilsTest.java U kns\src\test\resources\KR-Test-ApplicationResources.properties U kns\src\test\resources\KnsTestSpringBeans.xml U kns\src\test\resources\org\kuali\rice\kns\test\document\AccountRequestDocument3.xml U kns\pom.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 kcb\src\test\resources\META-INF\kcb-test-config.xml U kcb\pom.xml U impl\src\test\java\org\kuali\rice\test\RiceTestCaseTest.java U impl\src\test\java\org\kuali\rice\core\config\BaseConfigTest.java U impl\src\test\java\org\kuali\rice\core\config\HierarchicalConfigParserTest.java U impl\src\test\java\org\kuali\rice\core\config\PropertyHolder.java Conflict discovered in 'impl/src/test/java/org/kuali/rice/core/config/JAXBConfigImplTest.java'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\test\java\org\kuali\rice\core\config\JAXBConfigImplTest.java A impl\src\test\resources\org\kuali\rice\core\config\jaxb-test-circular2.xml U impl\src\main\java\org\kuali\rice\kcb\config\KCBConfigurer.java U impl\src\main\java\org\kuali\rice\ksb\messaging\RoutingTableDiffCalculator.java U impl\src\main\java\org\kuali\rice\ksb\messaging\RemotedServiceRegistryImpl.java U impl\src\main\java\org\kuali\rice\ksb\messaging\web\ThreadPoolAction.java A impl\src\main\java\org\kuali\rice\ksb\messaging\web\ConfigViewerAction.java A impl\src\main\java\org\kuali\rice\ksb\messaging\web\ConfigViewerForm.java U impl\src\main\java\org\kuali\rice\ksb\messaging\service\impl\BusAdminServiceImpl.java U impl\src\main\java\org\kuali\rice\ksb\messaging\RunModeServiceExporter.java U impl\src\main\java\org\kuali\rice\ksb\messaging\config\KSBConfigurer.java U impl\src\main\java\org\kuali\rice\ksb\messaging\resourceloader\KSBResourceLoaderFactory.java U impl\src\main\java\org\kuali\rice\test\lifecycles\JettyServerLifecycle.java U impl\src\main\java\org\kuali\rice\test\RiceTestCase.java U impl\src\main\java\org\kuali\rice\test\ClearDatabaseLifecycle.java U impl\src\main\java\org\kuali\rice\kim\bo\ui\KimDocumentRoleMember.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\PermissionServiceBase.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\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\ResponsibilityUpdateServiceImpl.java U impl\src\main\java\org\kuali\rice\kim\service\impl\ResponsibilityServiceBase.java U impl\src\main\java\org\kuali\rice\kim\service\impl\PermissionUpdateServiceImpl.java U impl\src\main\java\org\kuali\rice\kim\service\KIMServiceLocator.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\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 U impl\src\main\java\org\kuali\rice\kim\util\KualiDateMask.java U impl\src\main\java\org\kuali\rice\kim\web\struts\form\IdentityManagementDocumentFormBase.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\kew\dto\DTOConverter.java U impl\src\main\java\org\kuali\rice\kew\useroptions\UserOptionsServiceCache.java U impl\src\main\java\org\kuali\rice\kew\useroptions\UserOptionsServiceImpl.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\plugin\PluginConfig.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\messaging\RouteDocumentMessageService.java U impl\src\main\java\org\kuali\rice\kew\web\ApplicationInitializeListener.java U impl\src\main\java\org\kuali\rice\kew\docsearch\DocumentLookupCriteriaBuilder.java U impl\src\main\java\org\kuali\rice\kew\service\impl\WorkflowDocumentActionsWebServiceImpl.java U impl\src\main\java\org\kuali\rice\kew\service\KEWServiceLocator.java U impl\src\main\java\org\kuali\rice\kew\edl\service\impl\StyleServiceImpl.java U impl\src\main\java\org\kuali\rice\kew\engine\StandardWorkflowEngine.java U impl\src\main\java\org\kuali\rice\kew\engine\node\service\impl\RouteNodeServiceImpl.java U impl\src\main\java\org\kuali\rice\kew\engine\node\service\RouteNodeService.java U impl\src\main\java\org\kuali\rice\kew\engine\node\RouteNodeUtils.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\DocumentStatusTransition.java U impl\src\main\java\org\kuali\rice\kew\util\XmlHelper.java U impl\src\main\java\org\kuali\rice\core\config\BaseConfig.java U impl\src\main\java\org\kuali\rice\core\config\RiceConfigurerBase.java U impl\src\main\java\org\kuali\rice\core\config\ConfigLogger.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\xsd\Param.java U impl\src\main\java\org\kuali\rice\core\config\xsd\Config.java U impl\src\main\java\org\kuali\rice\core\config\SimpleConfig.java U impl\src\main\java\org\kuali\rice\core\config\spring\ConfigFactoryBean.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 A impl\src\main\java\org\kuali\rice\core\config\spring\SimpleConfigFactoryBean.java U impl\src\main\java\org\kuali\rice\core\config\AbstractBaseConfig.java U impl\src\main\java\org\kuali\rice\core\config\JAXBConfigImpl.java U impl\src\main\java\org\kuali\rice\core\ojb\BaseOjbConfigurer.java U impl\src\main\java\org\kuali\rice\core\util\KeyLabelPair.java A impl\src\main\java\org\kuali\rice\core\util\CollectionUtils.java A impl\src\main\java\org\kuali\rice\core\util\ImmutableProperties.java U impl\src\main\java\org\kuali\rice\core\web\listener\StandaloneInitializeListener.java U impl\src\main\java\org\kuali\rice\core\resourceloader\SpringBeanFactoryResourceLoader.java U impl\src\main\java\org\kuali\rice\core\resourceloader\RiceResourceLoaderFactory.java U impl\src\main\java\org\kuali\rice\kns\datadictionary\control\MultiselectControlDefinition.java U impl\src\main\java\org\kuali\rice\kns\datadictionary\control\ControlDefinitionBase.java U impl\src\main\java\org\kuali\rice\kns\datadictionary\control\ControlDefinition.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\ValidationPattern.java U impl\src\main\java\org\kuali\rice\kns\datadictionary\AttributeDefinition.java U impl\src\main\java\org\kuali\rice\kns\datadictionary\exporter\AttributesMapBuilder.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\PersistenceServiceStructureImplBase.java U impl\src\main\java\org\kuali\rice\kns\service\impl\DictionaryValidationServiceImpl.java Conflict discovered in 'impl/src/main/java/org/kuali/rice/kns/dao/proxy/LookupDaoProxy.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\LookupDaoProxy.java U impl\src\main\java\org\kuali\rice\kns\config\KNSConfigurer.java U impl\src\main\java\org\kuali\rice\kns\lookup\DataDictionaryLookupResultsSupportStrategy.java U impl\src\main\java\org\kuali\rice\kns\lookup\LookupResultsSupportStrategyService.java U impl\src\main\java\org\kuali\rice\kns\lookup\PersistableBusinessObjectLookupResultsSupportStrategyImpl.java U impl\src\main\java\org\kuali\rice\kns\workflow\service\impl\WorkflowDocumentServiceImpl.java U impl\src\main\java\org\kuali\rice\kns\util\FieldUtils.java A impl\src\main\java\org\kuali\rice\kns\util\PagingBannerUtils.java U impl\src\main\java\org\kuali\rice\kns\util\WebUtils.java U impl\src\main\java\org\kuali\rice\kns\web\RiceConfigurationListener.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\KualiTransactionalDocumentFormBase.java U impl\src\main\java\org\kuali\rice\kns\web\struts\form\MultipleValueLookupForm.java U impl\src\main\java\org\kuali\rice\kns\web\struts\form\QuestionPromptForm.java U impl\src\main\java\org\kuali\rice\kns\web\struts\action\KualiAction.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\KualiInquiryAction.java A 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\ArrayFormatter.java U impl\src\main\java\org\kuali\rice\kns\web\format\Formatter.java U impl\src\main\java\org\kuali\rice\kns\web\ui\Field.java U impl\src\main\java\org\kuali\rice\ken\config\KENConfigurer.java U impl\src\main\resources\META-INF\test-config-defaults.xml U impl\src\main\resources\META-INF\common-config-defaults.xml U impl\src\main\resources\KR-ApplicationResources.properties A impl\src\main\resources\org\kuali\rice\kew\edl A 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\kns\bo\datadictionary\Parameter.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\pom.xml U api\src\main\java\org\kuali\rice\kim\util\KimConstants.java U api\src\main\java\org\kuali\rice\kew\service\WorkflowInfo.java U api\src\main\java\org\kuali\rice\kew\service\WorkflowDocument.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\jaxb\AttributeSetAdapter.java U api\src\main\java\org\kuali\rice\core\jaxb\StringEntityNameInfoMapEntry.java U api\src\main\java\org\kuali\rice\core\jaxb\StringToKimEntityNameInfoMapAdapter.java U api\src\main\java\org\kuali\rice\core\jaxb\SqlTimestampAdapter.java U api\src\main\java\org\kuali\rice\core\jaxb\StringToKimEntityNamePrincipalInfoMapAdapter.java U api\src\main\java\org\kuali\rice\core\jaxb\StringMapEntry.java U api\src\main\java\org\kuali\rice\core\jaxb\StringEntNmPrncpInfoMapEntry.java U api\src\main\java\org\kuali\rice\core\jaxb\MapStringStringAdapter.java U api\src\main\java\org\kuali\rice\core\jaxb\SqlDateAdapter.java U api\src\main\java\org\kuali\rice\core\config\Config.java U api\src\main\java\org\kuali\rice\kns\util\KNSConstants.java U api\pom.xml U ken\src\test\resources\META-INF\ken-test-config.xml U ken\pom.xml U web\src\test\java\org\kuali\rice\ken\KENWebServiceTest.java U web\src\test\java\org\kuali\rice\web\service\impl\DemonstrationGradeEncryptionServiceImplTest.java U web\src\main\resources\org\kuali\rice\standalone\config\standalone-config.xml U web\src\main\webapp\ksb\WEB-INF\struts-config.xml A web\src\main\webapp\ksb\WEB-INF\jsp\config A web\src\main\webapp\ksb\WEB-INF\jsp\config\ConfigViewer.jsp U web\src\main\webapp\kim\WEB-INF\struts-config.xml U web\src\main\webapp\WEB-INF\struts-config.xml U web\src\main\webapp\WEB-INF\tags\kim\responsibilityAction.tag U web\src\main\webapp\WEB-INF\tags\kim\roleDelegations.tag U web\src\main\webapp\WEB-INF\tags\kim\personEmpInfo.tag U web\src\main\webapp\WEB-INF\tags\kim\personRoleQualifier.tag U web\src\main\webapp\WEB-INF\tags\kim\personDelegationMemberQualifier.tag U web\src\main\webapp\WEB-INF\tags\kim\attributeLookup.tag U web\src\main\webapp\WEB-INF\tags\kim\roleResponsibilityAction.tag U web\src\main\webapp\WEB-INF\tags\kim\responsibilityActions.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\kr\auditMode.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\hiddenTab.tag U web\src\main\webapp\WEB-INF\tags\kr\auditSet.tag U web\src\main\webapp\WEB-INF\tags\kr\workflowWorkgroupLookup.tag U web\src\main\webapp\WEB-INF\tags\kr\enterKey.tag R web\src\main\webapp\WEB-INF\tags\kr\htmlControlAttribute.tag U web\src\main\webapp\WEB-INF\tags\kr\displayMultipleValueLookupResults.tag U web\src\main\webapp\WEB-INF\tags\kr\directInquiry.tag U web\src\main\webapp\WEB-INF\tags\kr\rowDisplay.tag U web\src\main\webapp\WEB-INF\tags\kr\auditRow.tag U web\src\main\webapp\WEB-INF\tags\kr\dateInputNoAttributeEntry.tag R web\src\main\webapp\WEB-INF\tags\kr\documentControls.tag U web\src\main\webapp\WEB-INF\tags\kr\tableRenderPagingBanner.tag U web\src\main\webapp\WEB-INF\tags\kr\tab.tag U web\src\main\webapp\WEB-INF\tags\kr\fileSize.tag U web\src\main\webapp\WEB-INF\tags\kr\fieldRadioValues.tag U web\src\main\webapp\WEB-INF\tags\kr\expandedTextArea.tag U web\src\main\webapp\WEB-INF\tags\kr\notes.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\hiddenLabel.tag U web\src\main\webapp\WEB-INF\tags\kr\editablePropertiesGuid.tag U web\src\main\webapp\WEB-INF\tags\kr\inquiry.tag U web\src\main\webapp\WEB-INF\tags\kr\checkErrors.tag U web\src\main\webapp\WEB-INF\tags\kr\documentPage.tag U web\src\main\webapp\WEB-INF\tags\kr\errors.tag U web\src\main\webapp\WEB-INF\tags\kr\dd\foreachEntry.tag U web\src\main\webapp\WEB-INF\tags\kr\fieldMultiSelectValues.tag U web\src\main\webapp\WEB-INF\tags\kr\user.tag U web\src\main\webapp\WEB-INF\tags\kr\fieldShowIcons.tag U web\src\main\webapp\WEB-INF\tags\kr\readonlyfield.tag U web\src\main\webapp\WEB-INF\tags\kr\hiddenDocumentFields.tag U web\src\main\webapp\WEB-INF\tags\kr\tabTop.tag U web\src\main\webapp\WEB-INF\tags\kr\dateInput.tag U web\src\main\webapp\WEB-INF\tags\kr\fieldSelectValues.tag U web\src\main\webapp\WEB-INF\tags\kr\lookup.tag R web\src\main\webapp\WEB-INF\tags\kr\multipleValueLookup.tag U web\src\main\webapp\WEB-INF\tags\kr\fieldShowReadOnly.tag U web\src\main\webapp\WEB-INF\tags\kr\fieldDefaultLabel.tag U web\src\main\webapp\WEB-INF\tags\kr\errorCount.tag U web\src\main\webapp\WEB-INF\tags\kr\auditErrors.tag A web\src\main\webapp\WEB-INF\tags\kr\fieldShowExpandedTextareaIcon.tag U web\src\main\webapp\kr\WEB-INF\tlds\kuali-func.tld U web\src\main\webapp\kr\WEB-INF\jsp\KualiMultipleValueLookup.jsp R web\src\main\webapp\kr\WEB-INF\jsp\TextArea.jsp U web\src\main\webapp\kr\WEB-INF\jsp\KualiLookup.jsp U web\src\main\webapp\kr\WEB-INF\jsp\KualiExceptionIncident.jsp U web\src\main\webapp\kr\scripts\core.js 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 — Merging r13080 through r13386 into '.': G 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 G kim\src\test\java\org\kuali\rice\kim\service\impl\RoleServiceImplTest.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 Conflict discovered in '.project'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C .project 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 A scripts\launch\rice [standalone] - JettyServer.launch A scripts\launch\rice [sample app] - JettyServer.launch C scripts\launch\rice - JettyServer.launch Conflict discovered in 'scripts/createproject.groovy'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C scripts\createproject.groovy G pom.xml U kns\src\test\resources\META-INF\kns-test-config.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 G build.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 LICENSE.txt G impl\src\main\java\org\kuali\rice\kim\service\impl\RoleServiceImpl.java U impl\src\main\java\org\kuali\rice\kew\docsearch\service\impl\SearchableAttributeProcessor.java U impl\src\main\java\org\kuali\rice\kew\actions\SaveActionEvent.java G impl\src\main\java\org\kuali\rice\core\config\JAXBConfigImpl.java G impl\src\main\resources\META-INF\common-config-defaults.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/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 Conflict discovered in 'config/templates/createproject.config.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.config.template.xml U config\templates\sample-app-config.template.xml U api\src\main\java\org\kuali\rice\kcb\dto\MessageDTO.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 U 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\java\org\kuali\rice\web\test\ServerTestBase.java U web\src\test\resources\META-INF\web-test-config.xml U web\src\main\config\example-config\rice-config.xml U web\src\main\resources\META-INF\standalone-config-defaults.xml G web\src\main\resources\org\kuali\rice\standalone\config\standalone-config.xml G web\pom.xml Summary of conflicts: Text conflicts: 20 Tree conflicts: 1
          Hide
          jjhanso Jeremy Hanson added a comment -

          code committed and master db updated.

          Show
          jjhanso Jeremy Hanson added a comment - code committed and master db updated.

            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: