Details

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

      Description

      We need to merge the changes from 1.0.2.1 branch into the 1.0.3 branch.

      See these notes on the subversion merge process:

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

      There are no database changes for 1.0.2.1, so nothing needs to be done there.

        Attachments

          Activity

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

          merge output:

          C:\java\projects\rice-1.0.3-clean>svn merge -r 13588:HEAD https://test.kuali.org/svn/rice/branches/rice-release-1-0-2-1-br
          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
          — Merging r13589 through r14048 into '.':
          C ksb\pom.xml
          U kim\src\test\java\org\kuali\rice\kim\test\service\PersonServiceImplTest.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
          U kew\src\test\resources\org\kuali\rice\kew\clientapp\thin-client-app-config.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
          Conflict discovered in 'scripts/launch/rice [standalone] - 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 [standalone] - JettyServer.launch
          Conflict discovered in 'scripts/launch/rice [sample app] - 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 [sample app] - JettyServer.launch
          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
          Conflict discovered in 'kns/pom.xml'.
          Select: (p) postpone, (df) diff-full, (e) edit,
          (mc) mine-conflict, (tc) theirs-conflict,
          (s) show all options: p
          C kns\pom.xml
          U build.xml
          Conflict discovered in 'kcb/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
          Conflict discovered in '.classpath'.
          Select: (p) postpone, (df) diff-full, (e) edit,
          (mc) mine-conflict, (tc) theirs-conflict,
          (s) show all options: p
          C .classpath
          U impl\src\main\java\org\kuali\rice\ksb\messaging\KSBClientProxy.java
          U impl\src\main\java\org\kuali\rice\ksb\messaging\dao\ServiceInfoDAO.java
          U impl\src\main\java\org\kuali\rice\ksb\messaging\dao\impl\ServiceInfoDAOJpaImpl.java
          U impl\src\main\java\org\kuali\rice\ksb\messaging\dao\impl\ServiceInfoDAOOjbImpl.java
          U impl\src\main\java\org\kuali\rice\ksb\messaging\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\service\ServiceRegistry.java
          U impl\src\main\java\org\kuali\rice\ksb\messaging\RemoteResourceServiceLocatorImpl.java
          U impl\src\main\java\org\kuali\rice\kim\service\impl\RoleManagementServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kim\service\impl\RoleServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kim\service\impl\PersonServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kim\service\impl\RoleServiceBase.java
          U impl\src\main\java\org\kuali\rice\kim\service\impl\UiDocumentServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kim\service\impl\ResponsibilityUpdateServiceImpl.java
          Conflict discovered in 'impl/src/main/java/org/kuali/rice/kim/util/KimCommonUtils.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\util\KimCommonUtils.java
          U impl\src\main\java\org\kuali\rice\kim\web\struts\action\IdentityManagementGroupDocumentAction.java
          Conflict discovered in 'impl/src/main/java/org/kuali/rice/kim/web/struts/action/IdentityManagementGroupInquiry.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\web\struts\action\IdentityManagementGroupInquiry.java
          U impl\src\main\java\org\kuali\rice\kim\web\struts\action\IdentityManagementDocumentActionBase.java
          U impl\src\main\java\org\kuali\rice\kim\document\IdentityManagementGroupDocument.java
          U impl\src\main\java\org\kuali\rice\kim\document\ReviewResponsibilityMaintainable.java
          U impl\src\main\java\org\kuali\rice\kew\export\DataExporter.java
          U impl\src\main\java\org\kuali\rice\kew\plugin\PluginConfig.java
          U impl\src\main\java\org\kuali\rice\kew\bo\lookup\DocSearchCriteriaDTOLookupableHelperServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kew\routelog\web\RouteLogAction.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\doctype\DocumentTypeSecurity.java
          A impl\src\main\java\org\kuali\rice\kew\doctype\LazyLoadSecurityAttribute.java
          U impl\src\main\java\org\kuali\rice\kew\actionlist\service\impl\ActionListServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kew\actionlist\dao\impl\ActionListDAOOjbImpl.java
          U impl\src\main\java\org\kuali\rice\kew\messaging\exceptionhandling\ExceptionRoutingServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kew\web\BootstrapFilter.java
          U impl\src\main\java\org\kuali\rice\kew\web\DummyLoginFilter.java
          U impl\src\main\java\org\kuali\rice\kew\document\RoutingRuleDelegationMaintainable.java
          U impl\src\main\java\org\kuali\rice\kew\document\RoutingRuleMaintainable.java
          A impl\src\main\java\org\kuali\rice\kew\mail\service\impl\EmailToList.java
          A impl\src\main\java\org\kuali\rice\kew\mail\service\impl\EmailBcList.java
          A impl\src\main\java\org\kuali\rice\kew\mail\service\impl\EmailCcList.java
          U impl\src\main\java\org\kuali\rice\kew\mail\service\impl\StyleableEmailContentServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kew\mail\service\impl\DefaultEmailService.java
          U impl\src\main\java\org\kuali\rice\kew\mail\service\EmailService.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\ActionRequestFactory.java
          U impl\src\main\java\org\kuali\rice\kew\notes\web\NoteAction.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\actionitem\dao\impl\ActionItemDAOOjbImpl.java
          U impl\src\main\java\org\kuali\rice\kew\actions\BlanketApproveAction.java
          U impl\src\main\java\org\kuali\rice\kew\actions\ActionTakenEvent.java
          U impl\src\main\java\org\kuali\rice\kew\actions\AdHocAction.java
          U impl\src\main\java\org\kuali\rice\kew\actions\CancelAction.java
          U impl\src\main\java\org\kuali\rice\kew\service\impl\ReviewResponsibilityTypeServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kew\xml\export\RuleXmlExporter.java
          U impl\src\main\java\org\kuali\rice\kew\xml\export\GroupXmlExporter.java
          U impl\src\main\java\org\kuali\rice\kew\preferences\service\impl\PreferencesServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kew\preferences\web\PreferencesForm.java
          U impl\src\main\java\org\kuali\rice\kew\edl\WorkflowFunctions.java
          U impl\src\main\java\org\kuali\rice\kew\edl\components\GlobalAttributeComponent.java
          U impl\src\main\java\org\kuali\rice\kew\edl\components\WorkflowDocumentState.java
          Conflict discovered in 'impl/src/main/java/org/kuali/rice/kew/edl/components/NoteConfigComponent.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\edl\components\NoteConfigComponent.java
          U impl\src\main\java\org\kuali\rice\kew\edl\components\BrowserHandler.java
          U impl\src\main\java\org\kuali\rice\kew\edl\components\UniversityIdWorkflowEDLConfigComponent.java
          U impl\src\main\java\org\kuali\rice\kew\engine\node\FYIByUniversityId.java
          Conflict discovered in 'impl/src/main/java/org/kuali/rice/kew/engine/node/service/impl/RouteNodeServiceImpl.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\engine\node\service\impl\RouteNodeServiceImpl.java
          Conflict discovered in 'impl/src/main/java/org/kuali/rice/kew/config/ThinClientResourceLoader.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\config\ThinClientResourceLoader.java
          U impl\src\main\java\org\kuali\rice\kew\rule\bo\RuleBaseValuesInquirableImpl.java
          U impl\src\main\java\org\kuali\rice\kew\rule\bo\RuleDelegationInquirableImpl.java
          U impl\src\main\java\org\kuali\rice\kew\rule\bo\RuleBaseValuesLookupableHelperServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kew\rule\bo\RuleDelegationLookupableHelperServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kew\rule\web\WebRuleUtils.java
          U impl\src\main\java\org\kuali\rice\kew\rule\service\impl\RuleDelegationServiceImpl.java
          A impl\src\main\java\org\kuali\rice\kew\rule\service\impl\RuleDelegationCacheProcessorImpl.java
          U impl\src\main\java\org\kuali\rice\kew\rule\service\impl\RuleServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kew\rule\service\RuleDelegationService.java
          A impl\src\main\java\org\kuali\rice\kew\rule\service\RuleDelegationCacheProcessor.java
          U impl\src\main\java\org\kuali\rice\kew\rule\dao\impl\RuleDelegationDAOOjbImpl.java
          U impl\src\main\java\org\kuali\rice\kew\rule\dao\impl\RuleDAOOjbImpl.java
          U impl\src\main\java\org\kuali\rice\kew\rule\RuleRoutingAttribute.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\web\jetty\JettyServer.java
          D impl\src\main\java\org\kuali\rice\core\exception\RiceRemoteServiceConnectionException.java
          U impl\src\main\java\org\kuali\rice\kns\exception\ExceptionIncident.java
          U impl\src\main\java\org\kuali\rice\kns\datadictionary\validation\charlevel\AlphaNumericValidationPattern.java
          U impl\src\main\java\org\kuali\rice\kns\bo\KualiCodeBase.java
          U impl\src\main\java\org\kuali\rice\kns\service\impl\RiceApplicationConfigurationMediationServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kns\service\impl\KualiExceptionIncidentServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kns\lookup\AbstractLookupableHelperServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kns\lookup\LookupUtils.java
          U impl\src\main\java\org\kuali\rice\kns\util\FieldUtils.java
          U impl\src\main\java\org\kuali\rice\kns\util\OjbKualiEncryptDecryptFieldConversion.java
          U impl\src\main\java\org\kuali\rice\kns\util\WebUtils.java
          U impl\src\main\java\org\kuali\rice\kns\web\struts\form\KualiDocumentFormBase.java
          U impl\src\main\java\org\kuali\rice\kns\web\struts\form\InquiryForm.java
          U impl\src\main\java\org\kuali\rice\kns\web\struts\form\KualiExceptionIncidentForm.java
          Conflict discovered in 'impl/src/main/java/org/kuali/rice/kns/web/struts/form/KualiForm.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\web\struts\form\KualiForm.java
          U impl\src\main\java\org\kuali\rice\kns\web\struts\form\KualiMaintenanceForm.java
          U impl\src\main\java\org\kuali\rice\kns\web\struts\form\LookupForm.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\KualiMaintenanceDocumentAction.java
          U impl\src\main\java\org\kuali\rice\kns\web\struts\action\KualiMultipleValueLookupAction.java
          U impl\src\main\java\org\kuali\rice\kns\web\struts\action\KualiLookupAction.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\ui\SectionBridge.java
          Conflict discovered in 'impl/src/main/java/org/kuali/rice/kns/web/ui/Field.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\web\ui\Field.java
          U impl\src\main\java\org\kuali\rice\ken\service\impl\NotificationWorkflowDocumentServiceImpl.java
          Conflict discovered in 'impl/src/main/java/org/kuali/rice/ken/util/Util.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\ken\util\Util.java
          U impl\src\main\resources\META-INF\common-config-defaults.xml
          U impl\src\main\resources\META-INF\ksb-persistence.xml
          U impl\src\main\resources\org\kuali\rice\kim\bo\datadictionary\ResponsibilityImpl.xml
          U impl\src\main\resources\org\kuali\rice\kim\bo\datadictionary\PersonDocumentName.xml
          U impl\src\main\resources\org\kuali\rice\kim\bo\datadictionary\PermissionImpl.xml
          Conflict discovered in 'impl/src/main/resources/org/kuali/rice/kim/bo/datadictionary/GroupImpl.xml'.
          Select: (p) postpone, (df) diff-full, (e) edit,
          (mc) mine-conflict, (tc) theirs-conflict,
          (s) show all options: p
          C impl\src\main\resources\org\kuali\rice\kim\bo\datadictionary\GroupImpl.xml
          U impl\src\main\resources\org\kuali\rice\kim\config\OJB-repository-kim.xml
          U impl\src\main\resources\org\kuali\rice\kew\bo\datadictionary\RuleBaseValues.xml
          U impl\src\main\resources\org\kuali\rice\kew\bo\datadictionary\RuleDelegation.xml
          U impl\src\main\resources\org\kuali\rice\kew\bo\datadictionary\GroupRuleResponsibility.xml
          Conflict discovered in 'impl/src/main/resources/org/kuali/rice/kew/config/KEWSpringBeans.xml'.
          Select: (p) postpone, (df) diff-full, (e) edit,
          (mc) mine-conflict, (tc) theirs-conflict,
          (s) show all options: p
          C impl\src\main\resources\org\kuali\rice\kew\config\KEWSpringBeans.xml
          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 config\templates\sample-app-config.template.xml
          Conflict discovered in 'api/src/main/java/org/kuali/rice/kew/util/KEWConstants.java'.
          Select: (p) postpone, (df) diff-full, (e) edit,
          (mc) mine-conflict, (tc) theirs-conflict,
          (s) show all options: p
          C api\src\main\java\org\kuali\rice\kew\util\KEWConstants.java
          A api\src\main\java\org\kuali\rice\core\exception\RiceRemoteServiceConnectionException.java
          U api\src\main\java\org\kuali\rice\core\resourceloader\GlobalResourceLoader.java
          U api\src\main\java\org\kuali\rice\core\resourceloader\ParentChildResourceLoader.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/src/test/java/org/kuali/rice/ken/xpath/XPathTest.java'.
          Select: (p) postpone, (df) diff-full, (e) edit,
          (mc) mine-conflict, (tc) theirs-conflict,
          (s) show all options: p
          C ken\src\test\java\org\kuali\rice\ken\xpath\XPathTest.java
          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\BaseLineAppStartTest.java
          U web\src\test\java\org\kuali\rice\web\inquirable\BaseDirectInquiryTest.java
          U web\src\main\webapp\ksb\WEB-INF\jsp\threadpool\ThreadPool.jsp
          U web\src\main\webapp\ksb\WEB-INF\jsp\config\ConfigViewer.jsp
          U web\src\main\webapp\ksb\WEB-INF\jsp\registry\ServiceRegistry.jsp
          U web\src\main\webapp\ksb\WEB-INF\jsp\javasecurity\JavaSecurityManagement.jsp
          U web\src\main\webapp\ksb\WEB-INF\jsp\messagequeue\Quartz.jsp
          U web\src\main\webapp\ksb\WEB-INF\jsp\messagequeue\MessageQueue.jsp
          C web\src\main\webapp\kim\WEB-INF\dtds\weblogic-web-jar.dtd
          U web\src\main\webapp\rice-portal\css\portal.css
          U web\src\main\webapp\index.jsp
          U web\src\main\webapp\kew\WEB-INF\jsp\help\HelpEntry.jsp
          U web\src\main\webapp\kew\WEB-INF\jsp\help\HelpSearch.jsp
          U web\src\main\webapp\kew\WEB-INF\jsp\superuser\SUActionRequests.jsp
          U web\src\main\webapp\kew\WEB-INF\jsp\documentoperation\DocumentOperationConfirm.jsp
          U web\src\main\webapp\kew\WEB-INF\jsp\documentoperation\DocumentOperationSummary.jsp
          U web\src\main\webapp\kew\WEB-INF\jsp\documentoperation\DocumentOperation.jsp
          U web\src\main\webapp\kew\WEB-INF\jsp\rule\RuleQuickLinks.jsp
          U web\src\main\webapp\kew\WEB-INF\jsp\rule\RuleQuickLinksDocumentTypeLinks.jsp
          U web\src\main\webapp\kew\WEB-INF\jsp\ActionList\ActionListFilter.jsp
          U web\src\main\webapp\kew\scripts\my_common.js
          U web\src\main\webapp\WEB-INF\jsp\dummy_login.jsp
          U web\src\main\webapp\WEB-INF\web.xml
          U web\src\main\webapp\WEB-INF\tags\kim\groupOverview.tag
          U web\src\main\webapp\WEB-INF\tags\rice-portal\portalBody.tag
          U web\src\main\webapp\WEB-INF\tags\rice-portal\iframePortletContainer.tag
          U web\src\main\webapp\WEB-INF\tags\rice-portal\immutableBar.tag
          U web\src\main\webapp\WEB-INF\tags\rice-portal\portalTop.tag
          U web\src\main\webapp\WEB-INF\tags\kew\delegateRuleInit.tag
          U web\src\main\webapp\WEB-INF\tags\kr\page.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\expandedTextArea.tag
          U web\src\main\webapp\WEB-INF\tags\kr\documentPage.tag
          U web\src\main\webapp\WEB-INF\tags\kr\checkTabHighlight.tag
          U web\src\main\webapp\WEB-INF\tags\kr\adHocRecipients.tag
          U web\src\main\webapp\WEB-INF\tags\kr\lookup.tag
          U web\src\main\webapp\WEB-INF\tags\kr\multipleValueLookup.tag
          U web\src\main\webapp\kr\scripts\core.js
          U web\src\main\webapp\kr\scripts\my_common.js
          U web\src\main\webapp\kr\scripts\objectInfo.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
          U .settings\org.eclipse.jdt.core.prefs
          Summary of conflicts:
          Text conflicts: 27
          Tree conflicts: 1

          Show
          jjhanso Jeremy Hanson added a comment - merge output: C:\java\projects\rice-1.0.3-clean>svn merge -r 13588:HEAD https://test.kuali.org/svn/rice/branches/rice-release-1-0-2-1-br 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 — Merging r13589 through r14048 into '.': C ksb\pom.xml U kim\src\test\java\org\kuali\rice\kim\test\service\PersonServiceImplTest.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 U kew\src\test\resources\org\kuali\rice\kew\clientapp\thin-client-app-config.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 Conflict discovered in 'scripts/launch/rice [standalone] - 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 [standalone] - JettyServer.launch Conflict discovered in 'scripts/launch/rice [sample app] - 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 [sample app] - JettyServer.launch 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 Conflict discovered in 'kns/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C kns\pom.xml U build.xml Conflict discovered in 'kcb/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 Conflict discovered in '.classpath'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C .classpath U impl\src\main\java\org\kuali\rice\ksb\messaging\KSBClientProxy.java U impl\src\main\java\org\kuali\rice\ksb\messaging\dao\ServiceInfoDAO.java U impl\src\main\java\org\kuali\rice\ksb\messaging\dao\impl\ServiceInfoDAOJpaImpl.java U impl\src\main\java\org\kuali\rice\ksb\messaging\dao\impl\ServiceInfoDAOOjbImpl.java U impl\src\main\java\org\kuali\rice\ksb\messaging\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\service\ServiceRegistry.java U impl\src\main\java\org\kuali\rice\ksb\messaging\RemoteResourceServiceLocatorImpl.java U impl\src\main\java\org\kuali\rice\kim\service\impl\RoleManagementServiceImpl.java U impl\src\main\java\org\kuali\rice\kim\service\impl\RoleServiceImpl.java U impl\src\main\java\org\kuali\rice\kim\service\impl\PersonServiceImpl.java U impl\src\main\java\org\kuali\rice\kim\service\impl\RoleServiceBase.java U impl\src\main\java\org\kuali\rice\kim\service\impl\UiDocumentServiceImpl.java U impl\src\main\java\org\kuali\rice\kim\service\impl\ResponsibilityUpdateServiceImpl.java Conflict discovered in 'impl/src/main/java/org/kuali/rice/kim/util/KimCommonUtils.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\util\KimCommonUtils.java U impl\src\main\java\org\kuali\rice\kim\web\struts\action\IdentityManagementGroupDocumentAction.java Conflict discovered in 'impl/src/main/java/org/kuali/rice/kim/web/struts/action/IdentityManagementGroupInquiry.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\web\struts\action\IdentityManagementGroupInquiry.java U impl\src\main\java\org\kuali\rice\kim\web\struts\action\IdentityManagementDocumentActionBase.java U impl\src\main\java\org\kuali\rice\kim\document\IdentityManagementGroupDocument.java U impl\src\main\java\org\kuali\rice\kim\document\ReviewResponsibilityMaintainable.java U impl\src\main\java\org\kuali\rice\kew\export\DataExporter.java U impl\src\main\java\org\kuali\rice\kew\plugin\PluginConfig.java U impl\src\main\java\org\kuali\rice\kew\bo\lookup\DocSearchCriteriaDTOLookupableHelperServiceImpl.java U impl\src\main\java\org\kuali\rice\kew\routelog\web\RouteLogAction.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\doctype\DocumentTypeSecurity.java A impl\src\main\java\org\kuali\rice\kew\doctype\LazyLoadSecurityAttribute.java U impl\src\main\java\org\kuali\rice\kew\actionlist\service\impl\ActionListServiceImpl.java U impl\src\main\java\org\kuali\rice\kew\actionlist\dao\impl\ActionListDAOOjbImpl.java U impl\src\main\java\org\kuali\rice\kew\messaging\exceptionhandling\ExceptionRoutingServiceImpl.java U impl\src\main\java\org\kuali\rice\kew\web\BootstrapFilter.java U impl\src\main\java\org\kuali\rice\kew\web\DummyLoginFilter.java U impl\src\main\java\org\kuali\rice\kew\document\RoutingRuleDelegationMaintainable.java U impl\src\main\java\org\kuali\rice\kew\document\RoutingRuleMaintainable.java A impl\src\main\java\org\kuali\rice\kew\mail\service\impl\EmailToList.java A impl\src\main\java\org\kuali\rice\kew\mail\service\impl\EmailBcList.java A impl\src\main\java\org\kuali\rice\kew\mail\service\impl\EmailCcList.java U impl\src\main\java\org\kuali\rice\kew\mail\service\impl\StyleableEmailContentServiceImpl.java U impl\src\main\java\org\kuali\rice\kew\mail\service\impl\DefaultEmailService.java U impl\src\main\java\org\kuali\rice\kew\mail\service\EmailService.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\ActionRequestFactory.java U impl\src\main\java\org\kuali\rice\kew\notes\web\NoteAction.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\actionitem\dao\impl\ActionItemDAOOjbImpl.java U impl\src\main\java\org\kuali\rice\kew\actions\BlanketApproveAction.java U impl\src\main\java\org\kuali\rice\kew\actions\ActionTakenEvent.java U impl\src\main\java\org\kuali\rice\kew\actions\AdHocAction.java U impl\src\main\java\org\kuali\rice\kew\actions\CancelAction.java U impl\src\main\java\org\kuali\rice\kew\service\impl\ReviewResponsibilityTypeServiceImpl.java U impl\src\main\java\org\kuali\rice\kew\xml\export\RuleXmlExporter.java U impl\src\main\java\org\kuali\rice\kew\xml\export\GroupXmlExporter.java U impl\src\main\java\org\kuali\rice\kew\preferences\service\impl\PreferencesServiceImpl.java U impl\src\main\java\org\kuali\rice\kew\preferences\web\PreferencesForm.java U impl\src\main\java\org\kuali\rice\kew\edl\WorkflowFunctions.java U impl\src\main\java\org\kuali\rice\kew\edl\components\GlobalAttributeComponent.java U impl\src\main\java\org\kuali\rice\kew\edl\components\WorkflowDocumentState.java Conflict discovered in 'impl/src/main/java/org/kuali/rice/kew/edl/components/NoteConfigComponent.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\edl\components\NoteConfigComponent.java U impl\src\main\java\org\kuali\rice\kew\edl\components\BrowserHandler.java U impl\src\main\java\org\kuali\rice\kew\edl\components\UniversityIdWorkflowEDLConfigComponent.java U impl\src\main\java\org\kuali\rice\kew\engine\node\FYIByUniversityId.java Conflict discovered in 'impl/src/main/java/org/kuali/rice/kew/engine/node/service/impl/RouteNodeServiceImpl.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\engine\node\service\impl\RouteNodeServiceImpl.java Conflict discovered in 'impl/src/main/java/org/kuali/rice/kew/config/ThinClientResourceLoader.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\config\ThinClientResourceLoader.java U impl\src\main\java\org\kuali\rice\kew\rule\bo\RuleBaseValuesInquirableImpl.java U impl\src\main\java\org\kuali\rice\kew\rule\bo\RuleDelegationInquirableImpl.java U impl\src\main\java\org\kuali\rice\kew\rule\bo\RuleBaseValuesLookupableHelperServiceImpl.java U impl\src\main\java\org\kuali\rice\kew\rule\bo\RuleDelegationLookupableHelperServiceImpl.java U impl\src\main\java\org\kuali\rice\kew\rule\web\WebRuleUtils.java U impl\src\main\java\org\kuali\rice\kew\rule\service\impl\RuleDelegationServiceImpl.java A impl\src\main\java\org\kuali\rice\kew\rule\service\impl\RuleDelegationCacheProcessorImpl.java U impl\src\main\java\org\kuali\rice\kew\rule\service\impl\RuleServiceImpl.java U impl\src\main\java\org\kuali\rice\kew\rule\service\RuleDelegationService.java A impl\src\main\java\org\kuali\rice\kew\rule\service\RuleDelegationCacheProcessor.java U impl\src\main\java\org\kuali\rice\kew\rule\dao\impl\RuleDelegationDAOOjbImpl.java U impl\src\main\java\org\kuali\rice\kew\rule\dao\impl\RuleDAOOjbImpl.java U impl\src\main\java\org\kuali\rice\kew\rule\RuleRoutingAttribute.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\web\jetty\JettyServer.java D impl\src\main\java\org\kuali\rice\core\exception\RiceRemoteServiceConnectionException.java U impl\src\main\java\org\kuali\rice\kns\exception\ExceptionIncident.java U impl\src\main\java\org\kuali\rice\kns\datadictionary\validation\charlevel\AlphaNumericValidationPattern.java U impl\src\main\java\org\kuali\rice\kns\bo\KualiCodeBase.java U impl\src\main\java\org\kuali\rice\kns\service\impl\RiceApplicationConfigurationMediationServiceImpl.java U impl\src\main\java\org\kuali\rice\kns\service\impl\KualiExceptionIncidentServiceImpl.java U impl\src\main\java\org\kuali\rice\kns\lookup\AbstractLookupableHelperServiceImpl.java U impl\src\main\java\org\kuali\rice\kns\lookup\LookupUtils.java U impl\src\main\java\org\kuali\rice\kns\util\FieldUtils.java U impl\src\main\java\org\kuali\rice\kns\util\OjbKualiEncryptDecryptFieldConversion.java U impl\src\main\java\org\kuali\rice\kns\util\WebUtils.java U impl\src\main\java\org\kuali\rice\kns\web\struts\form\KualiDocumentFormBase.java U impl\src\main\java\org\kuali\rice\kns\web\struts\form\InquiryForm.java U impl\src\main\java\org\kuali\rice\kns\web\struts\form\KualiExceptionIncidentForm.java Conflict discovered in 'impl/src/main/java/org/kuali/rice/kns/web/struts/form/KualiForm.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\web\struts\form\KualiForm.java U impl\src\main\java\org\kuali\rice\kns\web\struts\form\KualiMaintenanceForm.java U impl\src\main\java\org\kuali\rice\kns\web\struts\form\LookupForm.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\KualiMaintenanceDocumentAction.java U impl\src\main\java\org\kuali\rice\kns\web\struts\action\KualiMultipleValueLookupAction.java U impl\src\main\java\org\kuali\rice\kns\web\struts\action\KualiLookupAction.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\ui\SectionBridge.java Conflict discovered in 'impl/src/main/java/org/kuali/rice/kns/web/ui/Field.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\web\ui\Field.java U impl\src\main\java\org\kuali\rice\ken\service\impl\NotificationWorkflowDocumentServiceImpl.java Conflict discovered in 'impl/src/main/java/org/kuali/rice/ken/util/Util.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\ken\util\Util.java U impl\src\main\resources\META-INF\common-config-defaults.xml U impl\src\main\resources\META-INF\ksb-persistence.xml U impl\src\main\resources\org\kuali\rice\kim\bo\datadictionary\ResponsibilityImpl.xml U impl\src\main\resources\org\kuali\rice\kim\bo\datadictionary\PersonDocumentName.xml U impl\src\main\resources\org\kuali\rice\kim\bo\datadictionary\PermissionImpl.xml Conflict discovered in 'impl/src/main/resources/org/kuali/rice/kim/bo/datadictionary/GroupImpl.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\resources\org\kuali\rice\kim\bo\datadictionary\GroupImpl.xml U impl\src\main\resources\org\kuali\rice\kim\config\OJB-repository-kim.xml U impl\src\main\resources\org\kuali\rice\kew\bo\datadictionary\RuleBaseValues.xml U impl\src\main\resources\org\kuali\rice\kew\bo\datadictionary\RuleDelegation.xml U impl\src\main\resources\org\kuali\rice\kew\bo\datadictionary\GroupRuleResponsibility.xml Conflict discovered in 'impl/src/main/resources/org/kuali/rice/kew/config/KEWSpringBeans.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\resources\org\kuali\rice\kew\config\KEWSpringBeans.xml 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 config\templates\sample-app-config.template.xml Conflict discovered in 'api/src/main/java/org/kuali/rice/kew/util/KEWConstants.java'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C api\src\main\java\org\kuali\rice\kew\util\KEWConstants.java A api\src\main\java\org\kuali\rice\core\exception\RiceRemoteServiceConnectionException.java U api\src\main\java\org\kuali\rice\core\resourceloader\GlobalResourceLoader.java U api\src\main\java\org\kuali\rice\core\resourceloader\ParentChildResourceLoader.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/src/test/java/org/kuali/rice/ken/xpath/XPathTest.java'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C ken\src\test\java\org\kuali\rice\ken\xpath\XPathTest.java 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\BaseLineAppStartTest.java U web\src\test\java\org\kuali\rice\web\inquirable\BaseDirectInquiryTest.java U web\src\main\webapp\ksb\WEB-INF\jsp\threadpool\ThreadPool.jsp U web\src\main\webapp\ksb\WEB-INF\jsp\config\ConfigViewer.jsp U web\src\main\webapp\ksb\WEB-INF\jsp\registry\ServiceRegistry.jsp U web\src\main\webapp\ksb\WEB-INF\jsp\javasecurity\JavaSecurityManagement.jsp U web\src\main\webapp\ksb\WEB-INF\jsp\messagequeue\Quartz.jsp U web\src\main\webapp\ksb\WEB-INF\jsp\messagequeue\MessageQueue.jsp C web\src\main\webapp\kim\WEB-INF\dtds\weblogic-web-jar.dtd U web\src\main\webapp\rice-portal\css\portal.css U web\src\main\webapp\index.jsp U web\src\main\webapp\kew\WEB-INF\jsp\help\HelpEntry.jsp U web\src\main\webapp\kew\WEB-INF\jsp\help\HelpSearch.jsp U web\src\main\webapp\kew\WEB-INF\jsp\superuser\SUActionRequests.jsp U web\src\main\webapp\kew\WEB-INF\jsp\documentoperation\DocumentOperationConfirm.jsp U web\src\main\webapp\kew\WEB-INF\jsp\documentoperation\DocumentOperationSummary.jsp U web\src\main\webapp\kew\WEB-INF\jsp\documentoperation\DocumentOperation.jsp U web\src\main\webapp\kew\WEB-INF\jsp\rule\RuleQuickLinks.jsp U web\src\main\webapp\kew\WEB-INF\jsp\rule\RuleQuickLinksDocumentTypeLinks.jsp U web\src\main\webapp\kew\WEB-INF\jsp\ActionList\ActionListFilter.jsp U web\src\main\webapp\kew\scripts\my_common.js U web\src\main\webapp\WEB-INF\jsp\dummy_login.jsp U web\src\main\webapp\WEB-INF\web.xml U web\src\main\webapp\WEB-INF\tags\kim\groupOverview.tag U web\src\main\webapp\WEB-INF\tags\rice-portal\portalBody.tag U web\src\main\webapp\WEB-INF\tags\rice-portal\iframePortletContainer.tag U web\src\main\webapp\WEB-INF\tags\rice-portal\immutableBar.tag U web\src\main\webapp\WEB-INF\tags\rice-portal\portalTop.tag U web\src\main\webapp\WEB-INF\tags\kew\delegateRuleInit.tag U web\src\main\webapp\WEB-INF\tags\kr\page.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\expandedTextArea.tag U web\src\main\webapp\WEB-INF\tags\kr\documentPage.tag U web\src\main\webapp\WEB-INF\tags\kr\checkTabHighlight.tag U web\src\main\webapp\WEB-INF\tags\kr\adHocRecipients.tag U web\src\main\webapp\WEB-INF\tags\kr\lookup.tag U web\src\main\webapp\WEB-INF\tags\kr\multipleValueLookup.tag U web\src\main\webapp\kr\scripts\core.js U web\src\main\webapp\kr\scripts\my_common.js U web\src\main\webapp\kr\scripts\objectInfo.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 U .settings\org.eclipse.jdt.core.prefs Summary of conflicts: Text conflicts: 27 Tree conflicts: 1
          Hide
          jjhanso Jeremy Hanson added a comment -

          Committed code, but there are some unit tests in eclipse that are failing. looking into them now.

          Show
          jjhanso Jeremy Hanson added a comment - Committed code, but there are some unit tests in eclipse that are failing. looking into them now.

            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:

                Time Tracking

                Estimated:
                Original Estimate - 4 hours
                4h
                Remaining:
                Remaining Estimate - 4 hours
                4h
                Logged:
                Time Spent - Not Specified
                Not Specified