Uploaded image for project: 'Kuali Rice Development'
  1. Kuali Rice Development
  2. KULRICE-2147

Merge latest 0.9.3 changes into 0.9.4 prior to re-modularization

    Details

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

      Description

      Before working on the remodularization effort, we need to merge the changes made to 0.9.3 since 0.9.4 was branched from it.

        Attachments

          Issue Links

            Activity

            Hide
            ewestfal Eric Westfall added a comment - - edited

            Start revision of 0.9.3 prior to this merge is 4239.

            Show
            ewestfal Eric Westfall added a comment - - edited Start revision of 0.9.3 prior to this merge is 4239.
            Hide
            ewestfal Eric Westfall added a comment -

            Initial revision on 0.9.4 is 4032 which is where we need to merge changes after on 0.9.3. So merge command into 0.9.4 will be

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

            Show
            ewestfal Eric Westfall added a comment - Initial revision on 0.9.4 is 4032 which is where we need to merge changes after on 0.9.3. So merge command into 0.9.4 will be svn merge -r 4032:HEAD https://test.kuali.org/svn/rice/branches/rice-release-0-9-3-br
            Hide
            ewestfal Eric Westfall added a comment -

            Additionally, target revision of 0.9.4 into which merge is happening is 4239 as well.

            Show
            ewestfal Eric Westfall added a comment - Additionally, target revision of 0.9.4 into which merge is happening is 4239 as well.
            Hide
            ewestfal Eric Westfall added a comment -

            Merge output:

            129-79-44-31:rice-0.9.4 ewestfal$ svn merge -r 4032:HEAD https://test.kuali.org/svn/rice/branches/rice-release-0-9-3-br
            U scripts/ddl/mysql.ddl
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/Parameter.xml
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/DocumentType.xml
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/digesterRules.xml
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/ParameterMaintenanceDocument.xml
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/DocumentStatus.xml
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/DocumentTypeMaintenanceDocument.xml
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/RiceUserMaintenanceDocument.xml
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/EmployeeTypeMaintenanceDocument.xml
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/EmployeeStatusMaintenanceDocument.xml
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/dataDictionary-1_0.dtd
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/Attachment.xml
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/BusinessObjectAttributeEntry.xml
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/CampusType.xml
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/controlRules.xml
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/CampusTypeMaintenanceDocument.xml
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/ParameterNamespace.xml
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/AttributeReferenceDummy.xml
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/files-to-convert-sample.txt
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/ParameterDetailType.xml
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/UniversalUser.xml
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/NoteType.xml
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/authorizationRules.xml
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/RiceUser.xml
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/EmployeeType.xml
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/ParameterType.xml
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/EmployeeStatus.xml
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/ParameterTypeMaintenanceDocument.xml
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/AdHocRoutePerson.xml
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/DocumentHeader.xml
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/Campus.xml
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/CampusMaintenanceDocument.xml
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/DocumentGroup.xml
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/ParameterNamespaceMaintenanceDocument.xml
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/validationPatternRules.xml
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/Note.xml
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/ParameterDetailTypeMaintenanceDocument.xml
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/UniversalUserMaintenanceDocument.xml
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/attributePatternRules.xml
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/AdHocRouteWorkgroup.xml
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/files-to-convert.txt
            D scripts/upgrades/0.9.2 to 0.9.3/datadictionary
            U scripts/upgrades/0.9.2 to 0.9.3/kns-upgrade-0.9.2-to-0.9.3.sql
            D core/src/main/java/org/kuali/rice/util/TargetedInvocationHandler.java
            U core/src/main/java/org/kuali/rice/util/RiceConstants.java
            U core/src/main/java/org/kuali/rice/util/ClassLoaderUtils.java
            U core/src/main/java/org/kuali/rice/web/jetty/JettyServer.java
            C pom.xml
            U kns/src/test/java/org/kuali/test/KNSTestBase.java
            U kns/src/test/java/org/kuali/core/service/DictionaryValidationServiceTest.java
            U kns/src/test/java/org/kuali/core/lookup/KualiLookupableTest.java
            U kns/src/test/java/org/kuali/core/util/KualiDecimalTest.java
            A kns/src/test/java/org/kuali/core/util/KualiPercentTest.java
            U kns/src/test/resources/META-INF/kns-test-config.xml
            U kns/src/test/resources/KNSDefaultTestData.sql
            U kns/src/test/resources/KNSDefaultTestData.xml
            D kns/src/main/java/org/kuali/rice/database/XAPoolDataSource.java
            D kns/src/main/java/org/kuali/rice/database
            U kns/src/main/java/org/kuali/rice/testharness/KNSTestCase.java
            U kns/src/main/java/org/kuali/rice/TestBase.java
            U kns/src/main/java/org/kuali/rice/kns/util/KNSConstants.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/HelpDefinition.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/MaintenanceDocumentEntry.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/ApcRuleDefinition.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/BusinessObjectEntry.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/CollectionDefinition.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/ReferenceDefinition.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/HeaderNavigation.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/FieldPairDefinition.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/InquiryDefinition.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/SubSectionHeaderDefinitionI.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/AttributeDefinition.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/CollectionDefinitionI.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/WorkflowProperty.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/DataDictionaryUtils.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/MaintainableSectionDefinition.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/LookupDefinition.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/TransactionalDocumentEntry.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/DataDictionaryConverter.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/ParseException.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/FieldDefinition.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/WorkflowPropertyGroup.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/InquirySectionDefinition.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/DataDictionary.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/DocumentEntry.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/SortDefinition.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/MaintainableFieldDefinition.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/DataDictionaryDefinitionBase.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/MaintainableSubSectionHeaderDefinition.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/FieldDefinitionI.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/PrimitiveAttributeDefinition.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/ValidationCompletionUtils.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/DataDictionaryDefinition.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/XmlErrorHandler.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/MaintainableCollectionDefinition.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/AuthorizationDefinition.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/SupportAttributeDefinition.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/RelationshipDefinition.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/MaintainableItemDefinition.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/DataDictionaryEntryBase.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/DataDictionaryException.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/package.html
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/InquirySubSectionHeaderDefinition.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/DataDictionaryEntry.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/InitException.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/InquiryCollectionDefinition.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/WorkflowProperties.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/AttributeReferenceDefinition.java
            D kns/src/main/java/org/kuali/core/datadictionary/conversion/files-to-convert.txt
            D kns/src/main/java/org/kuali/core/datadictionary/conversion
            U kns/src/main/java/org/kuali/core/datadictionary/exporter/DocumentEntryMapper.java
            U kns/src/main/java/org/kuali/core/bo/DocumentHeader.java
            U kns/src/main/java/org/kuali/core/authorization/AuthorizationStore.java
            U kns/src/main/java/org/kuali/core/service/impl/PersistenceServiceOjbImpl.java
            U kns/src/main/java/org/kuali/core/service/impl/DocumentTypeServiceImpl.java
            U kns/src/main/java/org/kuali/core/util/AbstractKualiDecimal.java
            U kns/src/main/java/org/kuali/core/web/struts/form/KualiDocumentFormBase.java
            U kns/src/main/java/org/kuali/core/web/struts/form/KualiForm.java
            U kns/src/main/java/org/kuali/core/web/format/PercentageFormatter.java
            U kns/src/main/java/org/kuali/core/web/ui/SectionBridge.java
            U kns/src/main/java/org/kuali/core/web/ui/HeaderField.java
            C kns/src/main/config/sql/rice_db_bootstrap.sql
            C kns/src/main/config/sql/rice_sampleapp_create.sql
            C kns/src/main/config/sql/rice_sampleapp_destroy.sql
            C kns/src/main/config/sql/rice_db_destroy.sql
            U kns/src/main/config/xml/RiceBootstrapData.xml
            U kns/src/main/config/xml/RiceSampleAppWorkflowBootstrap.xml
            U kns/src/main/config/xml/RiceSampleAppData.xml
            A kns/src/main/resources/KR-ApplicationResources.properties
            U kns/src/main/resources/org/kuali/core/bo/datadictionary/PessimisticLock.xml
            U tools/src/test/java/org/kuali/workflow/tools/xml/XmlGenTest.java
            A tools/src/test/resources
            A tools/src/test/resources/org
            A tools/src/test/resources/org/kuali
            A tools/src/test/resources/org/kuali/workflow
            A tools/src/test/resources/org/kuali/workflow/tools
            A tools/src/test/resources/org/kuali/workflow/tools/xml
            A tools/src/test/resources/org/kuali/workflow/tools/xml/05-OfficeOfAffirmativeActionSchoolAcknowledgementRuleTemplate.xml
            A tools/src/test/resources/org/kuali/workflow/tools/xml/02-EdocliteSchoolAttribute.xml
            A tools/src/test/resources/org/kuali/workflow/tools/xml/xmlgen-test-1.xml
            A tools/src/test/resources/org/kuali/workflow/tools/xml/03-OfficeOfAffirmativeActionInitiatorAcknowledgmentRuleTemplate.xml
            A tools/src/test/resources/org/kuali/workflow/tools/xml/07-OfficeOfAffirmativeActionViceChancellorRuleTemplate.xml
            A tools/src/test/resources/org/kuali/workflow/tools/xml/09-OfferRequestDocType.xml
            A tools/src/test/resources/org/kuali/workflow/tools/xml/08-OfficeOfAffirmativeActionDocType.xml
            A tools/src/test/resources/org/kuali/workflow/tools/xml/06-OfficeOfAffirmativeActionSchoolRuleTemplate.xml
            A tools/src/test/resources/org/kuali/workflow/tools/xml/01-EdocliteInitiatorAttribute.xml
            A tools/src/test/resources/org/kuali/workflow/tools/xml/04-OfficeOfAffirmativeActionOfficerRuleTemplate.xml
            A tools/src/main/java/org/kuali/core
            A tools/src/main/java/org/kuali/core/datadictionary
            A tools/src/main/java/org/kuali/core/datadictionary/conversion
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/HelpDefinition.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/MaintenanceDocumentEntry.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/ApcRuleDefinition.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/BusinessObjectEntry.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/CollectionDefinition.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/ReferenceDefinition.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/HeaderNavigation.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/FieldPairDefinition.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/InquiryDefinition.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/SubSectionHeaderDefinitionI.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/AttributeDefinition.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/CollectionDefinitionI.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/WorkflowProperty.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/DataDictionaryUtils.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/MaintainableSectionDefinition.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/LookupDefinition.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/TransactionalDocumentEntry.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/DataDictionaryConverter.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/ParseException.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/FieldDefinition.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/WorkflowPropertyGroup.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/InquirySectionDefinition.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/DataDictionary.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/DocumentEntry.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/SortDefinition.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/MaintainableFieldDefinition.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/DataDictionaryDefinitionBase.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/MaintainableSubSectionHeaderDefinition.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/FieldDefinitionI.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/PrimitiveAttributeDefinition.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/ValidationCompletionUtils.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/DataDictionaryDefinition.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/XmlErrorHandler.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/MaintainableCollectionDefinition.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/AuthorizationDefinition.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/SupportAttributeDefinition.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/RelationshipDefinition.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/MaintainableItemDefinition.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/DataDictionaryEntryBase.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/DataDictionaryException.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/package.html
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/InquirySubSectionHeaderDefinition.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/DataDictionaryEntry.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/InitException.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/InquiryCollectionDefinition.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/WorkflowProperties.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/AttributeReferenceDefinition.java
            A tools/src/main/java/org/kuali/core/datadictionary/conversion/files-to-convert.txt
            A tools/src/main/java/org/kuali/core/bo
            A tools/src/main/java/org/kuali/core/bo/DocumentStatus.java
            A tools/src/main/java/org/kuali/core/bo/DocumentGroup.java
            A tools/src/main/resources
            A tools/src/main/resources/org
            A tools/src/main/resources/org/kuali
            A tools/src/main/resources/org/kuali/core
            A tools/src/main/resources/org/kuali/core/datadictionary
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/Parameter.xml
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/DocumentType.xml
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/digesterRules.xml
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/ParameterMaintenanceDocument.xml
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/DocumentStatus.xml
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/DocumentTypeMaintenanceDocument.xml
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/RiceUserMaintenanceDocument.xml
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/EmployeeTypeMaintenanceDocument.xml
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/EmployeeStatusMaintenanceDocument.xml
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/dataDictionary-1_0.dtd
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/Attachment.xml
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/BusinessObjectAttributeEntry.xml
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/CampusType.xml
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/controlRules.xml
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/CampusTypeMaintenanceDocument.xml
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/ParameterNamespace.xml
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/AttributeReferenceDummy.xml
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/files-to-convert-sample.txt
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/ParameterDetailType.xml
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/UniversalUser.xml
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/NoteType.xml
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/authorizationRules.xml
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/RiceUser.xml
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/EmployeeType.xml
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/ParameterType.xml
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/EmployeeStatus.xml
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/ParameterTypeMaintenanceDocument.xml
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/AdHocRoutePerson.xml
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/DocumentHeader.xml
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/Campus.xml
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/CampusMaintenanceDocument.xml
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/DocumentGroup.xml
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/ParameterNamespaceMaintenanceDocument.xml
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/validationPatternRules.xml
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/Note.xml
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/ParameterDetailTypeMaintenanceDocument.xml
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/UniversalUserMaintenanceDocument.xml
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/attributePatternRules.xml
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/AdHocRouteWorkgroup.xml
            A tools/src/main/resources/org/kuali/core/datadictionary/conversion/files-to-convert.txt
            A tools/pom.xml
            U tools
            C .classpath
            U testharness/src/main/java/org/kuali/rice/test/lifecycles/JettyServerLifecycle.java
            U testharness/src/main/java/org/kuali/rice/test/RiceTestCase.java
            U testharness/src/main/java/org/kuali/rice/test/DerbyDBCreationLifecycle.java
            A kim-authn-sesn/src/main/config
            A kim-authn-sesn/src/main/config/ddl
            A kim-authn-sesn/src/main/config/ddl/indexes
            A kim-authn-sesn/src/main/config/ddl/indexes/KIM_AUTHN_SESN_T.index.ddl
            A kim-authn-sesn/src/main/config/ddl/indexes/KIM_AUTHN_SESN_PRINCIPAL_T.index.ddl
            A kim-authn-sesn/src/main/config/ddl/tables
            A kim-authn-sesn/src/main/config/ddl/tables/KIM_AUTHN_SESN_T.table.ddl
            A kim-authn-sesn/src/main/config/ddl/tables/KIM_AUTHN_SESN_PRINCIPAL_T.table.ddl
            C kim-authn-sesn/pom.xml
            A licenses/carol-2.0.5-src.tgz
            A licenses/xapool-1.5.0-src.zip
            A licenses/xapool-303462.patch
            A licenses/xapool-README.txt
            A shared/src/main/java/org/kuali/rice/database/XAPoolDataSource.java
            U server/src/test/java/org/kuali/rice/server/test/ServerTestBase.java
            U server/src/test/java/org/kuali/rice/server/test/WebTestBase.java
            U server/src/test/java/org/kuali/rice/server/BaseLineAppStartTest.java
            U server/src/test/java/org/kuali/rice/server/lookup/WebLookupTest.java
            U server/src/test/java/org/kuali/rice/server/document/WebActionTest.java
            U server/src/test/java/org/kuali/rice/ken/KENWebServiceTest.java
            U server/src/test/java/edu/sampleu/travel/web/form/TravelDocumentForm2.java
            U server/src/test/resources/configurationServiceData.xml
            U server/src/test/resources/ServerDefaultTestData.sql
            U server/src/test/resources/ServerDefaultTestData.xml
            A server/src/test/resources/KENSpringBeans-test.xml
            U server/src/test/resources/edu/sampleu/travel/datadictionary/TravelRequestDocument.xml
            D server/src/main/config/WEB-INF/classes/KR-ApplicationResources.properties
            U server/src/main/config/index.html
            U server/src/main/resources/configurationServiceData.xml
            U server/src/main/webapp/en/scripts/edoclite1.js
            U server/src/main/webapp/WEB-INF/jsp/travelDocument2.jsp
            C server/src/main/webapp/WEB-INF/tags/kr/page.tag
            A server/src/main/webapp/WEB-INF/tags/kr/lockMessages.tag
            U server/src/main/webapp/WEB-INF/tags/kr/rowDisplay.tag
            U server/src/main/webapp/WEB-INF/tags/kr/tab.tag
            U server/src/main/webapp/WEB-INF/tags/kr/documentPage.tag
            U server/src/main/webapp/index.html
            U server/src/main/webapp/kr/scripts/core.js
            U server/src/main/webapp/kr/css/kuali.css
            U ken/src/test/java/org/kuali/notification/services/impl/NotificationMessageDeliveryResolverServiceImplTest.java
            U ken/src/main/java/org/kuali/notification/service/impl/SendNotificationServiceKewXmlImpl.java
            U ksb/src/test/resources/META-INF/ksb-test-config.xml
            U ksb/src/test/resources/db/derby/bus.sql
            U ksb/src/test/resources/edu/iu/uis/eden/testclient1/resources/TestClient1SpringBeans.xml
            U ksb/src/main/java/edu/iu/uis/eden/messaging/ServiceDefinition.java
            U ksb/src/main/java/edu/iu/uis/eden/messaging/KEWHttpInvokerServiceExporter.java
            U ksb/src/main/java/edu/iu/uis/eden/messaging/ServiceInfo.java
            U kim/src/test/java/org/kuali/rice/kim/test/KIMDaoTestBase.java
            U kim/src/test/java/org/kuali/rice/kim/test/KIMTestCase.java
            A kim/src/test/java/org/kuali/rice/kim/service/AuthorizationServiceTest.java
            U kim/src/test/java/org/kuali/rice/kim/service/PrincipalServiceTest.java
            U kim/src/test/java/org/kuali/rice/kim/service/RoleServiceTest.java
            U kim/src/test/java/org/kuali/rice/kim/service/QualifiedRoleServiceTest.java
            U kim/src/test/java/org/kuali/rice/kim/service/PersonServiceTest.java
            U kim/src/test/java/org/kuali/rice/kim/service/GroupServiceTest.java
            U kim/src/test/java/org/kuali/rice/kim/service/NamespaceServiceTest.java
            U kim/src/test/resources/META-INF/kim-test-config.xml
            U kim/src/test/resources/DefaultTestData.sql
            U kim/src/main/java/org/kuali/rice/kim/bo/PrincipalQualifiedRoleAttribute.java
            U kim/src/main/java/org/kuali/rice/kim/bo/Entity.java
            U kim/src/main/java/org/kuali/rice/kim/bo/GroupQualifiedRoleAttribute.java
            A kim/src/main/java/org/kuali/rice/kim/inquiry/EntityInquirable.java
            U kim/src/main/java/org/kuali/rice/kim/service/impl/ImplUtils.java
            A kim/src/main/java/org/kuali/rice/kim/service/impl/AuthorizationServiceImpl.java
            U kim/src/main/java/org/kuali/rice/kim/service/impl/RoleServiceImpl.java
            U kim/src/main/java/org/kuali/rice/kim/service/impl/QualifiedRoleServiceImpl.java
            U kim/src/main/java/org/kuali/rice/kim/dao/KIMServicesDaoJpa.java
            U kim/src/main/java/org/kuali/rice/kim/dao/KIMServicesDaoOjb.java
            U kim/src/main/java/org/kuali/rice/kim/dao/KIMServicesDao.java
            U kim/src/main/java/org/kuali/rice/kim/dao/KIMServicesDaoProxy.java
            A kim/src/main/java/org/kuali/rice/kim/lookup/PrincipalLookupable.java
            A kim/src/main/java/org/kuali/rice/kim/lookup/valuefinder/EntityTypeDefaultValueFinder.java
            U kim/src/main/java/org/kuali/rice/kim/lookup/valuefinder/GroupTypeDefaultValueFinder.java
            U kim/src/main/java/org/kuali/rice/kim/util/KIMConstants.java
            A kim/src/main/java/org/kuali/rice/kim/web/form/EntityAttributeForm.java
            U kim/src/main/java/org/kuali/rice/kim/document/maintenance/EntityMaintainable.java
            U kim/src/main/java/org/kuali/rice/kim/document/maintenance/GroupMaintainable.java
            U kim/src/main/java/org/kuali/rice/kim/document/maintenance/PrincipalMaintainable.java
            U kim/src/main/java/org/kuali/rice/kim/document/maintenance/RoleMaintainable.java
            A kim/src/main/java/org/kuali/rice/kim/document/rule/RoleMaintenanceDocumentRule.java
            A kim/src/main/resources/KIM-ApplicationResources.properties
            A kim/src/main/resources/org/kuali/rice/kim/bo/datadictionary/EntityAttributeForm.xml
            U kim/src/main/resources/org/kuali/rice/kim/bo/datadictionary/RoleAttribute.xml
            U kim/src/main/resources/org/kuali/rice/kim/bo/datadictionary/Group.xml
            U kim/src/main/resources/org/kuali/rice/kim/bo/datadictionary/GroupType.xml
            U kim/src/main/resources/org/kuali/rice/kim/bo/datadictionary/Role.xml
            U kim/src/main/resources/org/kuali/rice/kim/bo/datadictionary/Entity.xml
            U kim/src/main/resources/org/kuali/rice/kim/bo/datadictionary/EntityType.xml
            U kim/src/main/resources/org/kuali/rice/kim/document/datadictionary/RoleMaintenanceDocument.xml
            U kim/src/main/resources/org/kuali/rice/kim/document/datadictionary/EntityMaintenanceDocument.xml
            U kim/src/main/resources/org/kuali/rice/kim/document/datadictionary/GroupMaintenanceDocument.xml
            U kim/src/main/resources/KIMSpringBeans.xml
            U kew/src/test/java/org/kuali/workflow/test/KEWTestCase.java
            U kew/src/test/java/edu/iu/uis/eden/routetemplate/RuleTemplateAttributeTest.java
            U kew/src/test/java/edu/iu/uis/eden/docsearch/CustomDocumentSearchGeneratorTest.java
            U kew/src/test/java/edu/iu/uis/eden/docsearch/CustomDocumentSearchResultProcessorTest.java
            U kew/src/test/java/edu/iu/uis/eden/plugin/ZipFilePluginLoaderTest.java
            U kew/src/test/java/edu/iu/uis/eden/applicationconstants/ApplicationConstantsJPAOJBTest.java
            U kew/src/test/java/edu/iu/uis/eden/actions/FutureRequestsTest.java
            U kew/src/test/java/edu/iu/uis/eden/actions/SuperUserActionInvalidPostProcessor.java
            U kew/src/test/java/edu/iu/uis/eden/edl/EDocLitePostProcessorTest.java
            C kew/src/test/java/edu/iu/uis/eden/server/WorkflowUtilityTest.java
            U kew/src/test/java/edu/iu/uis/eden/helpentry/HelpEntryJpaOjbTest.java
            U kew/src/test/resources/edu/iu/uis/eden/server/WorkflowUtilityConfig.xml
            U kew/src/main/java/edu/iu/uis/eden/routetemplate/RuleImpl.java
            U kew/src/main/java/edu/iu/uis/eden/routetemplate/FlexRM.java
            U kew/src/main/java/edu/iu/uis/eden/lookupable/DocumentTypeLookupableImpl.java
            U kew/src/main/java/edu/iu/uis/eden/docsearch/DocumentSearchServiceImpl.java
            U kew/src/main/java/edu/iu/uis/eden/docsearch/StandardDocumentSearchCriteriaProcessor.java
            U kew/src/main/java/edu/iu/uis/eden/docsearch/DocSearchUtils.java
            U kew/src/main/java/edu/iu/uis/eden/docsearch/DocSearchCriteriaVO.java
            U kew/src/main/java/edu/iu/uis/eden/docsearch/StandardDocumentSearchResultProcessor.java
            U kew/src/main/java/edu/iu/uis/eden/docsearch/DocumentSearchService.java
            U kew/src/main/java/edu/iu/uis/eden/docsearch/StandardDocumentSearchGenerator.java
            U kew/src/main/java/edu/iu/uis/eden/engine/WorkflowEngine.java
            U kew/src/main/java/edu/iu/uis/eden/engine/node/RequestActivationNode.java
            U kew/src/main/java/edu/iu/uis/eden/engine/node/NodeType.java
            U kew/src/main/java/edu/iu/uis/eden/engine/RouteHelper.java
            D kew/src/main/java/edu/iu/uis/eden/util/ClassLoaderUtils.java
            U kew/src/main/java/edu/iu/uis/eden/util/XmlHelper.java
            U kew/src/main/java/edu/iu/uis/eden/batch/KEWXmlDataLoaderLifecycle.java
            U kew/src/main/java/edu/iu/uis/eden/core/BootstrapFilter.java
            U kew/src/main/java/edu/iu/uis/eden/plugin/ServiceOverrideAutoProxyCreator.java
            U kew/src/main/java/edu/iu/uis/eden/plugin/ServerPluginRegistry.java
            U kew/src/main/java/edu/iu/uis/eden/plugin/BasePluginLoader.java
            U kew/src/main/java/edu/iu/uis/eden/plugin/HotDeployer.java
            U kew/src/main/java/edu/iu/uis/eden/server/WorkflowUtilityWebServiceImpl.java
            U kew/src/main/java/edu/iu/uis/eden/server/BeanConverter.java
            U kew/src/main/java/edu/iu/uis/eden/messaging/RouteDocumentMessageService.java
            U kew/src/main/java/edu/iu/uis/eden/clientapp/vo/DocumentSearchCriteriaVO.java
            U kew/src/main/java/edu/iu/uis/eden/actionitem/ActionItem.java
            U kew/src/main/java/edu/iu/uis/eden/actions/ActionRegistryImpl.java
            U kew/src/main/java/edu/iu/uis/eden/actions/ActionTakenEvent.java
            U kew/src/main/config/xml/KEWBootstrap.xml

            Show
            ewestfal Eric Westfall added a comment - Merge output: 129-79-44-31:rice-0.9.4 ewestfal$ svn merge -r 4032:HEAD https://test.kuali.org/svn/rice/branches/rice-release-0-9-3-br U scripts/ddl/mysql.ddl D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/Parameter.xml D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/DocumentType.xml D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/digesterRules.xml D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/ParameterMaintenanceDocument.xml D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/DocumentStatus.xml D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/DocumentTypeMaintenanceDocument.xml D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/RiceUserMaintenanceDocument.xml D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/EmployeeTypeMaintenanceDocument.xml D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/EmployeeStatusMaintenanceDocument.xml D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/dataDictionary-1_0.dtd D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/Attachment.xml D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/BusinessObjectAttributeEntry.xml D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/CampusType.xml D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/controlRules.xml D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/CampusTypeMaintenanceDocument.xml D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/ParameterNamespace.xml D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/AttributeReferenceDummy.xml D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/files-to-convert-sample.txt D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/ParameterDetailType.xml D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/UniversalUser.xml D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/NoteType.xml D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/authorizationRules.xml D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/RiceUser.xml D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/EmployeeType.xml D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/ParameterType.xml D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/EmployeeStatus.xml D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/ParameterTypeMaintenanceDocument.xml D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/AdHocRoutePerson.xml D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/DocumentHeader.xml D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/Campus.xml D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/CampusMaintenanceDocument.xml D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/DocumentGroup.xml D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/ParameterNamespaceMaintenanceDocument.xml D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/validationPatternRules.xml D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/Note.xml D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/ParameterDetailTypeMaintenanceDocument.xml D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/UniversalUserMaintenanceDocument.xml D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/attributePatternRules.xml D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/AdHocRouteWorkgroup.xml D scripts/upgrades/0.9.2 to 0.9.3/datadictionary/files-to-convert.txt D scripts/upgrades/0.9.2 to 0.9.3/datadictionary U scripts/upgrades/0.9.2 to 0.9.3/kns-upgrade-0.9.2-to-0.9.3.sql D core/src/main/java/org/kuali/rice/util/TargetedInvocationHandler.java U core/src/main/java/org/kuali/rice/util/RiceConstants.java U core/src/main/java/org/kuali/rice/util/ClassLoaderUtils.java U core/src/main/java/org/kuali/rice/web/jetty/JettyServer.java C pom.xml U kns/src/test/java/org/kuali/test/KNSTestBase.java U kns/src/test/java/org/kuali/core/service/DictionaryValidationServiceTest.java U kns/src/test/java/org/kuali/core/lookup/KualiLookupableTest.java U kns/src/test/java/org/kuali/core/util/KualiDecimalTest.java A kns/src/test/java/org/kuali/core/util/KualiPercentTest.java U kns/src/test/resources/META-INF/kns-test-config.xml U kns/src/test/resources/KNSDefaultTestData.sql U kns/src/test/resources/KNSDefaultTestData.xml D kns/src/main/java/org/kuali/rice/database/XAPoolDataSource.java D kns/src/main/java/org/kuali/rice/database U kns/src/main/java/org/kuali/rice/testharness/KNSTestCase.java U kns/src/main/java/org/kuali/rice/TestBase.java U kns/src/main/java/org/kuali/rice/kns/util/KNSConstants.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/HelpDefinition.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/MaintenanceDocumentEntry.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/ApcRuleDefinition.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/BusinessObjectEntry.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/CollectionDefinition.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/ReferenceDefinition.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/HeaderNavigation.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/FieldPairDefinition.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/InquiryDefinition.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/SubSectionHeaderDefinitionI.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/AttributeDefinition.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/CollectionDefinitionI.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/WorkflowProperty.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/DataDictionaryUtils.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/MaintainableSectionDefinition.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/LookupDefinition.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/TransactionalDocumentEntry.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/DataDictionaryConverter.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/ParseException.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/FieldDefinition.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/WorkflowPropertyGroup.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/InquirySectionDefinition.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/DataDictionary.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/DocumentEntry.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/SortDefinition.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/MaintainableFieldDefinition.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/DataDictionaryDefinitionBase.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/MaintainableSubSectionHeaderDefinition.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/FieldDefinitionI.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/PrimitiveAttributeDefinition.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/ValidationCompletionUtils.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/DataDictionaryDefinition.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/XmlErrorHandler.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/MaintainableCollectionDefinition.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/AuthorizationDefinition.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/SupportAttributeDefinition.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/RelationshipDefinition.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/MaintainableItemDefinition.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/DataDictionaryEntryBase.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/DataDictionaryException.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/package.html D kns/src/main/java/org/kuali/core/datadictionary/conversion/InquirySubSectionHeaderDefinition.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/DataDictionaryEntry.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/InitException.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/InquiryCollectionDefinition.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/WorkflowProperties.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/AttributeReferenceDefinition.java D kns/src/main/java/org/kuali/core/datadictionary/conversion/files-to-convert.txt D kns/src/main/java/org/kuali/core/datadictionary/conversion U kns/src/main/java/org/kuali/core/datadictionary/exporter/DocumentEntryMapper.java U kns/src/main/java/org/kuali/core/bo/DocumentHeader.java U kns/src/main/java/org/kuali/core/authorization/AuthorizationStore.java U kns/src/main/java/org/kuali/core/service/impl/PersistenceServiceOjbImpl.java U kns/src/main/java/org/kuali/core/service/impl/DocumentTypeServiceImpl.java U kns/src/main/java/org/kuali/core/util/AbstractKualiDecimal.java U kns/src/main/java/org/kuali/core/web/struts/form/KualiDocumentFormBase.java U kns/src/main/java/org/kuali/core/web/struts/form/KualiForm.java U kns/src/main/java/org/kuali/core/web/format/PercentageFormatter.java U kns/src/main/java/org/kuali/core/web/ui/SectionBridge.java U kns/src/main/java/org/kuali/core/web/ui/HeaderField.java C kns/src/main/config/sql/rice_db_bootstrap.sql C kns/src/main/config/sql/rice_sampleapp_create.sql C kns/src/main/config/sql/rice_sampleapp_destroy.sql C kns/src/main/config/sql/rice_db_destroy.sql U kns/src/main/config/xml/RiceBootstrapData.xml U kns/src/main/config/xml/RiceSampleAppWorkflowBootstrap.xml U kns/src/main/config/xml/RiceSampleAppData.xml A kns/src/main/resources/KR-ApplicationResources.properties U kns/src/main/resources/org/kuali/core/bo/datadictionary/PessimisticLock.xml U tools/src/test/java/org/kuali/workflow/tools/xml/XmlGenTest.java A tools/src/test/resources A tools/src/test/resources/org A tools/src/test/resources/org/kuali A tools/src/test/resources/org/kuali/workflow A tools/src/test/resources/org/kuali/workflow/tools A tools/src/test/resources/org/kuali/workflow/tools/xml A tools/src/test/resources/org/kuali/workflow/tools/xml/05-OfficeOfAffirmativeActionSchoolAcknowledgementRuleTemplate.xml A tools/src/test/resources/org/kuali/workflow/tools/xml/02-EdocliteSchoolAttribute.xml A tools/src/test/resources/org/kuali/workflow/tools/xml/xmlgen-test-1.xml A tools/src/test/resources/org/kuali/workflow/tools/xml/03-OfficeOfAffirmativeActionInitiatorAcknowledgmentRuleTemplate.xml A tools/src/test/resources/org/kuali/workflow/tools/xml/07-OfficeOfAffirmativeActionViceChancellorRuleTemplate.xml A tools/src/test/resources/org/kuali/workflow/tools/xml/09-OfferRequestDocType.xml A tools/src/test/resources/org/kuali/workflow/tools/xml/08-OfficeOfAffirmativeActionDocType.xml A tools/src/test/resources/org/kuali/workflow/tools/xml/06-OfficeOfAffirmativeActionSchoolRuleTemplate.xml A tools/src/test/resources/org/kuali/workflow/tools/xml/01-EdocliteInitiatorAttribute.xml A tools/src/test/resources/org/kuali/workflow/tools/xml/04-OfficeOfAffirmativeActionOfficerRuleTemplate.xml A tools/src/main/java/org/kuali/core A tools/src/main/java/org/kuali/core/datadictionary A tools/src/main/java/org/kuali/core/datadictionary/conversion A tools/src/main/java/org/kuali/core/datadictionary/conversion/HelpDefinition.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/MaintenanceDocumentEntry.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/ApcRuleDefinition.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/BusinessObjectEntry.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/CollectionDefinition.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/ReferenceDefinition.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/HeaderNavigation.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/FieldPairDefinition.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/InquiryDefinition.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/SubSectionHeaderDefinitionI.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/AttributeDefinition.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/CollectionDefinitionI.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/WorkflowProperty.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/DataDictionaryUtils.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/MaintainableSectionDefinition.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/LookupDefinition.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/TransactionalDocumentEntry.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/DataDictionaryConverter.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/ParseException.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/FieldDefinition.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/WorkflowPropertyGroup.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/InquirySectionDefinition.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/DataDictionary.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/DocumentEntry.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/SortDefinition.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/MaintainableFieldDefinition.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/DataDictionaryDefinitionBase.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/MaintainableSubSectionHeaderDefinition.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/FieldDefinitionI.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/PrimitiveAttributeDefinition.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/ValidationCompletionUtils.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/DataDictionaryDefinition.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/XmlErrorHandler.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/MaintainableCollectionDefinition.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/AuthorizationDefinition.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/SupportAttributeDefinition.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/RelationshipDefinition.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/MaintainableItemDefinition.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/DataDictionaryEntryBase.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/DataDictionaryException.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/package.html A tools/src/main/java/org/kuali/core/datadictionary/conversion/InquirySubSectionHeaderDefinition.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/DataDictionaryEntry.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/InitException.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/InquiryCollectionDefinition.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/WorkflowProperties.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/AttributeReferenceDefinition.java A tools/src/main/java/org/kuali/core/datadictionary/conversion/files-to-convert.txt A tools/src/main/java/org/kuali/core/bo A tools/src/main/java/org/kuali/core/bo/DocumentStatus.java A tools/src/main/java/org/kuali/core/bo/DocumentGroup.java A tools/src/main/resources A tools/src/main/resources/org A tools/src/main/resources/org/kuali A tools/src/main/resources/org/kuali/core A tools/src/main/resources/org/kuali/core/datadictionary A tools/src/main/resources/org/kuali/core/datadictionary/conversion A tools/src/main/resources/org/kuali/core/datadictionary/conversion/Parameter.xml A tools/src/main/resources/org/kuali/core/datadictionary/conversion/DocumentType.xml A tools/src/main/resources/org/kuali/core/datadictionary/conversion/digesterRules.xml A tools/src/main/resources/org/kuali/core/datadictionary/conversion/ParameterMaintenanceDocument.xml A tools/src/main/resources/org/kuali/core/datadictionary/conversion/DocumentStatus.xml A tools/src/main/resources/org/kuali/core/datadictionary/conversion/DocumentTypeMaintenanceDocument.xml A tools/src/main/resources/org/kuali/core/datadictionary/conversion/RiceUserMaintenanceDocument.xml A tools/src/main/resources/org/kuali/core/datadictionary/conversion/EmployeeTypeMaintenanceDocument.xml A tools/src/main/resources/org/kuali/core/datadictionary/conversion/EmployeeStatusMaintenanceDocument.xml A tools/src/main/resources/org/kuali/core/datadictionary/conversion/dataDictionary-1_0.dtd A tools/src/main/resources/org/kuali/core/datadictionary/conversion/Attachment.xml A tools/src/main/resources/org/kuali/core/datadictionary/conversion/BusinessObjectAttributeEntry.xml A tools/src/main/resources/org/kuali/core/datadictionary/conversion/CampusType.xml A tools/src/main/resources/org/kuali/core/datadictionary/conversion/controlRules.xml A tools/src/main/resources/org/kuali/core/datadictionary/conversion/CampusTypeMaintenanceDocument.xml A tools/src/main/resources/org/kuali/core/datadictionary/conversion/ParameterNamespace.xml A tools/src/main/resources/org/kuali/core/datadictionary/conversion/AttributeReferenceDummy.xml A tools/src/main/resources/org/kuali/core/datadictionary/conversion/files-to-convert-sample.txt A tools/src/main/resources/org/kuali/core/datadictionary/conversion/ParameterDetailType.xml A tools/src/main/resources/org/kuali/core/datadictionary/conversion/UniversalUser.xml A tools/src/main/resources/org/kuali/core/datadictionary/conversion/NoteType.xml A tools/src/main/resources/org/kuali/core/datadictionary/conversion/authorizationRules.xml A tools/src/main/resources/org/kuali/core/datadictionary/conversion/RiceUser.xml A tools/src/main/resources/org/kuali/core/datadictionary/conversion/EmployeeType.xml A tools/src/main/resources/org/kuali/core/datadictionary/conversion/ParameterType.xml A tools/src/main/resources/org/kuali/core/datadictionary/conversion/EmployeeStatus.xml A tools/src/main/resources/org/kuali/core/datadictionary/conversion/ParameterTypeMaintenanceDocument.xml A tools/src/main/resources/org/kuali/core/datadictionary/conversion/AdHocRoutePerson.xml A tools/src/main/resources/org/kuali/core/datadictionary/conversion/DocumentHeader.xml A tools/src/main/resources/org/kuali/core/datadictionary/conversion/Campus.xml A tools/src/main/resources/org/kuali/core/datadictionary/conversion/CampusMaintenanceDocument.xml A tools/src/main/resources/org/kuali/core/datadictionary/conversion/DocumentGroup.xml A tools/src/main/resources/org/kuali/core/datadictionary/conversion/ParameterNamespaceMaintenanceDocument.xml A tools/src/main/resources/org/kuali/core/datadictionary/conversion/validationPatternRules.xml A tools/src/main/resources/org/kuali/core/datadictionary/conversion/Note.xml A tools/src/main/resources/org/kuali/core/datadictionary/conversion/ParameterDetailTypeMaintenanceDocument.xml A tools/src/main/resources/org/kuali/core/datadictionary/conversion/UniversalUserMaintenanceDocument.xml A tools/src/main/resources/org/kuali/core/datadictionary/conversion/attributePatternRules.xml A tools/src/main/resources/org/kuali/core/datadictionary/conversion/AdHocRouteWorkgroup.xml A tools/src/main/resources/org/kuali/core/datadictionary/conversion/files-to-convert.txt A tools/pom.xml U tools C .classpath U testharness/src/main/java/org/kuali/rice/test/lifecycles/JettyServerLifecycle.java U testharness/src/main/java/org/kuali/rice/test/RiceTestCase.java U testharness/src/main/java/org/kuali/rice/test/DerbyDBCreationLifecycle.java A kim-authn-sesn/src/main/config A kim-authn-sesn/src/main/config/ddl A kim-authn-sesn/src/main/config/ddl/indexes A kim-authn-sesn/src/main/config/ddl/indexes/KIM_AUTHN_SESN_T.index.ddl A kim-authn-sesn/src/main/config/ddl/indexes/KIM_AUTHN_SESN_PRINCIPAL_T.index.ddl A kim-authn-sesn/src/main/config/ddl/tables A kim-authn-sesn/src/main/config/ddl/tables/KIM_AUTHN_SESN_T.table.ddl A kim-authn-sesn/src/main/config/ddl/tables/KIM_AUTHN_SESN_PRINCIPAL_T.table.ddl C kim-authn-sesn/pom.xml A licenses/carol-2.0.5-src.tgz A licenses/xapool-1.5.0-src.zip A licenses/xapool-303462.patch A licenses/xapool-README.txt A shared/src/main/java/org/kuali/rice/database/XAPoolDataSource.java U server/src/test/java/org/kuali/rice/server/test/ServerTestBase.java U server/src/test/java/org/kuali/rice/server/test/WebTestBase.java U server/src/test/java/org/kuali/rice/server/BaseLineAppStartTest.java U server/src/test/java/org/kuali/rice/server/lookup/WebLookupTest.java U server/src/test/java/org/kuali/rice/server/document/WebActionTest.java U server/src/test/java/org/kuali/rice/ken/KENWebServiceTest.java U server/src/test/java/edu/sampleu/travel/web/form/TravelDocumentForm2.java U server/src/test/resources/configurationServiceData.xml U server/src/test/resources/ServerDefaultTestData.sql U server/src/test/resources/ServerDefaultTestData.xml A server/src/test/resources/KENSpringBeans-test.xml U server/src/test/resources/edu/sampleu/travel/datadictionary/TravelRequestDocument.xml D server/src/main/config/WEB-INF/classes/KR-ApplicationResources.properties U server/src/main/config/index.html U server/src/main/resources/configurationServiceData.xml U server/src/main/webapp/en/scripts/edoclite1.js U server/src/main/webapp/WEB-INF/jsp/travelDocument2.jsp C server/src/main/webapp/WEB-INF/tags/kr/page.tag A server/src/main/webapp/WEB-INF/tags/kr/lockMessages.tag U server/src/main/webapp/WEB-INF/tags/kr/rowDisplay.tag U server/src/main/webapp/WEB-INF/tags/kr/tab.tag U server/src/main/webapp/WEB-INF/tags/kr/documentPage.tag U server/src/main/webapp/index.html U server/src/main/webapp/kr/scripts/core.js U server/src/main/webapp/kr/css/kuali.css U ken/src/test/java/org/kuali/notification/services/impl/NotificationMessageDeliveryResolverServiceImplTest.java U ken/src/main/java/org/kuali/notification/service/impl/SendNotificationServiceKewXmlImpl.java U ksb/src/test/resources/META-INF/ksb-test-config.xml U ksb/src/test/resources/db/derby/bus.sql U ksb/src/test/resources/edu/iu/uis/eden/testclient1/resources/TestClient1SpringBeans.xml U ksb/src/main/java/edu/iu/uis/eden/messaging/ServiceDefinition.java U ksb/src/main/java/edu/iu/uis/eden/messaging/KEWHttpInvokerServiceExporter.java U ksb/src/main/java/edu/iu/uis/eden/messaging/ServiceInfo.java U kim/src/test/java/org/kuali/rice/kim/test/KIMDaoTestBase.java U kim/src/test/java/org/kuali/rice/kim/test/KIMTestCase.java A kim/src/test/java/org/kuali/rice/kim/service/AuthorizationServiceTest.java U kim/src/test/java/org/kuali/rice/kim/service/PrincipalServiceTest.java U kim/src/test/java/org/kuali/rice/kim/service/RoleServiceTest.java U kim/src/test/java/org/kuali/rice/kim/service/QualifiedRoleServiceTest.java U kim/src/test/java/org/kuali/rice/kim/service/PersonServiceTest.java U kim/src/test/java/org/kuali/rice/kim/service/GroupServiceTest.java U kim/src/test/java/org/kuali/rice/kim/service/NamespaceServiceTest.java U kim/src/test/resources/META-INF/kim-test-config.xml U kim/src/test/resources/DefaultTestData.sql U kim/src/main/java/org/kuali/rice/kim/bo/PrincipalQualifiedRoleAttribute.java U kim/src/main/java/org/kuali/rice/kim/bo/Entity.java U kim/src/main/java/org/kuali/rice/kim/bo/GroupQualifiedRoleAttribute.java A kim/src/main/java/org/kuali/rice/kim/inquiry/EntityInquirable.java U kim/src/main/java/org/kuali/rice/kim/service/impl/ImplUtils.java A kim/src/main/java/org/kuali/rice/kim/service/impl/AuthorizationServiceImpl.java U kim/src/main/java/org/kuali/rice/kim/service/impl/RoleServiceImpl.java U kim/src/main/java/org/kuali/rice/kim/service/impl/QualifiedRoleServiceImpl.java U kim/src/main/java/org/kuali/rice/kim/dao/KIMServicesDaoJpa.java U kim/src/main/java/org/kuali/rice/kim/dao/KIMServicesDaoOjb.java U kim/src/main/java/org/kuali/rice/kim/dao/KIMServicesDao.java U kim/src/main/java/org/kuali/rice/kim/dao/KIMServicesDaoProxy.java A kim/src/main/java/org/kuali/rice/kim/lookup/PrincipalLookupable.java A kim/src/main/java/org/kuali/rice/kim/lookup/valuefinder/EntityTypeDefaultValueFinder.java U kim/src/main/java/org/kuali/rice/kim/lookup/valuefinder/GroupTypeDefaultValueFinder.java U kim/src/main/java/org/kuali/rice/kim/util/KIMConstants.java A kim/src/main/java/org/kuali/rice/kim/web/form/EntityAttributeForm.java U kim/src/main/java/org/kuali/rice/kim/document/maintenance/EntityMaintainable.java U kim/src/main/java/org/kuali/rice/kim/document/maintenance/GroupMaintainable.java U kim/src/main/java/org/kuali/rice/kim/document/maintenance/PrincipalMaintainable.java U kim/src/main/java/org/kuali/rice/kim/document/maintenance/RoleMaintainable.java A kim/src/main/java/org/kuali/rice/kim/document/rule/RoleMaintenanceDocumentRule.java A kim/src/main/resources/KIM-ApplicationResources.properties A kim/src/main/resources/org/kuali/rice/kim/bo/datadictionary/EntityAttributeForm.xml U kim/src/main/resources/org/kuali/rice/kim/bo/datadictionary/RoleAttribute.xml U kim/src/main/resources/org/kuali/rice/kim/bo/datadictionary/Group.xml U kim/src/main/resources/org/kuali/rice/kim/bo/datadictionary/GroupType.xml U kim/src/main/resources/org/kuali/rice/kim/bo/datadictionary/Role.xml U kim/src/main/resources/org/kuali/rice/kim/bo/datadictionary/Entity.xml U kim/src/main/resources/org/kuali/rice/kim/bo/datadictionary/EntityType.xml U kim/src/main/resources/org/kuali/rice/kim/document/datadictionary/RoleMaintenanceDocument.xml U kim/src/main/resources/org/kuali/rice/kim/document/datadictionary/EntityMaintenanceDocument.xml U kim/src/main/resources/org/kuali/rice/kim/document/datadictionary/GroupMaintenanceDocument.xml U kim/src/main/resources/KIMSpringBeans.xml U kew/src/test/java/org/kuali/workflow/test/KEWTestCase.java U kew/src/test/java/edu/iu/uis/eden/routetemplate/RuleTemplateAttributeTest.java U kew/src/test/java/edu/iu/uis/eden/docsearch/CustomDocumentSearchGeneratorTest.java U kew/src/test/java/edu/iu/uis/eden/docsearch/CustomDocumentSearchResultProcessorTest.java U kew/src/test/java/edu/iu/uis/eden/plugin/ZipFilePluginLoaderTest.java U kew/src/test/java/edu/iu/uis/eden/applicationconstants/ApplicationConstantsJPAOJBTest.java U kew/src/test/java/edu/iu/uis/eden/actions/FutureRequestsTest.java U kew/src/test/java/edu/iu/uis/eden/actions/SuperUserActionInvalidPostProcessor.java U kew/src/test/java/edu/iu/uis/eden/edl/EDocLitePostProcessorTest.java C kew/src/test/java/edu/iu/uis/eden/server/WorkflowUtilityTest.java U kew/src/test/java/edu/iu/uis/eden/helpentry/HelpEntryJpaOjbTest.java U kew/src/test/resources/edu/iu/uis/eden/server/WorkflowUtilityConfig.xml U kew/src/main/java/edu/iu/uis/eden/routetemplate/RuleImpl.java U kew/src/main/java/edu/iu/uis/eden/routetemplate/FlexRM.java U kew/src/main/java/edu/iu/uis/eden/lookupable/DocumentTypeLookupableImpl.java U kew/src/main/java/edu/iu/uis/eden/docsearch/DocumentSearchServiceImpl.java U kew/src/main/java/edu/iu/uis/eden/docsearch/StandardDocumentSearchCriteriaProcessor.java U kew/src/main/java/edu/iu/uis/eden/docsearch/DocSearchUtils.java U kew/src/main/java/edu/iu/uis/eden/docsearch/DocSearchCriteriaVO.java U kew/src/main/java/edu/iu/uis/eden/docsearch/StandardDocumentSearchResultProcessor.java U kew/src/main/java/edu/iu/uis/eden/docsearch/DocumentSearchService.java U kew/src/main/java/edu/iu/uis/eden/docsearch/StandardDocumentSearchGenerator.java U kew/src/main/java/edu/iu/uis/eden/engine/WorkflowEngine.java U kew/src/main/java/edu/iu/uis/eden/engine/node/RequestActivationNode.java U kew/src/main/java/edu/iu/uis/eden/engine/node/NodeType.java U kew/src/main/java/edu/iu/uis/eden/engine/RouteHelper.java D kew/src/main/java/edu/iu/uis/eden/util/ClassLoaderUtils.java U kew/src/main/java/edu/iu/uis/eden/util/XmlHelper.java U kew/src/main/java/edu/iu/uis/eden/batch/KEWXmlDataLoaderLifecycle.java U kew/src/main/java/edu/iu/uis/eden/core/BootstrapFilter.java U kew/src/main/java/edu/iu/uis/eden/plugin/ServiceOverrideAutoProxyCreator.java U kew/src/main/java/edu/iu/uis/eden/plugin/ServerPluginRegistry.java U kew/src/main/java/edu/iu/uis/eden/plugin/BasePluginLoader.java U kew/src/main/java/edu/iu/uis/eden/plugin/HotDeployer.java U kew/src/main/java/edu/iu/uis/eden/server/WorkflowUtilityWebServiceImpl.java U kew/src/main/java/edu/iu/uis/eden/server/BeanConverter.java U kew/src/main/java/edu/iu/uis/eden/messaging/RouteDocumentMessageService.java U kew/src/main/java/edu/iu/uis/eden/clientapp/vo/DocumentSearchCriteriaVO.java U kew/src/main/java/edu/iu/uis/eden/actionitem/ActionItem.java U kew/src/main/java/edu/iu/uis/eden/actions/ActionRegistryImpl.java U kew/src/main/java/edu/iu/uis/eden/actions/ActionTakenEvent.java U kew/src/main/config/xml/KEWBootstrap.xml
            Hide
            ewestfal Eric Westfall added a comment -

            Merge completed at revision 4243. During merge I discovered an issue with rowDisplay.tag where it was not setting a required attribute (fieldName) on the fieldDefaultLabel.tag. This appeared to be an issue in 0.9.3 as well so i fixed it in both places.

            Show
            ewestfal Eric Westfall added a comment - Merge completed at revision 4243. During merge I discovered an issue with rowDisplay.tag where it was not setting a required attribute (fieldName) on the fieldDefaultLabel.tag. This appeared to be an issue in 0.9.3 as well so i fixed it in both places.

              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 - 2 hours
                  2h
                  Remaining:
                  Remaining Estimate - 2 hours
                  2h
                  Logged:
                  Time Spent - Not Specified
                  Not Specified