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

Merge 0.9.4 branch into 1.0 branch - second 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-3114 was the last merge of this branch. This happened at revision 7713

      So next merge command will be:

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

        Attachments

          Activity

          Hide
          ewestfal Eric Westfall added a comment -

          Merge output was:

          eric-westfalls-macbook-pro-17:rice-1.0.0 ewestfal$ svn merge -r 7713:HEAD https://test.kuali.org/svn/rice/branches/rice-release-0-9-4-br
          A scripts/upgrades/0.9.3 to 0.9.4/db-updates-during-qa/05-20-2009.sql
          U impl/src/main/java/org/kuali/rice/kim/bo/impl/GroupImpl.java
          U impl/src/main/java/org/kuali/rice/kim/bo/options/MemberTypeValuesFinder.java
          A impl/src/main/java/org/kuali/rice/kim/bo/options/GroupMemberTypeValuesFinder.java
          U impl/src/main/java/org/kuali/rice/kim/bo/ui/KimDocumentRoleResponsibilityAction.java
          U impl/src/main/java/org/kuali/rice/kim/bo/ui/KimDocumentRoleResponsibility.java
          U impl/src/main/java/org/kuali/rice/kim/bo/ui/PersonDocumentGroup.java
          U impl/src/main/java/org/kuali/rice/kim/bo/ui/RoleDocumentDelegationMember.java
          U impl/src/main/java/org/kuali/rice/kim/bo/ui/KimDocumentRoleMember.java
          U impl/src/main/java/org/kuali/rice/kim/bo/ui/KimDocumentBoBase.java
          U impl/src/main/java/org/kuali/rice/kim/bo/ui/KimDocumentAttributeDataBusinessObjectBase.java
          U impl/src/main/java/org/kuali/rice/kim/bo/reference/impl/ExternalIdentifierTypeImpl.java
          A impl/src/main/java/org/kuali/rice/kim/bo/reference/dto
          A impl/src/main/java/org/kuali/rice/kim/bo/reference/dto/ExternalIdentifierTypeInfo.java
          U impl/src/main/java/org/kuali/rice/kim/service/KimTypeInfoService.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/KimTypeInfoServiceImpl.java
          U impl/src/main/java/org/kuali/rice/kim/service/impl/RoleManagementServiceImpl.java
          U impl/src/main/java/org/kuali/rice/kim/service/impl/ResponsibilityServiceImpl.java
          U impl/src/main/java/org/kuali/rice/kim/service/impl/RoleServiceImpl.java
          U impl/src/main/java/org/kuali/rice/kim/service/impl/PersonServiceImpl.java
          U impl/src/main/java/org/kuali/rice/kim/service/impl/PermissionServiceImpl.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/KimResponsibilityDaoOjb.java
          U impl/src/main/java/org/kuali/rice/kim/dao/impl/KimRoleDaoOjb.java
          U impl/src/main/java/org/kuali/rice/kim/lookup/PermissionLookupableHelperServiceImpl.java
          U impl/src/main/java/org/kuali/rice/kim/rules/ui/RoleDocumentDelegationMemberRule.java
          U impl/src/main/java/org/kuali/rice/kim/workflow/attribute/KimTypeQualifierResolver.java
          U impl/src/main/java/org/kuali/rice/kim/web/struts/form/IdentityManagementDocumentFormBase.java
          U impl/src/main/java/org/kuali/rice/kim/web/struts/form/IdentityManagementRoleDocumentForm.java
          U impl/src/main/java/org/kuali/rice/kim/web/struts/action/IdentityManagementGroupDocumentAction.java
          U impl/src/main/java/org/kuali/rice/kim/web/struts/action/IdentityManagementRoleDocumentAction.java
          U impl/src/main/java/org/kuali/rice/kim/web/struts/action/IdentityManagementDocumentActionBase.java
          U impl/src/main/java/org/kuali/rice/kim/document/IdentityManagementGroupDocument.java
          U impl/src/main/java/org/kuali/rice/kim/document/rule/IdentityManagementRoleDocumentRule.java
          U impl/src/main/java/org/kuali/rice/kim/document/rule/AttributeValidationHelper.java
          U impl/src/main/java/org/kuali/rice/kew/service/impl/KEWModuleService.java
          U impl/src/main/java/org/kuali/rice/kns/datadictionary/BusinessObjectEntry.java
          U impl/src/main/java/org/kuali/rice/kns/datadictionary/AttributeDefinition.java
          U impl/src/main/java/org/kuali/rice/kns/inquiry/KualiInquirableImpl.java
          U impl/src/main/java/org/kuali/rice/kns/bo/options/CountryNotRestrictedValuesFinder.java
          U impl/src/main/java/org/kuali/rice/kns/bo/options/StateValuesFinder.java
          A impl/src/main/java/org/kuali/rice/kns/bo/options/AbstractCountryValuesFinderBase.java
          U impl/src/main/java/org/kuali/rice/kns/bo/options/CountryValuesFinder.java
          U impl/src/main/java/org/kuali/rice/kns/service/ModuleService.java
          U impl/src/main/java/org/kuali/rice/kns/service/impl/BusinessObjectMetaDataServiceImpl.java
          U impl/src/main/java/org/kuali/rice/kns/service/impl/ModuleServiceBase.java
          U impl/src/main/java/org/kuali/rice/kns/dao/impl/BusinessObjectDaoOjb.java
          U impl/src/main/java/org/kuali/rice/kns/dao/impl/DocumentDaoOjb.java
          U impl/src/main/java/org/kuali/rice/kns/lookup/KualiLookupableImpl.java
          U impl/src/main/java/org/kuali/rice/kns/lookup/LookupableHelperService.java
          U impl/src/main/java/org/kuali/rice/kns/lookup/AbstractLookupableHelperServiceImpl.java
          U impl/src/main/java/org/kuali/rice/kns/lookup/KualiLookupableHelperServiceImpl.java
          U impl/src/main/java/org/kuali/rice/kns/lookup/LookupUtils.java
          U impl/src/main/java/org/kuali/rice/kns/lookup/Lookupable.java
          U impl/src/main/java/org/kuali/rice/kns/workflow/attribute/DataDictionarySearchableAttribute.java
          U impl/src/main/java/org/kuali/rice/kns/util/FieldUtils.java
          U impl/src/main/java/org/kuali/rice/kns/util/ObjectUtils.java
          U impl/src/main/java/org/kuali/rice/kns/util/RiceKeyConstants.java
          U impl/src/main/java/org/kuali/rice/kns/web/struts/form/InquiryForm.java
          U impl/src/main/java/org/kuali/rice/kns/web/struts/form/LookupForm.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/KualiMaintenanceDocumentAction.java
          U impl/src/main/java/org/kuali/rice/kns/web/struts/action/KualiLookupAction.java
          U impl/src/main/java/org/kuali/rice/kns/web/struts/action/KualiDocumentActionBase.java
          U impl/src/main/resources/KR-ApplicationResources.properties
          U impl/src/main/resources/org/kuali/rice/kim/bo/datadictionary/GroupDocumentMember.xml
          U impl/src/main/resources/org/kuali/rice/kim/bo/datadictionary/KimDocumentRoleMember.xml
          U api/src/main/java/org/kuali/rice/kim/bo/group/dto/GroupMembershipInfo.java
          U api/src/main/java/org/kuali/rice/kim/service/PermissionService.java
          U api/src/main/java/org/kuali/rice/kim/service/GroupService.java
          U api/src/main/java/org/kuali/rice/kim/service/RoleService.java
          U web/src/main/webapp/kim/WEB-INF/jsp/identityManagementRoleDocument.jsp
          U web/src/main/webapp/kim/WEB-INF/jsp/identityManagementGroupDocument.jsp
          D web/src/main/webapp/WEB-INF/tags/kim/roleDelegationMembers.tag
          U web/src/main/webapp/WEB-INF/tags/kim/roleResponsibilities.tag
          U web/src/main/webapp/WEB-INF/tags/kim/roleDelegations.tag
          U web/src/main/webapp/WEB-INF/tags/kim/groupOverview.tag
          U web/src/main/webapp/WEB-INF/tags/kim/roleOverview.tag
          U web/src/main/webapp/WEB-INF/tags/kim/groupAssignees.tag
          U web/src/main/webapp/WEB-INF/tags/kim/roleAssignees.tag
          U web/src/main/webapp/WEB-INF/tags/kr/rowDisplay.tag
          U web/src/main/webapp/kr/scripts/my_common.js
          A web/src/main/webapp/kr/static/images/tinybutton-refresh.gif

          Show
          ewestfal Eric Westfall added a comment - Merge output was: eric-westfalls-macbook-pro-17:rice-1.0.0 ewestfal$ svn merge -r 7713:HEAD https://test.kuali.org/svn/rice/branches/rice-release-0-9-4-br A scripts/upgrades/0.9.3 to 0.9.4/db-updates-during-qa/05-20-2009.sql U impl/src/main/java/org/kuali/rice/kim/bo/impl/GroupImpl.java U impl/src/main/java/org/kuali/rice/kim/bo/options/MemberTypeValuesFinder.java A impl/src/main/java/org/kuali/rice/kim/bo/options/GroupMemberTypeValuesFinder.java U impl/src/main/java/org/kuali/rice/kim/bo/ui/KimDocumentRoleResponsibilityAction.java U impl/src/main/java/org/kuali/rice/kim/bo/ui/KimDocumentRoleResponsibility.java U impl/src/main/java/org/kuali/rice/kim/bo/ui/PersonDocumentGroup.java U impl/src/main/java/org/kuali/rice/kim/bo/ui/RoleDocumentDelegationMember.java U impl/src/main/java/org/kuali/rice/kim/bo/ui/KimDocumentRoleMember.java U impl/src/main/java/org/kuali/rice/kim/bo/ui/KimDocumentBoBase.java U impl/src/main/java/org/kuali/rice/kim/bo/ui/KimDocumentAttributeDataBusinessObjectBase.java U impl/src/main/java/org/kuali/rice/kim/bo/reference/impl/ExternalIdentifierTypeImpl.java A impl/src/main/java/org/kuali/rice/kim/bo/reference/dto A impl/src/main/java/org/kuali/rice/kim/bo/reference/dto/ExternalIdentifierTypeInfo.java U impl/src/main/java/org/kuali/rice/kim/service/KimTypeInfoService.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/KimTypeInfoServiceImpl.java U impl/src/main/java/org/kuali/rice/kim/service/impl/RoleManagementServiceImpl.java U impl/src/main/java/org/kuali/rice/kim/service/impl/ResponsibilityServiceImpl.java U impl/src/main/java/org/kuali/rice/kim/service/impl/RoleServiceImpl.java U impl/src/main/java/org/kuali/rice/kim/service/impl/PersonServiceImpl.java U impl/src/main/java/org/kuali/rice/kim/service/impl/PermissionServiceImpl.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/KimResponsibilityDaoOjb.java U impl/src/main/java/org/kuali/rice/kim/dao/impl/KimRoleDaoOjb.java U impl/src/main/java/org/kuali/rice/kim/lookup/PermissionLookupableHelperServiceImpl.java U impl/src/main/java/org/kuali/rice/kim/rules/ui/RoleDocumentDelegationMemberRule.java U impl/src/main/java/org/kuali/rice/kim/workflow/attribute/KimTypeQualifierResolver.java U impl/src/main/java/org/kuali/rice/kim/web/struts/form/IdentityManagementDocumentFormBase.java U impl/src/main/java/org/kuali/rice/kim/web/struts/form/IdentityManagementRoleDocumentForm.java U impl/src/main/java/org/kuali/rice/kim/web/struts/action/IdentityManagementGroupDocumentAction.java U impl/src/main/java/org/kuali/rice/kim/web/struts/action/IdentityManagementRoleDocumentAction.java U impl/src/main/java/org/kuali/rice/kim/web/struts/action/IdentityManagementDocumentActionBase.java U impl/src/main/java/org/kuali/rice/kim/document/IdentityManagementGroupDocument.java U impl/src/main/java/org/kuali/rice/kim/document/rule/IdentityManagementRoleDocumentRule.java U impl/src/main/java/org/kuali/rice/kim/document/rule/AttributeValidationHelper.java U impl/src/main/java/org/kuali/rice/kew/service/impl/KEWModuleService.java U impl/src/main/java/org/kuali/rice/kns/datadictionary/BusinessObjectEntry.java U impl/src/main/java/org/kuali/rice/kns/datadictionary/AttributeDefinition.java U impl/src/main/java/org/kuali/rice/kns/inquiry/KualiInquirableImpl.java U impl/src/main/java/org/kuali/rice/kns/bo/options/CountryNotRestrictedValuesFinder.java U impl/src/main/java/org/kuali/rice/kns/bo/options/StateValuesFinder.java A impl/src/main/java/org/kuali/rice/kns/bo/options/AbstractCountryValuesFinderBase.java U impl/src/main/java/org/kuali/rice/kns/bo/options/CountryValuesFinder.java U impl/src/main/java/org/kuali/rice/kns/service/ModuleService.java U impl/src/main/java/org/kuali/rice/kns/service/impl/BusinessObjectMetaDataServiceImpl.java U impl/src/main/java/org/kuali/rice/kns/service/impl/ModuleServiceBase.java U impl/src/main/java/org/kuali/rice/kns/dao/impl/BusinessObjectDaoOjb.java U impl/src/main/java/org/kuali/rice/kns/dao/impl/DocumentDaoOjb.java U impl/src/main/java/org/kuali/rice/kns/lookup/KualiLookupableImpl.java U impl/src/main/java/org/kuali/rice/kns/lookup/LookupableHelperService.java U impl/src/main/java/org/kuali/rice/kns/lookup/AbstractLookupableHelperServiceImpl.java U impl/src/main/java/org/kuali/rice/kns/lookup/KualiLookupableHelperServiceImpl.java U impl/src/main/java/org/kuali/rice/kns/lookup/LookupUtils.java U impl/src/main/java/org/kuali/rice/kns/lookup/Lookupable.java U impl/src/main/java/org/kuali/rice/kns/workflow/attribute/DataDictionarySearchableAttribute.java U impl/src/main/java/org/kuali/rice/kns/util/FieldUtils.java U impl/src/main/java/org/kuali/rice/kns/util/ObjectUtils.java U impl/src/main/java/org/kuali/rice/kns/util/RiceKeyConstants.java U impl/src/main/java/org/kuali/rice/kns/web/struts/form/InquiryForm.java U impl/src/main/java/org/kuali/rice/kns/web/struts/form/LookupForm.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/KualiMaintenanceDocumentAction.java U impl/src/main/java/org/kuali/rice/kns/web/struts/action/KualiLookupAction.java U impl/src/main/java/org/kuali/rice/kns/web/struts/action/KualiDocumentActionBase.java U impl/src/main/resources/KR-ApplicationResources.properties U impl/src/main/resources/org/kuali/rice/kim/bo/datadictionary/GroupDocumentMember.xml U impl/src/main/resources/org/kuali/rice/kim/bo/datadictionary/KimDocumentRoleMember.xml U api/src/main/java/org/kuali/rice/kim/bo/group/dto/GroupMembershipInfo.java U api/src/main/java/org/kuali/rice/kim/service/PermissionService.java U api/src/main/java/org/kuali/rice/kim/service/GroupService.java U api/src/main/java/org/kuali/rice/kim/service/RoleService.java U web/src/main/webapp/kim/WEB-INF/jsp/identityManagementRoleDocument.jsp U web/src/main/webapp/kim/WEB-INF/jsp/identityManagementGroupDocument.jsp D web/src/main/webapp/WEB-INF/tags/kim/roleDelegationMembers.tag U web/src/main/webapp/WEB-INF/tags/kim/roleResponsibilities.tag U web/src/main/webapp/WEB-INF/tags/kim/roleDelegations.tag U web/src/main/webapp/WEB-INF/tags/kim/groupOverview.tag U web/src/main/webapp/WEB-INF/tags/kim/roleOverview.tag U web/src/main/webapp/WEB-INF/tags/kim/groupAssignees.tag U web/src/main/webapp/WEB-INF/tags/kim/roleAssignees.tag U web/src/main/webapp/WEB-INF/tags/kr/rowDisplay.tag U web/src/main/webapp/kr/scripts/my_common.js A web/src/main/webapp/kr/static/images/tinybutton-refresh.gif
          Hide
          ewestfal Eric Westfall added a comment -

          Merge complete at revision 7801

          Show
          ewestfal Eric Westfall added a comment - Merge complete at revision 7801
          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:
              0 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: