[KULRICE-2010] Merge 0.9.3-kfs with the extraction cleanup work into 0.9.3 Created: 17/Jun/08  Updated: 26/Jun/08  Resolved: 26/Jun/08

Status: Closed
Project: Kuali Rice Development
Component/s: Source Control
Affects Version/s: None
Fix Version/s: 0.9.3

Type: Task Priority: Blocker
Reporter: Eric Westfall Assignee: Eric Westfall
Resolution: Fixed Votes: 0
Labels: None
Remaining Estimate: Not Specified
Time Spent: Not Specified
Original Estimate: Not Specified

Issue Links:
Discovered
discovered KULRICE-2047 Examine need for OJB specific code in... Closed
discovered KULRICE-2048 Update KNS JPA DAOs to reflect change... Closed

 Description   

David's been doing post-extraction cleanup on the 0.9.3-kfs branch and we need to merge his changes in prior to releasing 0.9.3.



 Comments   
Comment by Eric Westfall [ 17/Jun/08 ]

We will need to determine the timing of this issue as far as when we will perform the merge.

Comment by Eric Westfall [ 17/Jun/08 ]

We will plan to perform this merge on Friday the 20th of June. Will merge 0.9.3-kfs-extraction into 0.9.3-kfs and then 0.9.3-kfs into 0.9.3. KFS will continue to work into 0.9.3 until we cut 0.9.4.

Comment by Eric Westfall [ 26/Jun/08 ]

Branch i will be merging from is:

https://test.kuali.org/svn/rice/branches/rice-release-0-9-3-kfs-080522-br/

Merge command will be:

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

Comment by Eric Westfall [ 26/Jun/08 ]

Output from Merge command:

