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

Merge 0.9.4 branch into 1.0 branch - third merge

    Details

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

      Description

      KULRICE-3128 was the last merge of this branch. This happened at revision 7801

      So next merge command will be:

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

        Attachments

          Issue Links

            Activity

            Hide
            ewestfal Eric Westfall added a comment -

            Merge output was:

            U impl/src/main/java/org/kuali/rice/kim/bo/types/dto/AttributeDefinitionMap.java
            C impl/src/main/java/org/kuali/rice/kim/bo/ui/KimDocumentRoleResponsibilityAction.java
            U impl/src/main/java/org/kuali/rice/kim/bo/ui/RoleDocumentDelegationMember.java
            U impl/src/main/java/org/kuali/rice/kim/service/impl/GroupServiceImpl.java
            U impl/src/main/java/org/kuali/rice/kim/service/impl/UiDocumentServiceImpl.java
            U impl/src/main/java/org/kuali/rice/kim/service/impl/RoleServiceImpl.java
            U impl/src/main/java/org/kuali/rice/kim/service/support/impl/PassThruRoleTypeServiceBase.java
            U impl/src/main/java/org/kuali/rice/kim/service/support/impl/KimTypeServiceBase.java
            U impl/src/main/java/org/kuali/rice/kim/service/support/KimTypeService.java
            U impl/src/main/java/org/kuali/rice/kim/service/UiDocumentService.java
            U impl/src/main/java/org/kuali/rice/kim/dao/impl/KimRoleDaoOjb.java
            U impl/src/main/java/org/kuali/rice/kim/dao/KimRoleDao.java
            A impl/src/main/java/org/kuali/rice/kim/rule/event/ui/AddPersonDelegationMemberEvent.java
            A impl/src/main/java/org/kuali/rice/kim/rule/event/ui/AddPersonDocumentDelegationMemberQualifierEvent.java
            A impl/src/main/java/org/kuali/rice/kim/rule/ui/AddPersonDelegationMemberRule.java
            A impl/src/main/java/org/kuali/rice/kim/rule/ui/AddPersonDocumentDelegationMemberQualifierRule.java
            A impl/src/main/java/org/kuali/rice/kim/lookup/RoleMemberImplLookupableHelperServiceImpl.java
            U impl/src/main/java/org/kuali/rice/kim/rules/ui/KimDocumentMemberRule.java
            U impl/src/main/java/org/kuali/rice/kim/rules/ui/PersonDocumentRoleRule.java
            A impl/src/main/java/org/kuali/rice/kim/rules/ui/PersonDocumentDelegationMemberRule.java
            U impl/src/main/java/org/kuali/rice/kim/rules/ui/PersonDocumentGroupRule.java
            U impl/src/main/java/org/kuali/rice/kim/rules/ui/RoleDocumentDelegationMemberRule.java
            U impl/src/main/java/org/kuali/rice/kim/util/KimCommonUtils.java
            U impl/src/main/java/org/kuali/rice/kim/web/struts/form/IdentityManagementPersonDocumentForm.java
            C impl/src/main/java/org/kuali/rice/kim/web/struts/action/IdentityManagementPersonDocumentAction.java
            U impl/src/main/java/org/kuali/rice/kim/document/IdentityManagementKimDocument.java
            C impl/src/main/java/org/kuali/rice/kim/document/IdentityManagementRoleDocument.java
            U impl/src/main/java/org/kuali/rice/kim/document/rule/IdentityManagementRoleDocumentRule.java
            U impl/src/main/java/org/kuali/rice/kim/document/rule/IdentityManagementPersonDocumentRule.java
            U impl/src/main/java/org/kuali/rice/kim/document/rule/IdentityManagementGroupDocumentRule.java
            U impl/src/main/java/org/kuali/rice/kim/document/rule/AttributeValidationHelper.java
            A impl/src/main/java/org/kuali/rice/kim/document/KimTypeAttributesHelper.java
            U impl/src/main/java/org/kuali/rice/kim/document/IdentityManagementPersonDocument.java
            C impl/src/main/java/org/kuali/rice/kim/document/IdentityManagementTypeAttributeTransactionalDocument.java
            C impl/src/main/java/org/kuali/rice/kew/bo/lookup/DocSearchCriteriaDTOLookupableHelperServiceImpl.java
            U impl/src/main/java/org/kuali/rice/kew/doctype/bo/DocumentType.java
            U impl/src/main/java/org/kuali/rice/kew/actionlist/web/ActionListAction.java
            U impl/src/main/java/org/kuali/rice/kew/actionlist/web/ActionListForm.java
            U impl/src/main/java/org/kuali/rice/kns/datadictionary/DocumentEntry.java
            U impl/src/main/java/org/kuali/rice/kns/datadictionary/mask/MaskFormatterSubString.java
            U impl/src/main/java/org/kuali/rice/kns/inquiry/KualiInquirableImpl.java
            U impl/src/main/java/org/kuali/rice/kns/service/impl/ParameterServiceBase.java
            U impl/src/main/java/org/kuali/rice/kns/service/impl/CampusRoleTypeServiceImpl.java
            U impl/src/main/java/org/kuali/rice/kns/lookup/AbstractLookupableHelperServiceImpl.java
            U impl/src/main/java/org/kuali/rice/kns/util/OjbCollectionHelper.java
            U impl/src/main/java/org/kuali/rice/kns/web/struts/form/KualiForm.java
            U impl/src/main/java/org/kuali/rice/kns/web/struts/action/KualiAction.java
            U impl/src/main/java/org/kuali/rice/kns/web/struts/action/KualiDocumentActionBase.java
            U impl/src/main/java/org/kuali/rice/kns/document/MaintenanceDocumentBase.java
            U impl/src/main/resources/KR-ApplicationResources.properties
            U impl/src/main/resources/org/kuali/rice/kim/bo/datadictionary/KimAttributes.xml
            A impl/src/main/resources/org/kuali/rice/kim/bo/datadictionary/RoleMemberImpl.xml
            U impl/src/main/resources/org/kuali/rice/kim/config/KIMImplementationSpringBeans.xml
            U impl/src/main/resources/org/kuali/rice/kim/config/OJB-repository-kim.xml
            U impl/src/main/resources/org/kuali/rice/kim/config/KIMInterfaceSpringBeans.xml
            U api/src/main/java/org/kuali/rice/kim/service/GroupService.java
            U api/src/main/java/org/kuali/rice/kim/util/KimConstants.java
            U api/src/main/java/org/kuali/rice/kns/util/KNSConstants.java
            U web/src/main/webapp/kim/WEB-INF/jsp/identityManagementRoleDocument.jsp
            U web/src/main/webapp/kim/WEB-INF/jsp/identityManagementPersonDocument.jsp
            U web/src/main/webapp/kew/WEB-INF/jsp/ActionList/ActionListNew.jsp
            U web/src/main/webapp/WEB-INF/tags/kim/personName.tag
            U web/src/main/webapp/WEB-INF/tags/kim/personAddress.tag
            U web/src/main/webapp/WEB-INF/tags/kim/personAffln.tag
            U web/src/main/webapp/WEB-INF/tags/kim/personEmail.tag
            U web/src/main/webapp/WEB-INF/tags/kim/roleDelegations.tag
            U web/src/main/webapp/WEB-INF/tags/kim/personMembership.tag
            U web/src/main/webapp/WEB-INF/tags/kim/personGroup.tag
            U web/src/main/webapp/WEB-INF/tags/kim/personEmpInfo.tag
            A web/src/main/webapp/WEB-INF/tags/kim/personDelegations.tag
            U web/src/main/webapp/WEB-INF/tags/kim/personRole.tag
            U web/src/main/webapp/WEB-INF/tags/kim/roleOverview.tag
            A web/src/main/webapp/WEB-INF/tags/kim/personDelegationMemberQualifier.tag
            U web/src/main/webapp/WEB-INF/tags/kim/personOverview.tag
            U web/src/main/webapp/WEB-INF/tags/kim/groupAssignees.tag
            U web/src/main/webapp/WEB-INF/tags/kim/personPhone.tag
            C web/src/main/webapp/WEB-INF/tags/kim/responsibilityActions.tag
            U web/src/main/webapp/WEB-INF/tags/kim/groupAttributes.tag
            C web/src/main/webapp/WEB-INF/tags/kim/roleAssignees.tag
            U web/src/main/webapp/kr/scripts/my_common.js

            Show
            ewestfal Eric Westfall added a comment - Merge output was: U impl/src/main/java/org/kuali/rice/kim/bo/types/dto/AttributeDefinitionMap.java C impl/src/main/java/org/kuali/rice/kim/bo/ui/KimDocumentRoleResponsibilityAction.java U impl/src/main/java/org/kuali/rice/kim/bo/ui/RoleDocumentDelegationMember.java U impl/src/main/java/org/kuali/rice/kim/service/impl/GroupServiceImpl.java U impl/src/main/java/org/kuali/rice/kim/service/impl/UiDocumentServiceImpl.java U impl/src/main/java/org/kuali/rice/kim/service/impl/RoleServiceImpl.java U impl/src/main/java/org/kuali/rice/kim/service/support/impl/PassThruRoleTypeServiceBase.java U impl/src/main/java/org/kuali/rice/kim/service/support/impl/KimTypeServiceBase.java U impl/src/main/java/org/kuali/rice/kim/service/support/KimTypeService.java U impl/src/main/java/org/kuali/rice/kim/service/UiDocumentService.java U impl/src/main/java/org/kuali/rice/kim/dao/impl/KimRoleDaoOjb.java U impl/src/main/java/org/kuali/rice/kim/dao/KimRoleDao.java A impl/src/main/java/org/kuali/rice/kim/rule/event/ui/AddPersonDelegationMemberEvent.java A impl/src/main/java/org/kuali/rice/kim/rule/event/ui/AddPersonDocumentDelegationMemberQualifierEvent.java A impl/src/main/java/org/kuali/rice/kim/rule/ui/AddPersonDelegationMemberRule.java A impl/src/main/java/org/kuali/rice/kim/rule/ui/AddPersonDocumentDelegationMemberQualifierRule.java A impl/src/main/java/org/kuali/rice/kim/lookup/RoleMemberImplLookupableHelperServiceImpl.java U impl/src/main/java/org/kuali/rice/kim/rules/ui/KimDocumentMemberRule.java U impl/src/main/java/org/kuali/rice/kim/rules/ui/PersonDocumentRoleRule.java A impl/src/main/java/org/kuali/rice/kim/rules/ui/PersonDocumentDelegationMemberRule.java U impl/src/main/java/org/kuali/rice/kim/rules/ui/PersonDocumentGroupRule.java U impl/src/main/java/org/kuali/rice/kim/rules/ui/RoleDocumentDelegationMemberRule.java U impl/src/main/java/org/kuali/rice/kim/util/KimCommonUtils.java U impl/src/main/java/org/kuali/rice/kim/web/struts/form/IdentityManagementPersonDocumentForm.java C impl/src/main/java/org/kuali/rice/kim/web/struts/action/IdentityManagementPersonDocumentAction.java U impl/src/main/java/org/kuali/rice/kim/document/IdentityManagementKimDocument.java C impl/src/main/java/org/kuali/rice/kim/document/IdentityManagementRoleDocument.java U impl/src/main/java/org/kuali/rice/kim/document/rule/IdentityManagementRoleDocumentRule.java U impl/src/main/java/org/kuali/rice/kim/document/rule/IdentityManagementPersonDocumentRule.java U impl/src/main/java/org/kuali/rice/kim/document/rule/IdentityManagementGroupDocumentRule.java U impl/src/main/java/org/kuali/rice/kim/document/rule/AttributeValidationHelper.java A impl/src/main/java/org/kuali/rice/kim/document/KimTypeAttributesHelper.java U impl/src/main/java/org/kuali/rice/kim/document/IdentityManagementPersonDocument.java C impl/src/main/java/org/kuali/rice/kim/document/IdentityManagementTypeAttributeTransactionalDocument.java C impl/src/main/java/org/kuali/rice/kew/bo/lookup/DocSearchCriteriaDTOLookupableHelperServiceImpl.java U impl/src/main/java/org/kuali/rice/kew/doctype/bo/DocumentType.java U impl/src/main/java/org/kuali/rice/kew/actionlist/web/ActionListAction.java U impl/src/main/java/org/kuali/rice/kew/actionlist/web/ActionListForm.java U impl/src/main/java/org/kuali/rice/kns/datadictionary/DocumentEntry.java U impl/src/main/java/org/kuali/rice/kns/datadictionary/mask/MaskFormatterSubString.java U impl/src/main/java/org/kuali/rice/kns/inquiry/KualiInquirableImpl.java U impl/src/main/java/org/kuali/rice/kns/service/impl/ParameterServiceBase.java U impl/src/main/java/org/kuali/rice/kns/service/impl/CampusRoleTypeServiceImpl.java U impl/src/main/java/org/kuali/rice/kns/lookup/AbstractLookupableHelperServiceImpl.java U impl/src/main/java/org/kuali/rice/kns/util/OjbCollectionHelper.java U impl/src/main/java/org/kuali/rice/kns/web/struts/form/KualiForm.java U impl/src/main/java/org/kuali/rice/kns/web/struts/action/KualiAction.java U impl/src/main/java/org/kuali/rice/kns/web/struts/action/KualiDocumentActionBase.java U impl/src/main/java/org/kuali/rice/kns/document/MaintenanceDocumentBase.java U impl/src/main/resources/KR-ApplicationResources.properties U impl/src/main/resources/org/kuali/rice/kim/bo/datadictionary/KimAttributes.xml A impl/src/main/resources/org/kuali/rice/kim/bo/datadictionary/RoleMemberImpl.xml U impl/src/main/resources/org/kuali/rice/kim/config/KIMImplementationSpringBeans.xml U impl/src/main/resources/org/kuali/rice/kim/config/OJB-repository-kim.xml U impl/src/main/resources/org/kuali/rice/kim/config/KIMInterfaceSpringBeans.xml U api/src/main/java/org/kuali/rice/kim/service/GroupService.java U api/src/main/java/org/kuali/rice/kim/util/KimConstants.java U api/src/main/java/org/kuali/rice/kns/util/KNSConstants.java U web/src/main/webapp/kim/WEB-INF/jsp/identityManagementRoleDocument.jsp U web/src/main/webapp/kim/WEB-INF/jsp/identityManagementPersonDocument.jsp U web/src/main/webapp/kew/WEB-INF/jsp/ActionList/ActionListNew.jsp U web/src/main/webapp/WEB-INF/tags/kim/personName.tag U web/src/main/webapp/WEB-INF/tags/kim/personAddress.tag U web/src/main/webapp/WEB-INF/tags/kim/personAffln.tag U web/src/main/webapp/WEB-INF/tags/kim/personEmail.tag U web/src/main/webapp/WEB-INF/tags/kim/roleDelegations.tag U web/src/main/webapp/WEB-INF/tags/kim/personMembership.tag U web/src/main/webapp/WEB-INF/tags/kim/personGroup.tag U web/src/main/webapp/WEB-INF/tags/kim/personEmpInfo.tag A web/src/main/webapp/WEB-INF/tags/kim/personDelegations.tag U web/src/main/webapp/WEB-INF/tags/kim/personRole.tag U web/src/main/webapp/WEB-INF/tags/kim/roleOverview.tag A web/src/main/webapp/WEB-INF/tags/kim/personDelegationMemberQualifier.tag U web/src/main/webapp/WEB-INF/tags/kim/personOverview.tag U web/src/main/webapp/WEB-INF/tags/kim/groupAssignees.tag U web/src/main/webapp/WEB-INF/tags/kim/personPhone.tag C web/src/main/webapp/WEB-INF/tags/kim/responsibilityActions.tag U web/src/main/webapp/WEB-INF/tags/kim/groupAttributes.tag C web/src/main/webapp/WEB-INF/tags/kim/roleAssignees.tag U web/src/main/webapp/kr/scripts/my_common.js
            Hide
            ewestfal Eric Westfall added a comment -

            This merge has been completed and committed. There were some issues with the merge. It appears that in one of the branches there were numerous places where KimTypeImpl was replaced with usage of KimTypeInfo. However, on the other branch, there was lots of new code added that used the old KimTypeImpl code. I had to manually figure out how to reconcile these. We'll need to test and make sure that the KIM documents are still working as required after this merge.

            Show
            ewestfal Eric Westfall added a comment - This merge has been completed and committed. There were some issues with the merge. It appears that in one of the branches there were numerous places where KimTypeImpl was replaced with usage of KimTypeInfo. However, on the other branch, there was lots of new code added that used the old KimTypeImpl code. I had to manually figure out how to reconcile these. We'll need to test and make sure that the KIM documents are still working as required after this merge.
            Hide
            ewestfal Eric Westfall added a comment -

            Merge was committed at revision 7939

            Show
            ewestfal Eric Westfall added a comment - Merge was committed at revision 7939
            Hide
            abyrne Ailish Byrne added a comment -

            added jonathan as a watcher - he should review this type info / type impl business

            Show
            abyrne Ailish Byrne added a comment - added jonathan as a watcher - he should review this type info / type impl business
            Hide
            jkeller Jonathan Keller added a comment -

            OK. I took a look at the use of KimTypeImpl and created the linked KFSMI JIRA. (KFSMI-3913)

            Show
            jkeller Jonathan Keller added a comment - OK. I took a look at the use of KimTypeImpl and created the linked KFSMI JIRA. ( KFSMI-3913 )
            Hide
            ewestfal Eric Westfall added a comment -

            Bulk change of all Rice 1.0 issues to closed after public release.

            Show
            ewestfal Eric Westfall added a comment - Bulk change of all Rice 1.0 issues to closed after public release.

              People

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

                Dates

                • Created:
                  Updated:
                  Resolved: