Details

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

      Description

      When appropriate, merge 0.9.1.3 into 0.9.3.

        Attachments

          Activity

          Hide
          ewestfal Eric Westfall added a comment -

          Base revision is 3134:

          svn log --stop-on-copy https://test.kuali.org/svn/rice/branches/rice-release-0-9-1-3-br

          ...

          ------------------------------------------------------------------------
          r3134 | ewestfal | 2008-02-05 08:55:59 -0500 (Tue, 05 Feb 2008) | 1 line

          Creating the 0.9.1.3 branch from 0.9.1.2.
          ------------------------------------------------------------------------

          Show
          ewestfal Eric Westfall added a comment - Base revision is 3134: svn log --stop-on-copy https://test.kuali.org/svn/rice/branches/rice-release-0-9-1-3-br ... ------------------------------------------------------------------------ r3134 | ewestfal | 2008-02-05 08:55:59 -0500 (Tue, 05 Feb 2008) | 1 line Creating the 0.9.1.3 branch from 0.9.1.2. ------------------------------------------------------------------------
          Hide
          ewestfal Eric Westfall added a comment -

          Merge command will be:

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

          Show
          ewestfal Eric Westfall added a comment - Merge command will be: svn merge -r 3134:HEAD https://test.kuali.org/svn/rice/branches/rice-release-0-9-1-3-br
          Hide
          ewestfal Eric Westfall added a comment -

          Merge output:

          129-79-44-31:rice-0.9.3 ewestfal$ svn merge -r 3134:HEAD https://test.kuali.org/svn/rice/branches/rice-release-0-9-1-3-br
          A ksb/src/main/java/edu/iu/uis/eden/messaging/AlternateEndpointLocation.java
          U ksb/src/main/java/edu/iu/uis/eden/messaging/web/MessageQueueForm.java
          U ksb/src/main/java/edu/iu/uis/eden/messaging/KEWHttpInvokerServiceExporter.java
          C ksb/src/main/java/edu/iu/uis/eden/messaging/config/KSBConfigurer.java
          C ksb/src/main/java/edu/iu/uis/eden/messaging/RemoteResourceServiceLocatorImpl.java
          C ksb/pom.xml
          C kim/pom.xml
          A kew/src/test/java/edu/iu/uis/eden/routetemplate/UniversityIdRoleAttributeTest.java
          A kew/src/test/java/edu/iu/uis/eden/routetemplate/NetworkIdRoleAttributeTest.java
          U kew/src/test/java/edu/iu/uis/eden/docsearch/DocumentSearchTest.java
          C kew/src/test/java/edu/iu/uis/eden/xml/DocumentTypeXmlParserTest.java
          A kew/src/test/resources/edu/iu/uis/eden/routetemplate/UniversityIdRoleAttributeTestConfig.xml
          A kew/src/test/resources/edu/iu/uis/eden/routetemplate/NetworkIdRoleAttributeTestConfig.xml
          A kew/src/test/resources/edu/iu/uis/eden/routetemplate/ParameterizedUniversityIdRoleAttributeTestConfig.xml
          A kew/src/test/resources/edu/iu/uis/eden/routetemplate/ParameterizedNetworkIdRoleAttributeTestConfig.xml
          A kew/src/test/resources/edu/iu/uis/eden/docsearch/DocSearchTest_RouteNode.xml
          U kew/src/test/resources/edu/iu/uis/eden/docsearch/SearchAttributeConfig.xml
          A kew/src/test/resources/edu/iu/uis/eden/xml/ReportingWorkgroupName.xml
          C kew/src/main/java/edu/iu/uis/eden/routetemplate/RuleTemplate.java
          U kew/src/main/java/edu/iu/uis/eden/routetemplate/InitiatorRoleAttribute.java
          A kew/src/main/java/edu/iu/uis/eden/routetemplate/NetworkIdRoleAttribute.java
          C kew/src/main/java/edu/iu/uis/eden/routetemplate/FlexRM.java
          A kew/src/main/java/edu/iu/uis/eden/routetemplate/UniversityIdRoleAttribute.java
          U kew/src/main/java/edu/iu/uis/eden/routetemplate/RuleResponsibility.java
          A kew/src/main/java/edu/iu/uis/eden/routetemplate/AbstractIdRoleAttribute.java
          U kew/src/main/java/edu/iu/uis/eden/lookupable/EDocLiteLookupable.java
          C kew/src/main/java/edu/iu/uis/eden/doctype/DocumentType.java
          U kew/src/main/java/edu/iu/uis/eden/doctype/dao/DocumentTypeDAOOjbImpl.java
          U kew/src/main/java/edu/iu/uis/eden/doctype/DocumentTypePolicyEnum.java
          U kew/src/main/java/edu/iu/uis/eden/docsearch/DocumentSearchServiceImpl.java
          U kew/src/main/java/edu/iu/uis/eden/docsearch/StandardDocumentSearchResultProcessor.java
          U kew/src/main/java/edu/iu/uis/eden/docsearch/StandardDocumentSearchGenerator.java
          C kew/src/main/java/edu/iu/uis/eden/superuser/web/SuperUserAction.java
          U kew/src/main/java/edu/iu/uis/eden/engine/node/FYIByUniversityId.java
          U kew/src/main/java/edu/iu/uis/eden/engine/node/FYIByNetworkId.java
          U kew/src/main/java/edu/iu/uis/eden/util/XmlHelper.java
          U kew/src/main/java/edu/iu/uis/eden/EdenConstants.java
          U kew/src/main/java/edu/iu/uis/eden/server/WorkflowUtilityWebServiceImpl.java
          U kew/src/main/java/edu/iu/uis/eden/server/WorkflowDocumentActions.java
          U kew/src/main/java/edu/iu/uis/eden/server/WorkflowDocumentActionsWebServiceImpl.java
          U kew/src/main/java/edu/iu/uis/eden/server/WorkflowUtility.java
          Skipped missing target: 'kew/src/main/java/edu/iu/uis/eden/messaging/KSBExporter.java'
          U kew/src/main/java/edu/iu/uis/eden/clientapp/WorkflowInfo.java
          A kew/src/main/java/edu/iu/uis/eden/mail/EmailStyleHelper.java
          U kew/src/main/java/edu/iu/uis/eden/mail/ActionListImmediateProcessorImpl.java
          C kew/src/main/java/edu/iu/uis/eden/mail/StyleableEmailContentServiceImpl.java
          A kew/src/main/java/edu/iu/uis/eden/mail/EmailNode.java
          U kew/src/main/java/edu/iu/uis/eden/xml/export/DocumentTypeXmlExporter.java
          U kew/src/main/java/edu/iu/uis/eden/xml/RuleXmlParser.java
          U kew/src/main/java/edu/iu/uis/eden/xml/RuleAttributeXmlParser.java
          U kew/src/main/java/edu/iu/uis/eden/xml/XmlConstants.java
          U kew/src/main/java/edu/iu/uis/eden/xml/DocumentTypeXmlParser.java
          U kew/src/main/java/edu/iu/uis/eden/edl/WorkflowFunctions.java
          U kew/src/main/java/edu/iu/uis/eden/edl/RequestParser.java
          U kew/src/main/java/edu/iu/uis/eden/edl/components/AttributeEDLConfigComponent.java
          U kew/src/main/java/edu/iu/uis/eden/edl/components/GlobalAttributeComponent.java
          A kew/src/main/java/edu/iu/uis/eden/edl/components/PageHandler.java
          U kew/src/main/java/edu/iu/uis/eden/edl/components/WorkflowDocumentState.java
          A kew/src/main/java/edu/iu/uis/eden/edl/components/EstablishUserAction.java
          U kew/src/main/java/edu/iu/uis/eden/edl/components/ValidationComponent.java
          A kew/src/main/java/edu/iu/uis/eden/edl/components/SelectControlEDLComponent.java
          U kew/src/main/java/edu/iu/uis/eden/edl/components/VersioningPreprocessor.java
          U kew/src/main/java/edu/iu/uis/eden/edl/components/WorkflowDocumentActions.java
          U kew/src/main/java/edu/iu/uis/eden/edl/EDLXmlUtils.java
          U kew/src/main/java/edu/iu/uis/eden/edl/EDLContext.java
          U kew/src/main/java/edu/iu/uis/eden/edl/EDLControllerChain.java
          A kew/src/main/java/edu/iu/uis/eden/edl/UserAction.java
          U kew/src/main/config/ddl/indexes/EN_DOC_TYP_T.index.ddl
          A kew/src/main/config/ddl/indexes/EN_EDL_DMP_T.index.ddl
          A kew/src/main/config/ddl/indexes/EN_EDL_FIELD_DMP_T.index.ddl
          U kew/src/main/config/ddl/tables/EN_DOC_TYP_T.table.ddl
          Skipped missing target: 'kew/src/main/config/edoclite/widgets.xml'
          Skipped missing target: 'kew/src/main/config/edoclite'
          U kew/src/main/resources/META-INF/EDLConfig.xml
          U kew/src/main/resources/schema/RuleAttribute.xsd
          U kew/src/main/resources/schema/EDocLiteDef.xsd
          U kew/src/main/resources/schema/DocumentType.xsd
          U kew/src/main/resources/org/kuali/workflow/ojb/OJB-repository-kew.xml
          U kew/src/main/resources/edu/iu/uis/eden/ApplicationResources.properties
          C kew/pom.xml
          C kim-api/pom.xml
          A scripts/upgrades/0.9.1.2 to 0.9.1.3
          A scripts/upgrades/0.9.1.2 to 0.9.1.3/upgrade-0.9.1.2-to-0.9.1.3.sql
          C scripts/createproject.groovy
          Skipped missing target: 'core/src/main/java/org/kuali/rice/RiceConstants.java'
          C core/pom.xml
          Skipped missing target: 'standalone/pom.xml'
          Skipped missing target: 'standalone'
          C pom.xml
          Skipped missing target: 'kns/src/test/webapp/en/WEB-INF/jsp/routelog/ActionRequest.jsp'
          Skipped missing target: 'kns/src/test/webapp/en/WEB-INF/jsp/routelog'
          Skipped missing target: 'kns/src/test/webapp/en/WEB-INF/jsp/doctype/DocumentTypeDisplay.jsp'
          Skipped missing target: 'kns/src/test/webapp/en/WEB-INF/jsp/doctype'
          Skipped missing target: 'kns/src/test/webapp/en/WEB-INF/jsp/docsearch/DocumentSearch.jsp'
          Skipped missing target: 'kns/src/test/webapp/en/WEB-INF/jsp/docsearch'
          Skipped missing target: 'kns/src/test/webapp/en/WEB-INF/jsp'
          Skipped missing target: 'kns/src/test/webapp/en/WEB-INF'
          Skipped missing target: 'kns/src/test/webapp/en/scripts/edoclite1.js'
          Skipped missing target: 'kns/src/test/webapp/en/scripts'
          Skipped missing target: 'kns/src/test/webapp/en'
          Skipped missing target: 'kns/src/test/webapp/WEB-INF/tags/kr/page.tag'
          Skipped missing target: 'kns/src/test/webapp/WEB-INF/tags/kr'
          Skipped missing target: 'kns/src/test/webapp/WEB-INF/tags'
          U kns/src/main/java/org/kuali/core/lookup/KualiLookupableImpl.java
          U kns/src/main/java/org/kuali/core/lookup/LookupableHelperService.java
          C kns/src/main/java/org/kuali/core/lookup/AbstractLookupableHelperServiceImpl.java
          U kns/src/main/java/org/kuali/core/lookup/Lookupable.java
          C kns/src/main/java/org/kuali/core/util/GlobalVariables.java
          C kns/src/main/java/org/kuali/core/web/struts/form/KualiDocumentFormBase.java
          C kns/src/main/java/org/kuali/core/web/struts/form/LookupForm.java
          C kns/src/main/java/org/kuali/core/web/struts/action/KualiRequestProcessor.java
          C kns/pom.xml
          C testharness/pom.xml
          C shared/pom.xml
          C ken/pom.xml

          Show
          ewestfal Eric Westfall added a comment - Merge output: 129-79-44-31:rice-0.9.3 ewestfal$ svn merge -r 3134:HEAD https://test.kuali.org/svn/rice/branches/rice-release-0-9-1-3-br A ksb/src/main/java/edu/iu/uis/eden/messaging/AlternateEndpointLocation.java U ksb/src/main/java/edu/iu/uis/eden/messaging/web/MessageQueueForm.java U ksb/src/main/java/edu/iu/uis/eden/messaging/KEWHttpInvokerServiceExporter.java C ksb/src/main/java/edu/iu/uis/eden/messaging/config/KSBConfigurer.java C ksb/src/main/java/edu/iu/uis/eden/messaging/RemoteResourceServiceLocatorImpl.java C ksb/pom.xml C kim/pom.xml A kew/src/test/java/edu/iu/uis/eden/routetemplate/UniversityIdRoleAttributeTest.java A kew/src/test/java/edu/iu/uis/eden/routetemplate/NetworkIdRoleAttributeTest.java U kew/src/test/java/edu/iu/uis/eden/docsearch/DocumentSearchTest.java C kew/src/test/java/edu/iu/uis/eden/xml/DocumentTypeXmlParserTest.java A kew/src/test/resources/edu/iu/uis/eden/routetemplate/UniversityIdRoleAttributeTestConfig.xml A kew/src/test/resources/edu/iu/uis/eden/routetemplate/NetworkIdRoleAttributeTestConfig.xml A kew/src/test/resources/edu/iu/uis/eden/routetemplate/ParameterizedUniversityIdRoleAttributeTestConfig.xml A kew/src/test/resources/edu/iu/uis/eden/routetemplate/ParameterizedNetworkIdRoleAttributeTestConfig.xml A kew/src/test/resources/edu/iu/uis/eden/docsearch/DocSearchTest_RouteNode.xml U kew/src/test/resources/edu/iu/uis/eden/docsearch/SearchAttributeConfig.xml A kew/src/test/resources/edu/iu/uis/eden/xml/ReportingWorkgroupName.xml C kew/src/main/java/edu/iu/uis/eden/routetemplate/RuleTemplate.java U kew/src/main/java/edu/iu/uis/eden/routetemplate/InitiatorRoleAttribute.java A kew/src/main/java/edu/iu/uis/eden/routetemplate/NetworkIdRoleAttribute.java C kew/src/main/java/edu/iu/uis/eden/routetemplate/FlexRM.java A kew/src/main/java/edu/iu/uis/eden/routetemplate/UniversityIdRoleAttribute.java U kew/src/main/java/edu/iu/uis/eden/routetemplate/RuleResponsibility.java A kew/src/main/java/edu/iu/uis/eden/routetemplate/AbstractIdRoleAttribute.java U kew/src/main/java/edu/iu/uis/eden/lookupable/EDocLiteLookupable.java C kew/src/main/java/edu/iu/uis/eden/doctype/DocumentType.java U kew/src/main/java/edu/iu/uis/eden/doctype/dao/DocumentTypeDAOOjbImpl.java U kew/src/main/java/edu/iu/uis/eden/doctype/DocumentTypePolicyEnum.java U kew/src/main/java/edu/iu/uis/eden/docsearch/DocumentSearchServiceImpl.java U kew/src/main/java/edu/iu/uis/eden/docsearch/StandardDocumentSearchResultProcessor.java U kew/src/main/java/edu/iu/uis/eden/docsearch/StandardDocumentSearchGenerator.java C kew/src/main/java/edu/iu/uis/eden/superuser/web/SuperUserAction.java U kew/src/main/java/edu/iu/uis/eden/engine/node/FYIByUniversityId.java U kew/src/main/java/edu/iu/uis/eden/engine/node/FYIByNetworkId.java U kew/src/main/java/edu/iu/uis/eden/util/XmlHelper.java U kew/src/main/java/edu/iu/uis/eden/EdenConstants.java U kew/src/main/java/edu/iu/uis/eden/server/WorkflowUtilityWebServiceImpl.java U kew/src/main/java/edu/iu/uis/eden/server/WorkflowDocumentActions.java U kew/src/main/java/edu/iu/uis/eden/server/WorkflowDocumentActionsWebServiceImpl.java U kew/src/main/java/edu/iu/uis/eden/server/WorkflowUtility.java Skipped missing target: 'kew/src/main/java/edu/iu/uis/eden/messaging/KSBExporter.java' U kew/src/main/java/edu/iu/uis/eden/clientapp/WorkflowInfo.java A kew/src/main/java/edu/iu/uis/eden/mail/EmailStyleHelper.java U kew/src/main/java/edu/iu/uis/eden/mail/ActionListImmediateProcessorImpl.java C kew/src/main/java/edu/iu/uis/eden/mail/StyleableEmailContentServiceImpl.java A kew/src/main/java/edu/iu/uis/eden/mail/EmailNode.java U kew/src/main/java/edu/iu/uis/eden/xml/export/DocumentTypeXmlExporter.java U kew/src/main/java/edu/iu/uis/eden/xml/RuleXmlParser.java U kew/src/main/java/edu/iu/uis/eden/xml/RuleAttributeXmlParser.java U kew/src/main/java/edu/iu/uis/eden/xml/XmlConstants.java U kew/src/main/java/edu/iu/uis/eden/xml/DocumentTypeXmlParser.java U kew/src/main/java/edu/iu/uis/eden/edl/WorkflowFunctions.java U kew/src/main/java/edu/iu/uis/eden/edl/RequestParser.java U kew/src/main/java/edu/iu/uis/eden/edl/components/AttributeEDLConfigComponent.java U kew/src/main/java/edu/iu/uis/eden/edl/components/GlobalAttributeComponent.java A kew/src/main/java/edu/iu/uis/eden/edl/components/PageHandler.java U kew/src/main/java/edu/iu/uis/eden/edl/components/WorkflowDocumentState.java A kew/src/main/java/edu/iu/uis/eden/edl/components/EstablishUserAction.java U kew/src/main/java/edu/iu/uis/eden/edl/components/ValidationComponent.java A kew/src/main/java/edu/iu/uis/eden/edl/components/SelectControlEDLComponent.java U kew/src/main/java/edu/iu/uis/eden/edl/components/VersioningPreprocessor.java U kew/src/main/java/edu/iu/uis/eden/edl/components/WorkflowDocumentActions.java U kew/src/main/java/edu/iu/uis/eden/edl/EDLXmlUtils.java U kew/src/main/java/edu/iu/uis/eden/edl/EDLContext.java U kew/src/main/java/edu/iu/uis/eden/edl/EDLControllerChain.java A kew/src/main/java/edu/iu/uis/eden/edl/UserAction.java U kew/src/main/config/ddl/indexes/EN_DOC_TYP_T.index.ddl A kew/src/main/config/ddl/indexes/EN_EDL_DMP_T.index.ddl A kew/src/main/config/ddl/indexes/EN_EDL_FIELD_DMP_T.index.ddl U kew/src/main/config/ddl/tables/EN_DOC_TYP_T.table.ddl Skipped missing target: 'kew/src/main/config/edoclite/widgets.xml' Skipped missing target: 'kew/src/main/config/edoclite' U kew/src/main/resources/META-INF/EDLConfig.xml U kew/src/main/resources/schema/RuleAttribute.xsd U kew/src/main/resources/schema/EDocLiteDef.xsd U kew/src/main/resources/schema/DocumentType.xsd U kew/src/main/resources/org/kuali/workflow/ojb/OJB-repository-kew.xml U kew/src/main/resources/edu/iu/uis/eden/ApplicationResources.properties C kew/pom.xml C kim-api/pom.xml A scripts/upgrades/0.9.1.2 to 0.9.1.3 A scripts/upgrades/0.9.1.2 to 0.9.1.3/upgrade-0.9.1.2-to-0.9.1.3.sql C scripts/createproject.groovy Skipped missing target: 'core/src/main/java/org/kuali/rice/RiceConstants.java' C core/pom.xml Skipped missing target: 'standalone/pom.xml' Skipped missing target: 'standalone' C pom.xml Skipped missing target: 'kns/src/test/webapp/en/WEB-INF/jsp/routelog/ActionRequest.jsp' Skipped missing target: 'kns/src/test/webapp/en/WEB-INF/jsp/routelog' Skipped missing target: 'kns/src/test/webapp/en/WEB-INF/jsp/doctype/DocumentTypeDisplay.jsp' Skipped missing target: 'kns/src/test/webapp/en/WEB-INF/jsp/doctype' Skipped missing target: 'kns/src/test/webapp/en/WEB-INF/jsp/docsearch/DocumentSearch.jsp' Skipped missing target: 'kns/src/test/webapp/en/WEB-INF/jsp/docsearch' Skipped missing target: 'kns/src/test/webapp/en/WEB-INF/jsp' Skipped missing target: 'kns/src/test/webapp/en/WEB-INF' Skipped missing target: 'kns/src/test/webapp/en/scripts/edoclite1.js' Skipped missing target: 'kns/src/test/webapp/en/scripts' Skipped missing target: 'kns/src/test/webapp/en' Skipped missing target: 'kns/src/test/webapp/WEB-INF/tags/kr/page.tag' Skipped missing target: 'kns/src/test/webapp/WEB-INF/tags/kr' Skipped missing target: 'kns/src/test/webapp/WEB-INF/tags' U kns/src/main/java/org/kuali/core/lookup/KualiLookupableImpl.java U kns/src/main/java/org/kuali/core/lookup/LookupableHelperService.java C kns/src/main/java/org/kuali/core/lookup/AbstractLookupableHelperServiceImpl.java U kns/src/main/java/org/kuali/core/lookup/Lookupable.java C kns/src/main/java/org/kuali/core/util/GlobalVariables.java C kns/src/main/java/org/kuali/core/web/struts/form/KualiDocumentFormBase.java C kns/src/main/java/org/kuali/core/web/struts/form/LookupForm.java C kns/src/main/java/org/kuali/core/web/struts/action/KualiRequestProcessor.java C kns/pom.xml C testharness/pom.xml C shared/pom.xml C ken/pom.xml
          Hide
          ewestfal Eric Westfall added a comment -

          This has been merged and committed at revision 4008.

          Show
          ewestfal Eric Westfall added a comment - This has been merged and committed at revision 4008.

            People

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

              Dates

              • Created:
                Updated:
                Resolved:

                Time Tracking

                Estimated:
                Original Estimate - 1 hour
                1h
                Remaining:
                Remaining Estimate - 1 hour
                1h
                Logged:
                Time Spent - Not Specified
                Not Specified