129-79-44-31:rice-0.9.3 ewestfal$ svn merge -r 3779:HEAD https://test.kuali.org/svn/rice/branches/rice-release-0-9-3-kfs-080522-br/
U kim/src/test/java/org/kuali/rice/kim/test/KIMHtmlTestBase.java
U kew/src/test/java/edu/iu/uis/eden/xml/XPathTest.java
U kew/src/test/java/edu/iu/uis/eden/server/WorkflowUtilityTest.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/WorkflowUtility.java
U kew/src/main/java/edu/iu/uis/eden/clientapp/WorkflowInfo.java
U kom/src/test/java/org/kuali/rice/kom/test/KOMHtmlTestBase.java
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/Parameter.xml
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/DocumentType.xml
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/digesterRules.xml
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/ParameterMaintenanceDocument.xml
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/DocumentStatus.xml
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/DocumentTypeMaintenanceDocument.xml
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/RiceUserMaintenanceDocument.xml
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/EmployeeTypeMaintenanceDocument.xml
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/EmployeeStatusMaintenanceDocument.xml
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/dataDictionary-1_0.dtd
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/Attachment.xml
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/BusinessObjectAttributeEntry.xml
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/CampusType.xml
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/controlRules.xml
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/CampusTypeMaintenanceDocument.xml
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/ParameterNamespace.xml
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/AttributeReferenceDummy.xml
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/files-to-convert-sample.txt
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/ParameterDetailType.xml
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/UniversalUser.xml
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/NoteType.xml
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/authorizationRules.xml
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/RiceUser.xml
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/EmployeeType.xml
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/ParameterType.xml
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/EmployeeStatus.xml
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/ParameterTypeMaintenanceDocument.xml
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/AdHocRoutePerson.xml
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/DocumentHeader.xml
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/Campus.xml
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/CampusMaintenanceDocument.xml
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/DocumentGroup.xml
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/ParameterNamespaceMaintenanceDocument.xml
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/validationPatternRules.xml
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/Note.xml
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/ParameterDetailTypeMaintenanceDocument.xml
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/UniversalUserMaintenanceDocument.xml
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/attributePatternRules.xml
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/AdHocRouteWorkgroup.xml
A scripts/upgrades/0.9.2 to 0.9.3/datadictionary/files-to-convert.txt
U scripts/upgrades/0.9.2 to 0.9.3/kns-upgrade-0.9.2-to-0.9.3.sql
U core/src/main/resources/jta.properties
A kns/src/test/java/org/kuali/rice/kns/test/KualiTestAssertionUtils.java
U kns/src/test/java/org/kuali/rice/kns/test/document/bo/AccountManager.java
U kns/src/test/java/org/kuali/core/datadictionary/ExtensionAttributeTest.java
U kns/src/test/java/org/kuali/core/datadictionary/DataDictionaryBuilderTest.java
U kns/src/test/java/org/kuali/core/authorization/AuthorizationStoreTest.java
U kns/src/test/java/org/kuali/core/service/DictionaryValidationServiceTest.java
A kns/src/test/java/org/kuali/core/service/KualiGroupServiceTest.java
A kns/src/test/java/org/kuali/core/service/MaintenanceDocumentDictionaryServiceTest.java
A kns/src/test/java/org/kuali/core/service/DateTimeServiceTest.java
A kns/src/test/java/org/kuali/core/service/KualiRuleServiceTest.java
U kns/src/test/java/org/kuali/core/impls/MockWorkflowDocument.java
A kns/src/test/java/org/kuali/core/rule
A kns/src/test/java/org/kuali/core/rule/PreRulesContinuationTest.java
A kns/src/test/java/org/kuali/core/workflow
A kns/src/test/java/org/kuali/core/workflow/service
A kns/src/test/java/org/kuali/core/workflow/service/WorkflowInfoServiceTest.java
A kns/src/test/java/org/kuali/core/workflow/service/WorkflowGroupServiceTest.java
A kns/src/test/java/org/kuali/core/util
A kns/src/test/java/org/kuali/core/util/TypedArrayListTest.java
A kns/src/test/java/org/kuali/core/util/BeanPropertyComparatorTest.java
A kns/src/test/java/org/kuali/core/util/TypeUtilsTest.java
A kns/src/test/java/org/kuali/core/util/KualiDecimalTest.java
A kns/src/test/java/org/kuali/core/util/OjbKualiIntegerPercentageFieldConversionTest.java
A kns/src/test/java/org/kuali/core/util/ErrorMapTest.java
A kns/src/test/java/org/kuali/core/util/AssertionUtilsTest.java
A kns/src/test/java/org/kuali/core/util/GuidTest.java
A kns/src/test/java/org/kuali/core/util/NumberUtilsTest.java
A kns/src/test/java/org/kuali/core/util/UrlFactoryTest.java
A kns/src/test/java/org/kuali/core/util/properties
A kns/src/test/java/org/kuali/core/util/properties/PropertyHolderTest.java
A kns/src/test/java/org/kuali/core/util/properties/PropertyTreeTest.java
A kns/src/test/java/org/kuali/core/util/properties/FilePropertySourceTest.java
A kns/src/test/java/org/kuali/core/util/DateUtilsTest.java
A kns/src/test/java/org/kuali/core/web
A kns/src/test/java/org/kuali/core/web/comparator
A kns/src/test/java/org/kuali/core/web/comparator/CellComparatorHelperTest.java
A kns/src/test/java/org/kuali/core/web/format
A kns/src/test/java/org/kuali/core/web/format/DateFormatterTest.java
A kns/src/test/java/org/kuali/core/web/format/BigDecimalFormatterTest.java
A kns/src/test/java/org/kuali/core/web/format/CurrencyFormatterTest.java
U kns/src/test/java/org/kuali/core/document/DocumentAuthorizerBaseTest.java
U kns/src/test/resources/KNSDefaultTestData.xml
D kns/src/main/java/org/kuali/RicePropertyConstants.java
U kns/src/main/java/org/kuali/rice/KNSServiceLocator.java
U kns/src/main/java/org/kuali/rice/kns/util/KNSConstants.java
U kns/src/main/java/org/kuali/rice/kns/util/KNSPropertyConstants.java
U kns/src/main/java/org/kuali/core/maintenance/Maintainable.java
U kns/src/main/java/org/kuali/core/maintenance/rules/MaintenanceDocumentRuleBase.java
D kns/src/main/java/org/kuali/core/rules/LedgerPostingDocumentRuleBase.java
D kns/src/main/java/org/kuali/core/datadictionary/FieldPairDefinition.java
U kns/src/main/java/org/kuali/core/datadictionary/control/LookupHiddenControlDefinition.java
U kns/src/main/java/org/kuali/core/datadictionary/control/CheckboxControlDefinition.java
U kns/src/main/java/org/kuali/core/datadictionary/control/WorkflowWorkgroupControlDefinition.java
U kns/src/main/java/org/kuali/core/datadictionary/control/CurrencyControlDefinition.java
U kns/src/main/java/org/kuali/core/datadictionary/control/HiddenControlDefinition.java
U kns/src/main/java/org/kuali/core/datadictionary/control/RadioControlDefinition.java
U kns/src/main/java/org/kuali/core/datadictionary/control/ApcSelectControlDefinition.java
U kns/src/main/java/org/kuali/core/datadictionary/control/KualiUserControlDefinition.java
U kns/src/main/java/org/kuali/core/datadictionary/control/LookupReadonlyControlDefinition.java
U kns/src/main/java/org/kuali/core/datadictionary/control/ControlDefinitionBase.java
U kns/src/main/java/org/kuali/core/datadictionary/control/TextareaControlDefinition.java
U kns/src/main/java/org/kuali/core/datadictionary/control/SelectControlDefinition.java
U kns/src/main/java/org/kuali/core/datadictionary/control/MultivalueControlDefinitionBase.java
U kns/src/main/java/org/kuali/core/datadictionary/control/TextControlDefinition.java
U kns/src/main/java/org/kuali/core/datadictionary/HelpDefinition.java
U kns/src/main/java/org/kuali/core/datadictionary/MaintenanceDocumentEntry.java
U kns/src/main/java/org/kuali/core/datadictionary/ApcRuleDefinition.java
U kns/src/main/java/org/kuali/core/datadictionary/BusinessObjectEntry.java
U kns/src/main/java/org/kuali/core/datadictionary/CollectionDefinition.java
U kns/src/main/java/org/kuali/core/datadictionary/conversion/DataDictionaryConverter.java
U kns/src/main/java/org/kuali/core/datadictionary/conversion/DocumentEntry.java
U kns/src/main/java/org/kuali/core/datadictionary/conversion/MaintainableCollectionDefinition.java
U kns/src/main/java/org/kuali/core/datadictionary/ReferenceDefinition.java
U kns/src/main/java/org/kuali/core/datadictionary/HeaderNavigation.java
U kns/src/main/java/org/kuali/core/datadictionary/InquiryDefinition.java
U kns/src/main/java/org/kuali/core/datadictionary/validation/FieldLevelValidationPattern.java
U kns/src/main/java/org/kuali/core/datadictionary/validation/charlevel/AlphaNumericValidationPattern.java
U kns/src/main/java/org/kuali/core/datadictionary/validation/charlevel/CharsetValidationPattern.java
U kns/src/main/java/org/kuali/core/datadictionary/validation/charlevel/NumericValidationPattern.java
U kns/src/main/java/org/kuali/core/datadictionary/validation/charlevel/AnyCharacterValidationPattern.java
U kns/src/main/java/org/kuali/core/datadictionary/validation/charlevel/AlphaValidationPattern.java
U kns/src/main/java/org/kuali/core/datadictionary/validation/ValidationPattern.java
U kns/src/main/java/org/kuali/core/datadictionary/validation/fieldlevel/JavaClassValidationPattern.java
U kns/src/main/java/org/kuali/core/datadictionary/validation/fieldlevel/FixedPointValidationPattern.java
U kns/src/main/java/org/kuali/core/datadictionary/validation/fieldlevel/DateValidationPattern.java
U kns/src/main/java/org/kuali/core/datadictionary/validation/fieldlevel/EmailAddressValidationPattern.java
U kns/src/main/java/org/kuali/core/datadictionary/validation/fieldlevel/FloatingPointValidationPattern.java
U kns/src/main/java/org/kuali/core/datadictionary/validation/fieldlevel/ZipcodeValidationPattern.java
U kns/src/main/java/org/kuali/core/datadictionary/validation/fieldlevel/YearValidationPattern.java
U kns/src/main/java/org/kuali/core/datadictionary/validation/fieldlevel/PhoneNumberValidationPattern.java
U kns/src/main/java/org/kuali/core/datadictionary/validation/fieldlevel/TimestampValidationPattern.java
U kns/src/main/java/org/kuali/core/datadictionary/validation/fieldlevel/MonthValidationPattern.java
U kns/src/main/java/org/kuali/core/datadictionary/validation/CharacterLevelValidationPattern.java
U kns/src/main/java/org/kuali/core/datadictionary/AttributeDefinition.java
U kns/src/main/java/org/kuali/core/datadictionary/WorkflowProperty.java
U kns/src/main/java/org/kuali/core/datadictionary/MaintainableSectionDefinition.java
U kns/src/main/java/org/kuali/core/datadictionary/LookupDefinition.java
U kns/src/main/java/org/kuali/core/datadictionary/TransactionalDocumentEntry.java
U kns/src/main/java/org/kuali/core/datadictionary/FieldDefinition.java
U kns/src/main/java/org/kuali/core/datadictionary/WorkflowPropertyGroup.java
U kns/src/main/java/org/kuali/core/datadictionary/InquirySectionDefinition.java
U kns/src/main/java/org/kuali/core/datadictionary/DataDictionary.java
U kns/src/main/java/org/kuali/core/datadictionary/SortDefinition.java
U kns/src/main/java/org/kuali/core/datadictionary/DocumentEntry.java
U kns/src/main/java/org/kuali/core/datadictionary/MaintainableFieldDefinition.java
U kns/src/main/java/org/kuali/core/datadictionary/DataDictionaryDefinitionBase.java
U kns/src/main/java/org/kuali/core/datadictionary/PrimitiveAttributeDefinition.java
U kns/src/main/java/org/kuali/core/datadictionary/MaintainableSubSectionHeaderDefinition.java
U kns/src/main/java/org/kuali/core/datadictionary/MaintainableCollectionDefinition.java
U kns/src/main/java/org/kuali/core/datadictionary/AuthorizationDefinition.java
U kns/src/main/java/org/kuali/core/datadictionary/SupportAttributeDefinition.java
U kns/src/main/java/org/kuali/core/datadictionary/RelationshipDefinition.java
D kns/src/main/java/org/kuali/core/datadictionary/mask/MaskFormatterCustom.java
U kns/src/main/java/org/kuali/core/datadictionary/mask/MaskFormatterSubString.java
U kns/src/main/java/org/kuali/core/datadictionary/mask/Mask.java
U kns/src/main/java/org/kuali/core/datadictionary/mask/MaskFormatterLiteral.java
U kns/src/main/java/org/kuali/core/datadictionary/MaintainableItemDefinition.java
U kns/src/main/java/org/kuali/core/datadictionary/DataDictionaryEntryBase.java
U kns/src/main/java/org/kuali/core/datadictionary/InquiryCollectionDefinition.java
U kns/src/main/java/org/kuali/core/datadictionary/WorkflowProperties.java
U kns/src/main/java/org/kuali/core/datadictionary/exporter/MapperUtils.java
U kns/src/main/java/org/kuali/core/inquiry/KualiInquirableImpl.java
D kns/src/main/java/org/kuali/core/bo/DocumentStatus.java
D kns/src/main/java/org/kuali/core/bo/DocumentGroup.java
C kns/src/main/java/org/kuali/core/bo/DocumentType.java
C kns/src/main/java/org/kuali/core/bo/DocumentHeader.java
U kns/src/main/java/org/kuali/core/bo/KualiCodeBase.java
U kns/src/main/java/org/kuali/core/bo/AttributeReferenceDummy.java
A kns/src/main/java/org/kuali/core/bo/DocumentTypeAttribute.java
U kns/src/main/java/org/kuali/core/service/DocumentService.java
A kns/src/main/java/org/kuali/core/service/DocumentHeaderService.java
U kns/src/main/java/org/kuali/core/service/impl/DocumentTypeServiceImpl.java
U kns/src/main/java/org/kuali/core/service/impl/PostProcessorServiceImpl.java
U kns/src/main/java/org/kuali/core/service/impl/KualiRuleServiceImpl.java
C kns/src/main/java/org/kuali/core/service/impl/PersistenceStructureServiceImpl.java
U kns/src/main/java/org/kuali/core/service/impl/DocumentServiceImpl.java
A kns/src/main/java/org/kuali/core/service/impl/DocumentHeaderServiceImpl.java
U kns/src/main/java/org/kuali/core/service/DocumentTypeService.java
U kns/src/main/java/org/kuali/core/dao/DocumentDao.java
U kns/src/main/java/org/kuali/core/dao/DocumentHeaderDao.java
U kns/src/main/java/org/kuali/core/dao/ojb/MaintenanceDocumentDaoOjb.java
U kns/src/main/java/org/kuali/core/dao/ojb/DocumentHeaderDaoOjb.java
U kns/src/main/java/org/kuali/core/dao/ojb/DocumentDaoOjb.java
U kns/src/main/java/org/kuali/core/lookup/keyvalues/DocumentTypeValueFinder.java
U kns/src/main/java/org/kuali/core/lookup/keyvalues/DocumentTypeComparator.java
D kns/src/main/java/org/kuali/core/workflow/KFSResourceLoader.java
U kns/src/main/java/org/kuali/core/workflow/service/KualiWorkflowDocument.java
U kns/src/main/java/org/kuali/core/workflow/service/impl/KualiWorkflowDocumentImpl.java
U kns/src/main/java/org/kuali/core/workflow/service/impl/KualiWorkflowInfoImpl.java
U kns/src/main/java/org/kuali/core/workflow/service/KualiWorkflowInfo.java
U kns/src/main/java/org/kuali/core/workflow/WorkflowUtils.java
D kns/src/main/java/org/kuali/core/util/GeneralLedgerPendingEntrySequenceHelper.java
U kns/src/main/java/org/kuali/core/util/MaintenanceUtils.java
U kns/src/main/java/org/kuali/core/util/UrlFactory.java
U kns/src/main/java/org/kuali/core/web/struts/form/KualiHelpForm.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/KualiTransactionalDocumentFormBase.java
U kns/src/main/java/org/kuali/core/web/struts/form/KualiMaintenanceForm.java
C kns/src/main/java/org/kuali/core/web/struts/action/KualiMaintenanceDocumentAction.java
U kns/src/main/java/org/kuali/core/web/struts/action/KualiTransactionalDocumentActionBase.java
U kns/src/main/java/org/kuali/core/web/filter/SessionFilter.java
D kns/src/main/java/org/kuali/core/document/AmountTotaling.java
D kns/src/main/java/org/kuali/core/document/Correctable.java
D kns/src/main/java/org/kuali/core/document/authorization/TransactionalDocumentActionFlags.java
U kns/src/main/java/org/kuali/core/document/authorization/DocumentAuthorizerBase.java
U kns/src/main/java/org/kuali/core/document/authorization/DocumentActionFlags.java
U kns/src/main/java/org/kuali/core/document/authorization/TransactionalDocumentAuthorizerBase.java
U kns/src/main/java/org/kuali/core/document/TransactionalDocument.java
U kns/src/main/java/org/kuali/core/document/DocumentBase.java
C kns/src/main/java/org/kuali/core/document/MaintenanceDocumentBase.java
U kns/src/main/java/org/kuali/core/document/TransactionalDocumentBase.java
D kns/src/main/config/ddl/indexes/FP_DOC_TYPE_T.index.ddl
U kns/src/main/config/ddl/indexes/FP_DOC_HEADER_T.index.ddl
D kns/src/main/config/ddl/constraints/FP_DOC_TYPE_T.constraints.ddl
A kns/src/main/config/ddl/constraints/FP_DOC_TYPE_ATTR_T.constraints.ddl
D kns/src/main/config/ddl/tables/FP_DOC_GROUP_T.table.ddl
D kns/src/main/config/ddl/tables/FP_DOC_STATUS_T.table.ddl
A kns/src/main/config/ddl/tables/FP_DOC_TYPE_ATTR_T.table.ddl
U kns/src/main/config/ddl/tables/FP_DOC_TYPE_T.table.ddl
U kns/src/main/config/ddl/tables/FP_DOC_HEADER_T.table.ddl
A kns/src/main/config/ddl/sequences/FP_DOC_TYPE_ATTR_ID_SEQ.sequence.ddl
U kns/src/main/resources/OJB-repository-kns.xml
U kns/src/main/resources/KNSSpringBeans.xml
D kns/src/main/resources/org/kuali/core/datadictionary/conversion/digesterRules.xml
D kns/src/main/resources/org/kuali/core/datadictionary/conversion/validationPatternRules.xml
D kns/src/main/resources/org/kuali/core/datadictionary/conversion/dataDictionary-1_0.dtd
D kns/src/main/resources/org/kuali/core/datadictionary/conversion/authorizationRules.xml
D kns/src/main/resources/org/kuali/core/datadictionary/conversion/controlRules.xml
D kns/src/main/resources/org/kuali/core/datadictionary/conversion/attributePatternRules.xml
D kns/src/main/resources/org/kuali/core/datadictionary/conversion/files-to-convert.txt
D kns/src/main/resources/org/kuali/core/bo/datadictionary/DocumentStatus.xml
D kns/src/main/resources/org/kuali/core/bo/datadictionary/DocumentGroup.xml
U kns/src/main/resources/org/kuali/core/bo/datadictionary/DocumentType.xml
U kns/src/main/resources/org/kuali/core/bo/datadictionary/DocumentHeader.xml
U kns/src/main/resources/org/kuali/core/bo/datadictionary/AttributeReferenceDummy.xml
A kns/src/main/resources/org/kuali/core/bo/datadictionary/DocumentTypeAttribute.xml
U kns/src/main/resources/org/kuali/core/bo/datadictionary/DataDictionaryBaseTypes.xml
U kns/src/main/resources/org/kuali/core/dwr-core.xml
U kns/src/main/resources/org/kuali/core/document/datadictionary/DocumentTypeMaintenanceDocument.xml
U server/src/test/java/org/kuali/rice/server/maintainable/BaseMaintainableTest.java
U server/src/test/java/org/kuali/rice/server/document/BaseTransactionDocumentTest.java
U server/src/test/java/edu/sampleu/travel/rice/TravelModuleUserService.java
U server/src/main/webapp/WEB-INF/jsp/travelDocument2.jsp
U server/src/main/webapp/WEB-INF/tags/kr/auditMode.tag
U server/src/main/webapp/WEB-INF/tags/kr/page.tag
U server/src/main/webapp/WEB-INF/tags/kr/rowDisplay.tag
U server/src/main/webapp/WEB-INF/tags/kr/htmlAttributeHeaderCell.tag
U server/src/main/webapp/WEB-INF/tags/kr/documentControls.tag
U server/src/main/webapp/WEB-INF/tags/kr/tab.tag
U server/src/main/webapp/WEB-INF/tags/kr/notes.tag
U server/src/main/webapp/WEB-INF/tags/kr/hiddenDocumentFields.tag
U server/src/main/webapp/WEB-INF/tags/kr/tabTop.tag
U server/src/main/webapp/WEB-INF/tags/kr/adHocRecipients.tag
U server/src/main/webapp/WEB-INF/tags/kr/documentOverview.tag
U server/src/main/webapp/WEB-INF/tags/kr/fieldDefaultLabel.tag
U server/src/main/webapp/index.html
U server/src/main/webapp/kr/css/kuali.css

Comment by Eric Westfall [ 26/Jun/08 ]

Merge completed and committed.

Generated at Sun Jun 20 17:26:18 CDT 2021 using JIRA 7.0.11#70121-sha1:19d24976997c1d95f06f3e327e087be0b71f28d4.