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

Merge 0.9.4-facetoface branch into 0.9.4 branch

    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

      We need to merge the changes from the facetoface branch into the main branch. I will likely do an intermediate merge into a branch created off of head named: rice-release-0-9-4-merge-br since there will be impacting changes as a result of the merge.

        Attachments

          Activity

          Hide
          ewestfal Eric Westfall added a comment -

          facetoface branch was created at revision 5581:

          ------------------------------------------------------------------------
          r5581 | ewestfal | 2008-12-09 08:53:10 -0500 (Tue, 09 Dec 2008) | 1 line

          Creating a branch for the people at the face-to-face to work on.
          ------------------------------------------------------------------------

          Show
          ewestfal Eric Westfall added a comment - facetoface branch was created at revision 5581: ------------------------------------------------------------------------ r5581 | ewestfal | 2008-12-09 08:53:10 -0500 (Tue, 09 Dec 2008) | 1 line Creating a branch for the people at the face-to-face to work on. ------------------------------------------------------------------------
          Hide
          ewestfal Eric Westfall added a comment -
          Show
          ewestfal Eric Westfall added a comment - Merge command would be: svn merge -r 5581:HEAD https://test.kuali.org/svn/rice/branches/rice-release-0-9-4-facetoface-br
          Hide
          ewestfal Eric Westfall added a comment -

          Merge output:

          129-79-44-31:rice-0.9.4 ewestfal$ svn merge -r 5581:HEAD https://test.kuali.org/svn/rice/branches/rice-release-0-9-4-facetoface-br
          U kew/src/test/java/org/kuali/rice/kew/test/TestUtilities.java
          U kew/src/test/java/org/kuali/rice/kew/test/KEWTestCase.java
          U kew/src/test/java/org/kuali/rice/kew/mail/EmailReminderLifecycleTest.java
          U kew/src/test/java/org/kuali/rice/kew/postprocessor/PostProcessorTest.java
          U kew/src/test/java/org/kuali/rice/kew/notification/NotificationServiceTest.java
          U kew/src/test/java/org/kuali/rice/kew/docsearch/DocumentSearchTestBase.java
          U kew/src/test/java/org/kuali/rice/kew/docsearch/DocumentSearchTest.java
          U kew/src/test/java/org/kuali/rice/kew/docsearch/TestXMLSearchableAttributeDateTime.java
          U kew/src/test/java/org/kuali/rice/kew/docsearch/TestXMLSearchableAttributeLong.java
          U kew/src/test/java/org/kuali/rice/kew/docsearch/xml/StandardGenericXMLSearchableAttributeRangesTest.java
          U kew/src/test/java/org/kuali/rice/kew/docsearch/xml/StandardGenericXMLSearchableAttributeTest.java
          U kew/src/test/java/org/kuali/rice/kew/docsearch/TestXMLSearchableAttributeFloat.java
          U kew/src/test/java/org/kuali/rice/kew/docsearch/TestXMLSearchableAttributeString.java
          U kew/src/test/java/org/kuali/rice/kew/docsearch/MockSearchableAttribute.java
          U kew/src/test/java/org/kuali/rice/kew/docsearch/DocumentSearchSecurityTest.java
          U kew/src/test/java/org/kuali/rice/kew/docsearch/CustomDocumentSearchResultProcessorTest.java
          C kew/src/test/java/org/kuali/rice/kew/actionitem/ActionItemServiceTest.java
          A kew/src/test/java/org/kuali/rice/kew/workgroup/GroupImportTest.java
          U kew/src/test/java/org/kuali/rice/kew/actions/SuperUserActionRequestApproveEventTest.java
          U kew/src/test/java/org/kuali/rice/kew/actions/FutureRequestsTest.java
          U kew/src/test/java/org/kuali/rice/kew/actions/ReleaseWorkgroupAuthorityTest.java
          U kew/src/test/java/org/kuali/rice/kew/actions/TakeWorkgroupAuthorityTest.java
          U kew/src/test/java/org/kuali/rice/kew/actions/AcknowledgeActionTest.java
          U kew/src/test/java/org/kuali/rice/kew/actions/RevokeAdHocActionTest.java
          U kew/src/test/java/org/kuali/rice/kew/actions/ClearFYIActionTest.java
          U kew/src/test/java/org/kuali/rice/kew/actions/AdHocRouteTest.java
          A kew/src/test/java/org/kuali/rice/kew/xml/export/GroupXmlExporterTest.java
          U kew/src/test/java/org/kuali/rice/kew/routemodule/TestRouteModule.java
          U kew/src/test/java/org/kuali/rice/kew/routemodule/TestRouteModuleXMLHelper.java
          U kew/src/test/java/org/kuali/rice/kew/server/BeanConverterTester.java
          Skipped missing target: 'kew/src/test/java/org/kuali/rice/kew/server/SimpleDocumentActionsWebServiceTest.java'
          U kew/src/test/java/org/kuali/rice/kew/server/WorkflowUtilityTest.java
          U kew/src/test/java/org/kuali/rice/kew/rule/AddRuleDelegationTest.java
          U kew/src/test/java/org/kuali/rice/kew/rule/service/impl/RoleServiceTest.java
          U kew/src/test/java/org/kuali/rice/kew/rule/xmlrouting/StandardGenericXMLRuleAttributeTest.java
          U kew/src/test/java/org/kuali/rice/kew/actionlist/OutboxTest.java
          C kew/src/test/java/org/kuali/rice/kew/actionlist/ActionListTest.java
          U kew/src/test/java/org/kuali/rice/kew/actionlist/web/ActionListActionTest.java
          A kew/src/test/java/org/kuali/rice/kew/actionlist/web/ActionListFilterActionTest.java
          U kew/src/test/java/mocks/MockRuleServiceImpl.java
          U kew/src/test/resources/org/kuali/rice/kew/test/DefaultTestData.sql
          A kew/src/test/resources/org/kuali/rice/kew/workgroup/GroupXmlImportTest.xml
          U scripts/upgrades/0.9.3 to 0.9.4/kew-upgrade-0.9.3-to-0.9.4.sql
          U kns/src/test/java/org/kuali/rice/kns/impls/MockWorkflowDocument.java
          U kns/src/test/java/org/kuali/rice/kns/document/DocumentAuthorizerBaseTest.java
          U impl/src/main/java/org/kuali/rice/kim/bo/types/impl/KimTypeImpl.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/IdentityManagementServiceImpl.java
          U impl/src/main/java/org/kuali/rice/kim/service/KIMServiceLocator.java
          A impl/src/main/java/org/kuali/rice/kim/service/support/KimTypeInternalService.java
          A impl/src/main/java/org/kuali/rice/kim/service/support/impl/KimTypeInternalServiceImpl.java
          A impl/src/main/java/org/kuali/rice/kim/dao/impl/KimTypeDaoJpa.java
          A impl/src/main/java/org/kuali/rice/kim/dao/impl/KimTypeDaoOjb.java
          A impl/src/main/java/org/kuali/rice/kim/dao/KimTypeDao.java
          C impl/src/main/java/org/kuali/rice/kim/util/KimConstants.java
          U impl/src/main/java/org/kuali/rice/kew/export/ExportDataSet.java
          U impl/src/main/java/org/kuali/rice/kew/batch/XmlDigesterServiceImpl.java
          C impl/src/main/java/org/kuali/rice/kew/dto/DTOConverter.java
          U impl/src/main/java/org/kuali/rice/kew/removereplace/service/impl/RemoveReplaceDocumentServiceImpl.java
          U impl/src/main/java/org/kuali/rice/kew/removereplace/WorkgroupTarget.java
          C impl/src/main/java/org/kuali/rice/kew/removereplace/web/RemoveReplaceAction.java
          U impl/src/main/java/org/kuali/rice/kew/removereplace/web/RemoveReplaceWorkgroup.java
          U impl/src/main/java/org/kuali/rice/kew/removereplace/web/RemoveReplaceForm.java
          D impl/src/main/java/org/kuali/rice/kew/lookupable/RoleLookupableImpl.java
          D impl/src/main/java/org/kuali/rice/kew/lookupable/RuleTemplateLookupableImpl.java
          D impl/src/main/java/org/kuali/rice/kew/lookupable/EDocLiteLookupable.java
          D impl/src/main/java/org/kuali/rice/kew/lookupable/Row.java
          D impl/src/main/java/org/kuali/rice/kew/lookupable/LookupAction.java
          D impl/src/main/java/org/kuali/rice/kew/lookupable/DocumentTypeLookupableImpl.java
          D impl/src/main/java/org/kuali/rice/kew/lookupable/Field.java
          D impl/src/main/java/org/kuali/rice/kew/lookupable/WorkflowLookupable.java
          D impl/src/main/java/org/kuali/rice/kew/lookupable/RuleAttributeLookupableImpl.java
          U impl/src/main/java/org/kuali/rice/kew/lookupable/RuleBaseValuesLookupableImpl.java
          U impl/src/main/java/org/kuali/rice/kew/webservice/impl/SimpleDocumentActionsWebServiceImpl.java
          D impl/src/main/java/org/kuali/rice/kew/workgroup/WorkgroupTypeLookupable.java
          U impl/src/main/java/org/kuali/rice/kew/workgroup/WorkgroupMembershipChangeProcessor.java
          U impl/src/main/java/org/kuali/rice/kew/workgroup/BaseWorkgroupRoutingService.java
          U impl/src/main/java/org/kuali/rice/kew/actiontaken/service/ActionTakenService.java
          U impl/src/main/java/org/kuali/rice/kew/actiontaken/service/impl/ActionTakenServiceImpl.java
          U impl/src/main/java/org/kuali/rice/kew/actiontaken/ActionTakenValue.java
          U impl/src/main/java/org/kuali/rice/kew/attribute/ExtensionAttribute.java
          U impl/src/main/java/org/kuali/rice/kew/attribute/web/WebField.java
          U impl/src/main/java/org/kuali/rice/kew/attribute/web/WebExtensions.java
          U impl/src/main/java/org/kuali/rice/kew/doctype/DocumentTypeLookupableHelperServiceImpl.java
          U impl/src/main/java/org/kuali/rice/kew/doctype/web/DocumentTypeAction.java
          C impl/src/main/java/org/kuali/rice/kew/actionlist/service/impl/ActionListServiceImpl.java
          C impl/src/main/java/org/kuali/rice/kew/actionlist/service/ActionListService.java
          C impl/src/main/java/org/kuali/rice/kew/actionlist/dao/impl/ActionListDAOJpaImpl.java
          C impl/src/main/java/org/kuali/rice/kew/actionlist/dao/impl/ActionListDAOOjbImpl.java
          C impl/src/main/java/org/kuali/rice/kew/actionlist/web/ActionListAction.java
          C impl/src/main/java/org/kuali/rice/kew/actionlist/web/ActionListFilterAction.java
          C impl/src/main/java/org/kuali/rice/kew/web/session/UserSession.java
          C impl/src/main/java/org/kuali/rice/kew/web/backdoor/BackdoorAction.java
          U impl/src/main/java/org/kuali/rice/kew/web/WorkflowRoutingForm.java
          U impl/src/main/java/org/kuali/rice/kew/web/WorkflowAction.java
          C impl/src/main/java/org/kuali/rice/kew/web/UserLoginFilter.java
          C impl/src/main/java/org/kuali/rice/kew/mail/service/impl/StyleableEmailContentServiceImpl.java
          U impl/src/main/java/org/kuali/rice/kew/actionrequest/service/impl/ActionRequestServiceImpl.java
          U impl/src/main/java/org/kuali/rice/kew/actionrequest/service/ActionRequestService.java
          U impl/src/main/java/org/kuali/rice/kew/actionrequest/ActionRequestValue.java
          U impl/src/main/java/org/kuali/rice/kew/actionrequest/dao/impl/ActionRequestDAOOjbImpl.java
          U impl/src/main/java/org/kuali/rice/kew/actionrequest/dao/ActionRequestDAO.java
          U impl/src/main/java/org/kuali/rice/kew/actionrequest/ActionRequestFactory.java
          C impl/src/main/java/org/kuali/rice/kew/identity/service/impl/IdentityHelperServiceImpl.java
          C impl/src/main/java/org/kuali/rice/kew/identity/service/IdentityHelperService.java
          A impl/src/main/java/org/kuali/rice/kew/docsearch/DocumentSearchField.java
          U impl/src/main/java/org/kuali/rice/kew/docsearch/StandardDocumentSearchCriteriaProcessor.java
          U impl/src/main/java/org/kuali/rice/kew/docsearch/DocumentSearchResultComponents.java
          U impl/src/main/java/org/kuali/rice/kew/docsearch/DocSearchUtils.java
          U impl/src/main/java/org/kuali/rice/kew/docsearch/SearchableAttribute.java
          U impl/src/main/java/org/kuali/rice/kew/docsearch/service/impl/DocumentSearchServiceImpl.java
          U impl/src/main/java/org/kuali/rice/kew/docsearch/xml/DocumentSearchXMLResultProcessorImpl.java
          U impl/src/main/java/org/kuali/rice/kew/docsearch/xml/StandardGenericXMLSearchableAttribute.java
          A impl/src/main/java/org/kuali/rice/kew/docsearch/DocumentSearchColumn.java
          U impl/src/main/java/org/kuali/rice/kew/docsearch/StandardDocumentSearchResultProcessor.java
          U impl/src/main/java/org/kuali/rice/kew/docsearch/DocSearchCriteriaDTO.java
          U impl/src/main/java/org/kuali/rice/kew/docsearch/DocumentSearchCriteriaProcessor.java
          A impl/src/main/java/org/kuali/rice/kew/docsearch/DocumentSearchRow.java
          U impl/src/main/java/org/kuali/rice/kew/docsearch/StandardDocumentSearchGenerator.java
          U impl/src/main/java/org/kuali/rice/kew/docsearch/web/DocumentSearchAction.java
          U impl/src/main/java/org/kuali/rice/kew/docsearch/web/DocumentSearchForm.java
          C impl/src/main/java/org/kuali/rice/kew/actionitem/ActionItemActionListExtension.java
          C impl/src/main/java/org/kuali/rice/kew/actionitem/dao/impl/ActionItemDAOJpaImpl.java
          C impl/src/main/java/org/kuali/rice/kew/actionitem/dao/impl/ActionItemDAOOjbImpl.java
          U impl/src/main/java/org/kuali/rice/kew/superuser/web/SuperUserAction.java
          U impl/src/main/java/org/kuali/rice/kew/documentoperation/web/DocumentOperationAction.java
          U impl/src/main/java/org/kuali/rice/kew/actions/ReleaseWorkgroupAuthority.java
          U impl/src/main/java/org/kuali/rice/kew/actions/DisapproveAction.java
          U impl/src/main/java/org/kuali/rice/kew/actions/TakeWorkgroupAuthority.java
          U impl/src/main/java/org/kuali/rice/kew/actions/AdHocRevoke.java
          U impl/src/main/java/org/kuali/rice/kew/actions/ActionTakenEvent.java
          U impl/src/main/java/org/kuali/rice/kew/actions/AdHocAction.java
          C impl/src/main/java/org/kuali/rice/kew/service/impl/WorkflowUtilityWebServiceImpl.java
          U impl/src/main/java/org/kuali/rice/kew/service/impl/WorkflowDocumentActionsWebServiceImpl.java
          U impl/src/main/java/org/kuali/rice/kew/service/WorkflowDocument.java
          U impl/src/main/java/org/kuali/rice/kew/xml/export/RuleXmlExporter.java
          A impl/src/main/java/org/kuali/rice/kew/xml/export/GroupXmlExporter.java
          U impl/src/main/java/org/kuali/rice/kew/xml/export/WorkgroupXmlExporter.java
          U impl/src/main/java/org/kuali/rice/kew/xml/RuleXmlParser.java
          U impl/src/main/java/org/kuali/rice/kew/xml/WorkgroupXmlConstants.java
          U impl/src/main/java/org/kuali/rice/kew/xml/WorkgroupXmlHandler.java
          A impl/src/main/java/org/kuali/rice/kew/xml/GroupXmlServiceImpl.java
          A impl/src/main/java/org/kuali/rice/kew/xml/GroupXmlParser.java
          U impl/src/main/java/org/kuali/rice/kew/xml/XmlConstants.java
          U impl/src/main/java/org/kuali/rice/kew/engine/simulation/SimulationEngine.java
          U impl/src/main/java/org/kuali/rice/kew/engine/node/FYIByUniversityId.java
          U impl/src/main/java/org/kuali/rice/kew/engine/node/FYIByNetworkId.java
          U impl/src/main/java/org/kuali/rice/kew/routeheader/service/impl/WorkflowDocumentServiceImpl.java
          U impl/src/main/java/org/kuali/rice/kew/routeheader/service/WorkflowDocumentService.java
          U impl/src/main/java/org/kuali/rice/kew/rule/OddSearchAttribute.java
          C impl/src/main/java/org/kuali/rice/kew/rule/dao/impl/RuleDAOOjbImpl.java
          U impl/src/main/java/org/kuali/rice/kew/rule/dao/RuleDAO.java
          U impl/src/main/java/org/kuali/rice/kew/rule/FlexRM.java
          U impl/src/main/java/org/kuali/rice/kew/rule/WorkgroupTypeRoutingAttribute.java
          U impl/src/main/java/org/kuali/rice/kew/rule/web/WebRuleResponsibility.java
          U impl/src/main/java/org/kuali/rice/kew/rule/web/WebRuleBaseValues.java
          U impl/src/main/java/org/kuali/rice/kew/rule/web/RoutingReportAction.java
          U impl/src/main/java/org/kuali/rice/kew/rule/web/DelegateRule2Action.java
          U impl/src/main/java/org/kuali/rice/kew/rule/web/Rule2Action.java
          U impl/src/main/java/org/kuali/rice/kew/rule/web/RuleQuickLinksForm.java
          U impl/src/main/java/org/kuali/rice/kew/rule/WorkflowAttribute.java
          U impl/src/main/java/org/kuali/rice/kew/rule/KeyValueId.java
          U impl/src/main/java/org/kuali/rice/kew/rule/RuleRoutingAttribute.java
          C impl/src/main/java/org/kuali/rice/kew/rule/service/impl/RuleServiceImpl.java
          U impl/src/main/java/org/kuali/rice/kew/rule/service/RuleService.java
          U impl/src/main/java/org/kuali/rice/kew/rule/RuleBaseValues.java
          U impl/src/main/java/org/kuali/rice/kew/rule/AbstractWorkflowAttribute.java
          U impl/src/main/java/org/kuali/rice/kew/rule/xmlrouting/StandardGenericXMLRuleAttribute.java
          U impl/src/main/java/org/kuali/rice/kew/util/ResponsibleParty.java
          U impl/src/main/java/org/kuali/rice/kew/util/KEWPropertyConstants.java
          U impl/src/main/java/org/kuali/rice/kew/util/FutureRequestDocumentStateManager.java
          D impl/src/main/java/org/kuali/rice/kew/user/UserLookupableImpl.java
          U impl/src/main/java/org/kuali/rice/kns/lookup/LookupUtils.java
          U impl/src/main/java/org/kuali/rice/kns/workflow/service/KualiWorkflowDocument.java
          U impl/src/main/java/org/kuali/rice/kns/workflow/service/impl/KualiWorkflowDocumentImpl.java
          U impl/src/main/java/org/kuali/rice/kns/workflow/service/impl/WorkflowDocumentServiceImpl.java
          D impl/src/main/java/org/kuali/rice/kns/workflow/attribute/WorkflowLookupableImpl.java
          U impl/src/main/java/org/kuali/rice/kns/workflow/WorkflowUtils.java
          U impl/src/main/java/org/kuali/rice/kns/util/FieldUtils.java
          U impl/src/main/java/org/kuali/rice/kns/web/ui/Field.java
          U impl/src/main/java/org/kuali/rice/kns/web/ui/Row.java
          U impl/src/main/java/org/kuali/rice/ken/service/impl/NotificationWorkflowDocumentServiceImpl.java
          C impl/src/main/java/org/kuali/rice/ken/service/impl/NotificationAuthorizationServiceImpl.java
          A impl/src/main/java/org/kuali/rice/ken/service/impl/NotificationRecipientServiceKimImpl.java
          A impl/src/main/resources/schema/Group.xsd
          U impl/src/main/resources/schema/WorkflowData.xsd
          C impl/src/main/resources/org/kuali/rice/kim/config/KIMSpringBeans.xml
          A impl/src/main/resources/org/kuali/rice/kew/bo/datadictionary/RuleBaseValues.xml
          C impl/src/main/resources/org/kuali/rice/kew/config/KEWSpringBeans.xml
          C impl/src/main/resources/org/kuali/rice/kns/config/KNSSpringBeans.xml
          U api/src/main/java/org/kuali/rice/kim/service/IdentityManagementService.java
          C api/src/main/java/org/kuali/rice/kim/service/GroupService.java
          U api/src/main/java/org/kuali/rice/kew/service/WorkflowDocumentActions.java
          D api/src/main/java/org/kuali/rice/kew/dto/LookupableColumnDTO.java
          U api/src/main/java/org/kuali/rice/kew/dto/AdHocRevokeDTO.java
          U api/src/main/java/org/kuali/rice/kew/dto/ResponsiblePartyDTO.java
          U api/src/main/java/org/kuali/rice/kew/dto/DocumentSearchResultDTO.java
          D api/src/main/java/org/kuali/rice/kew/identity/IdentityFactory.java
          U api/src/main/java/org/kuali/rice/kew/webservice/StandardResponse.java
          U api/src/main/java/org/kuali/rice/kew/webservice/SimpleDocumentActionsWebService.java
          U api/src/main/java/org/kuali/rice/kew/webservice/DocumentResponse.java
          U ken/src/test/java/org/kuali/rice/ken/test/TestConstants.java
          A ken/src/test/java/org/kuali/rice/ken/services/impl/NotificationRecipientServiceKimImplTest.java
          U ken/src/test/java/org/kuali/rice/ken/KEWIntegrationTest.java
          U web/src/test/java/edu/sampleu/travel/workflow/EmployeeAttribute.java
          U web/src/test/java/edu/sampleu/travel/workflow/DestinationRuleAttribute.java
          U web/src/main/webapp/en/WEB-INF/struts-config.xml
          D web/src/main/webapp/en/WEB-INF/jsp/lookupable/Lookup.jsp
          D web/src/main/webapp/en/WEB-INF/jsp/lookupable
          U web/src/main/webapp/en/WEB-INF/jsp/backdoor/Backdoor.jsp
          U web/src/main/webapp/en/WEB-INF/jsp/rules/RuleExtensionValuesEdit.jsp
          U web/src/main/webapp/en/WEB-INF/jsp/rules/RuleQuickLinks.jsp
          U web/src/main/webapp/en/WEB-INF/jsp/rules/RuleQuickLinksDocumentTypeLinks.jsp
          U web/src/main/webapp/en/WEB-INF/jsp/docsearch/DocumentSearch.jsp
          U web/src/main/webapp/en/WEB-INF/jsp/docsearch/DocumentSearchSearchableAttributes.jsp

          Show
          ewestfal Eric Westfall added a comment - Merge output: 129-79-44-31:rice-0.9.4 ewestfal$ svn merge -r 5581:HEAD https://test.kuali.org/svn/rice/branches/rice-release-0-9-4-facetoface-br U kew/src/test/java/org/kuali/rice/kew/test/TestUtilities.java U kew/src/test/java/org/kuali/rice/kew/test/KEWTestCase.java U kew/src/test/java/org/kuali/rice/kew/mail/EmailReminderLifecycleTest.java U kew/src/test/java/org/kuali/rice/kew/postprocessor/PostProcessorTest.java U kew/src/test/java/org/kuali/rice/kew/notification/NotificationServiceTest.java U kew/src/test/java/org/kuali/rice/kew/docsearch/DocumentSearchTestBase.java U kew/src/test/java/org/kuali/rice/kew/docsearch/DocumentSearchTest.java U kew/src/test/java/org/kuali/rice/kew/docsearch/TestXMLSearchableAttributeDateTime.java U kew/src/test/java/org/kuali/rice/kew/docsearch/TestXMLSearchableAttributeLong.java U kew/src/test/java/org/kuali/rice/kew/docsearch/xml/StandardGenericXMLSearchableAttributeRangesTest.java U kew/src/test/java/org/kuali/rice/kew/docsearch/xml/StandardGenericXMLSearchableAttributeTest.java U kew/src/test/java/org/kuali/rice/kew/docsearch/TestXMLSearchableAttributeFloat.java U kew/src/test/java/org/kuali/rice/kew/docsearch/TestXMLSearchableAttributeString.java U kew/src/test/java/org/kuali/rice/kew/docsearch/MockSearchableAttribute.java U kew/src/test/java/org/kuali/rice/kew/docsearch/DocumentSearchSecurityTest.java U kew/src/test/java/org/kuali/rice/kew/docsearch/CustomDocumentSearchResultProcessorTest.java C kew/src/test/java/org/kuali/rice/kew/actionitem/ActionItemServiceTest.java A kew/src/test/java/org/kuali/rice/kew/workgroup/GroupImportTest.java U kew/src/test/java/org/kuali/rice/kew/actions/SuperUserActionRequestApproveEventTest.java U kew/src/test/java/org/kuali/rice/kew/actions/FutureRequestsTest.java U kew/src/test/java/org/kuali/rice/kew/actions/ReleaseWorkgroupAuthorityTest.java U kew/src/test/java/org/kuali/rice/kew/actions/TakeWorkgroupAuthorityTest.java U kew/src/test/java/org/kuali/rice/kew/actions/AcknowledgeActionTest.java U kew/src/test/java/org/kuali/rice/kew/actions/RevokeAdHocActionTest.java U kew/src/test/java/org/kuali/rice/kew/actions/ClearFYIActionTest.java U kew/src/test/java/org/kuali/rice/kew/actions/AdHocRouteTest.java A kew/src/test/java/org/kuali/rice/kew/xml/export/GroupXmlExporterTest.java U kew/src/test/java/org/kuali/rice/kew/routemodule/TestRouteModule.java U kew/src/test/java/org/kuali/rice/kew/routemodule/TestRouteModuleXMLHelper.java U kew/src/test/java/org/kuali/rice/kew/server/BeanConverterTester.java Skipped missing target: 'kew/src/test/java/org/kuali/rice/kew/server/SimpleDocumentActionsWebServiceTest.java' U kew/src/test/java/org/kuali/rice/kew/server/WorkflowUtilityTest.java U kew/src/test/java/org/kuali/rice/kew/rule/AddRuleDelegationTest.java U kew/src/test/java/org/kuali/rice/kew/rule/service/impl/RoleServiceTest.java U kew/src/test/java/org/kuali/rice/kew/rule/xmlrouting/StandardGenericXMLRuleAttributeTest.java U kew/src/test/java/org/kuali/rice/kew/actionlist/OutboxTest.java C kew/src/test/java/org/kuali/rice/kew/actionlist/ActionListTest.java U kew/src/test/java/org/kuali/rice/kew/actionlist/web/ActionListActionTest.java A kew/src/test/java/org/kuali/rice/kew/actionlist/web/ActionListFilterActionTest.java U kew/src/test/java/mocks/MockRuleServiceImpl.java U kew/src/test/resources/org/kuali/rice/kew/test/DefaultTestData.sql A kew/src/test/resources/org/kuali/rice/kew/workgroup/GroupXmlImportTest.xml U scripts/upgrades/0.9.3 to 0.9.4/kew-upgrade-0.9.3-to-0.9.4.sql U kns/src/test/java/org/kuali/rice/kns/impls/MockWorkflowDocument.java U kns/src/test/java/org/kuali/rice/kns/document/DocumentAuthorizerBaseTest.java U impl/src/main/java/org/kuali/rice/kim/bo/types/impl/KimTypeImpl.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/IdentityManagementServiceImpl.java U impl/src/main/java/org/kuali/rice/kim/service/KIMServiceLocator.java A impl/src/main/java/org/kuali/rice/kim/service/support/KimTypeInternalService.java A impl/src/main/java/org/kuali/rice/kim/service/support/impl/KimTypeInternalServiceImpl.java A impl/src/main/java/org/kuali/rice/kim/dao/impl/KimTypeDaoJpa.java A impl/src/main/java/org/kuali/rice/kim/dao/impl/KimTypeDaoOjb.java A impl/src/main/java/org/kuali/rice/kim/dao/KimTypeDao.java C impl/src/main/java/org/kuali/rice/kim/util/KimConstants.java U impl/src/main/java/org/kuali/rice/kew/export/ExportDataSet.java U impl/src/main/java/org/kuali/rice/kew/batch/XmlDigesterServiceImpl.java C impl/src/main/java/org/kuali/rice/kew/dto/DTOConverter.java U impl/src/main/java/org/kuali/rice/kew/removereplace/service/impl/RemoveReplaceDocumentServiceImpl.java U impl/src/main/java/org/kuali/rice/kew/removereplace/WorkgroupTarget.java C impl/src/main/java/org/kuali/rice/kew/removereplace/web/RemoveReplaceAction.java U impl/src/main/java/org/kuali/rice/kew/removereplace/web/RemoveReplaceWorkgroup.java U impl/src/main/java/org/kuali/rice/kew/removereplace/web/RemoveReplaceForm.java D impl/src/main/java/org/kuali/rice/kew/lookupable/RoleLookupableImpl.java D impl/src/main/java/org/kuali/rice/kew/lookupable/RuleTemplateLookupableImpl.java D impl/src/main/java/org/kuali/rice/kew/lookupable/EDocLiteLookupable.java D impl/src/main/java/org/kuali/rice/kew/lookupable/Row.java D impl/src/main/java/org/kuali/rice/kew/lookupable/LookupAction.java D impl/src/main/java/org/kuali/rice/kew/lookupable/DocumentTypeLookupableImpl.java D impl/src/main/java/org/kuali/rice/kew/lookupable/Field.java D impl/src/main/java/org/kuali/rice/kew/lookupable/WorkflowLookupable.java D impl/src/main/java/org/kuali/rice/kew/lookupable/RuleAttributeLookupableImpl.java U impl/src/main/java/org/kuali/rice/kew/lookupable/RuleBaseValuesLookupableImpl.java U impl/src/main/java/org/kuali/rice/kew/webservice/impl/SimpleDocumentActionsWebServiceImpl.java D impl/src/main/java/org/kuali/rice/kew/workgroup/WorkgroupTypeLookupable.java U impl/src/main/java/org/kuali/rice/kew/workgroup/WorkgroupMembershipChangeProcessor.java U impl/src/main/java/org/kuali/rice/kew/workgroup/BaseWorkgroupRoutingService.java U impl/src/main/java/org/kuali/rice/kew/actiontaken/service/ActionTakenService.java U impl/src/main/java/org/kuali/rice/kew/actiontaken/service/impl/ActionTakenServiceImpl.java U impl/src/main/java/org/kuali/rice/kew/actiontaken/ActionTakenValue.java U impl/src/main/java/org/kuali/rice/kew/attribute/ExtensionAttribute.java U impl/src/main/java/org/kuali/rice/kew/attribute/web/WebField.java U impl/src/main/java/org/kuali/rice/kew/attribute/web/WebExtensions.java U impl/src/main/java/org/kuali/rice/kew/doctype/DocumentTypeLookupableHelperServiceImpl.java U impl/src/main/java/org/kuali/rice/kew/doctype/web/DocumentTypeAction.java C impl/src/main/java/org/kuali/rice/kew/actionlist/service/impl/ActionListServiceImpl.java C impl/src/main/java/org/kuali/rice/kew/actionlist/service/ActionListService.java C impl/src/main/java/org/kuali/rice/kew/actionlist/dao/impl/ActionListDAOJpaImpl.java C impl/src/main/java/org/kuali/rice/kew/actionlist/dao/impl/ActionListDAOOjbImpl.java C impl/src/main/java/org/kuali/rice/kew/actionlist/web/ActionListAction.java C impl/src/main/java/org/kuali/rice/kew/actionlist/web/ActionListFilterAction.java C impl/src/main/java/org/kuali/rice/kew/web/session/UserSession.java C impl/src/main/java/org/kuali/rice/kew/web/backdoor/BackdoorAction.java U impl/src/main/java/org/kuali/rice/kew/web/WorkflowRoutingForm.java U impl/src/main/java/org/kuali/rice/kew/web/WorkflowAction.java C impl/src/main/java/org/kuali/rice/kew/web/UserLoginFilter.java C impl/src/main/java/org/kuali/rice/kew/mail/service/impl/StyleableEmailContentServiceImpl.java U impl/src/main/java/org/kuali/rice/kew/actionrequest/service/impl/ActionRequestServiceImpl.java U impl/src/main/java/org/kuali/rice/kew/actionrequest/service/ActionRequestService.java U impl/src/main/java/org/kuali/rice/kew/actionrequest/ActionRequestValue.java U impl/src/main/java/org/kuali/rice/kew/actionrequest/dao/impl/ActionRequestDAOOjbImpl.java U impl/src/main/java/org/kuali/rice/kew/actionrequest/dao/ActionRequestDAO.java U impl/src/main/java/org/kuali/rice/kew/actionrequest/ActionRequestFactory.java C impl/src/main/java/org/kuali/rice/kew/identity/service/impl/IdentityHelperServiceImpl.java C impl/src/main/java/org/kuali/rice/kew/identity/service/IdentityHelperService.java A impl/src/main/java/org/kuali/rice/kew/docsearch/DocumentSearchField.java U impl/src/main/java/org/kuali/rice/kew/docsearch/StandardDocumentSearchCriteriaProcessor.java U impl/src/main/java/org/kuali/rice/kew/docsearch/DocumentSearchResultComponents.java U impl/src/main/java/org/kuali/rice/kew/docsearch/DocSearchUtils.java U impl/src/main/java/org/kuali/rice/kew/docsearch/SearchableAttribute.java U impl/src/main/java/org/kuali/rice/kew/docsearch/service/impl/DocumentSearchServiceImpl.java U impl/src/main/java/org/kuali/rice/kew/docsearch/xml/DocumentSearchXMLResultProcessorImpl.java U impl/src/main/java/org/kuali/rice/kew/docsearch/xml/StandardGenericXMLSearchableAttribute.java A impl/src/main/java/org/kuali/rice/kew/docsearch/DocumentSearchColumn.java U impl/src/main/java/org/kuali/rice/kew/docsearch/StandardDocumentSearchResultProcessor.java U impl/src/main/java/org/kuali/rice/kew/docsearch/DocSearchCriteriaDTO.java U impl/src/main/java/org/kuali/rice/kew/docsearch/DocumentSearchCriteriaProcessor.java A impl/src/main/java/org/kuali/rice/kew/docsearch/DocumentSearchRow.java U impl/src/main/java/org/kuali/rice/kew/docsearch/StandardDocumentSearchGenerator.java U impl/src/main/java/org/kuali/rice/kew/docsearch/web/DocumentSearchAction.java U impl/src/main/java/org/kuali/rice/kew/docsearch/web/DocumentSearchForm.java C impl/src/main/java/org/kuali/rice/kew/actionitem/ActionItemActionListExtension.java C impl/src/main/java/org/kuali/rice/kew/actionitem/dao/impl/ActionItemDAOJpaImpl.java C impl/src/main/java/org/kuali/rice/kew/actionitem/dao/impl/ActionItemDAOOjbImpl.java U impl/src/main/java/org/kuali/rice/kew/superuser/web/SuperUserAction.java U impl/src/main/java/org/kuali/rice/kew/documentoperation/web/DocumentOperationAction.java U impl/src/main/java/org/kuali/rice/kew/actions/ReleaseWorkgroupAuthority.java U impl/src/main/java/org/kuali/rice/kew/actions/DisapproveAction.java U impl/src/main/java/org/kuali/rice/kew/actions/TakeWorkgroupAuthority.java U impl/src/main/java/org/kuali/rice/kew/actions/AdHocRevoke.java U impl/src/main/java/org/kuali/rice/kew/actions/ActionTakenEvent.java U impl/src/main/java/org/kuali/rice/kew/actions/AdHocAction.java C impl/src/main/java/org/kuali/rice/kew/service/impl/WorkflowUtilityWebServiceImpl.java U impl/src/main/java/org/kuali/rice/kew/service/impl/WorkflowDocumentActionsWebServiceImpl.java U impl/src/main/java/org/kuali/rice/kew/service/WorkflowDocument.java U impl/src/main/java/org/kuali/rice/kew/xml/export/RuleXmlExporter.java A impl/src/main/java/org/kuali/rice/kew/xml/export/GroupXmlExporter.java U impl/src/main/java/org/kuali/rice/kew/xml/export/WorkgroupXmlExporter.java U impl/src/main/java/org/kuali/rice/kew/xml/RuleXmlParser.java U impl/src/main/java/org/kuali/rice/kew/xml/WorkgroupXmlConstants.java U impl/src/main/java/org/kuali/rice/kew/xml/WorkgroupXmlHandler.java A impl/src/main/java/org/kuali/rice/kew/xml/GroupXmlServiceImpl.java A impl/src/main/java/org/kuali/rice/kew/xml/GroupXmlParser.java U impl/src/main/java/org/kuali/rice/kew/xml/XmlConstants.java U impl/src/main/java/org/kuali/rice/kew/engine/simulation/SimulationEngine.java U impl/src/main/java/org/kuali/rice/kew/engine/node/FYIByUniversityId.java U impl/src/main/java/org/kuali/rice/kew/engine/node/FYIByNetworkId.java U impl/src/main/java/org/kuali/rice/kew/routeheader/service/impl/WorkflowDocumentServiceImpl.java U impl/src/main/java/org/kuali/rice/kew/routeheader/service/WorkflowDocumentService.java U impl/src/main/java/org/kuali/rice/kew/rule/OddSearchAttribute.java C impl/src/main/java/org/kuali/rice/kew/rule/dao/impl/RuleDAOOjbImpl.java U impl/src/main/java/org/kuali/rice/kew/rule/dao/RuleDAO.java U impl/src/main/java/org/kuali/rice/kew/rule/FlexRM.java U impl/src/main/java/org/kuali/rice/kew/rule/WorkgroupTypeRoutingAttribute.java U impl/src/main/java/org/kuali/rice/kew/rule/web/WebRuleResponsibility.java U impl/src/main/java/org/kuali/rice/kew/rule/web/WebRuleBaseValues.java U impl/src/main/java/org/kuali/rice/kew/rule/web/RoutingReportAction.java U impl/src/main/java/org/kuali/rice/kew/rule/web/DelegateRule2Action.java U impl/src/main/java/org/kuali/rice/kew/rule/web/Rule2Action.java U impl/src/main/java/org/kuali/rice/kew/rule/web/RuleQuickLinksForm.java U impl/src/main/java/org/kuali/rice/kew/rule/WorkflowAttribute.java U impl/src/main/java/org/kuali/rice/kew/rule/KeyValueId.java U impl/src/main/java/org/kuali/rice/kew/rule/RuleRoutingAttribute.java C impl/src/main/java/org/kuali/rice/kew/rule/service/impl/RuleServiceImpl.java U impl/src/main/java/org/kuali/rice/kew/rule/service/RuleService.java U impl/src/main/java/org/kuali/rice/kew/rule/RuleBaseValues.java U impl/src/main/java/org/kuali/rice/kew/rule/AbstractWorkflowAttribute.java U impl/src/main/java/org/kuali/rice/kew/rule/xmlrouting/StandardGenericXMLRuleAttribute.java U impl/src/main/java/org/kuali/rice/kew/util/ResponsibleParty.java U impl/src/main/java/org/kuali/rice/kew/util/KEWPropertyConstants.java U impl/src/main/java/org/kuali/rice/kew/util/FutureRequestDocumentStateManager.java D impl/src/main/java/org/kuali/rice/kew/user/UserLookupableImpl.java U impl/src/main/java/org/kuali/rice/kns/lookup/LookupUtils.java U impl/src/main/java/org/kuali/rice/kns/workflow/service/KualiWorkflowDocument.java U impl/src/main/java/org/kuali/rice/kns/workflow/service/impl/KualiWorkflowDocumentImpl.java U impl/src/main/java/org/kuali/rice/kns/workflow/service/impl/WorkflowDocumentServiceImpl.java D impl/src/main/java/org/kuali/rice/kns/workflow/attribute/WorkflowLookupableImpl.java U impl/src/main/java/org/kuali/rice/kns/workflow/WorkflowUtils.java U impl/src/main/java/org/kuali/rice/kns/util/FieldUtils.java U impl/src/main/java/org/kuali/rice/kns/web/ui/Field.java U impl/src/main/java/org/kuali/rice/kns/web/ui/Row.java U impl/src/main/java/org/kuali/rice/ken/service/impl/NotificationWorkflowDocumentServiceImpl.java C impl/src/main/java/org/kuali/rice/ken/service/impl/NotificationAuthorizationServiceImpl.java A impl/src/main/java/org/kuali/rice/ken/service/impl/NotificationRecipientServiceKimImpl.java A impl/src/main/resources/schema/Group.xsd U impl/src/main/resources/schema/WorkflowData.xsd C impl/src/main/resources/org/kuali/rice/kim/config/KIMSpringBeans.xml A impl/src/main/resources/org/kuali/rice/kew/bo/datadictionary/RuleBaseValues.xml C impl/src/main/resources/org/kuali/rice/kew/config/KEWSpringBeans.xml C impl/src/main/resources/org/kuali/rice/kns/config/KNSSpringBeans.xml U api/src/main/java/org/kuali/rice/kim/service/IdentityManagementService.java C api/src/main/java/org/kuali/rice/kim/service/GroupService.java U api/src/main/java/org/kuali/rice/kew/service/WorkflowDocumentActions.java D api/src/main/java/org/kuali/rice/kew/dto/LookupableColumnDTO.java U api/src/main/java/org/kuali/rice/kew/dto/AdHocRevokeDTO.java U api/src/main/java/org/kuali/rice/kew/dto/ResponsiblePartyDTO.java U api/src/main/java/org/kuali/rice/kew/dto/DocumentSearchResultDTO.java D api/src/main/java/org/kuali/rice/kew/identity/IdentityFactory.java U api/src/main/java/org/kuali/rice/kew/webservice/StandardResponse.java U api/src/main/java/org/kuali/rice/kew/webservice/SimpleDocumentActionsWebService.java U api/src/main/java/org/kuali/rice/kew/webservice/DocumentResponse.java U ken/src/test/java/org/kuali/rice/ken/test/TestConstants.java A ken/src/test/java/org/kuali/rice/ken/services/impl/NotificationRecipientServiceKimImplTest.java U ken/src/test/java/org/kuali/rice/ken/KEWIntegrationTest.java U web/src/test/java/edu/sampleu/travel/workflow/EmployeeAttribute.java U web/src/test/java/edu/sampleu/travel/workflow/DestinationRuleAttribute.java U web/src/main/webapp/en/WEB-INF/struts-config.xml D web/src/main/webapp/en/WEB-INF/jsp/lookupable/Lookup.jsp D web/src/main/webapp/en/WEB-INF/jsp/lookupable U web/src/main/webapp/en/WEB-INF/jsp/backdoor/Backdoor.jsp U web/src/main/webapp/en/WEB-INF/jsp/rules/RuleExtensionValuesEdit.jsp U web/src/main/webapp/en/WEB-INF/jsp/rules/RuleQuickLinks.jsp U web/src/main/webapp/en/WEB-INF/jsp/rules/RuleQuickLinksDocumentTypeLinks.jsp U web/src/main/webapp/en/WEB-INF/jsp/docsearch/DocumentSearch.jsp U web/src/main/webapp/en/WEB-INF/jsp/docsearch/DocumentSearchSearchableAttributes.jsp
          Hide
          ewestfal Eric Westfall added a comment -

          Here are some notes related to the changes made in KFS for impacting changes related to the merge:

          Branch Name: https://test.kuali.org/svn/kfs/branches/kfs-rice-facetoface-merge-20081223-br

          BusinessObjectMaintenancePrimaryKeysSearchAttribute:

          • replaced Row/Field with DocumentSearchRow/DocumentSearchField
          • commented out section of createFieldRowsForBusinessObject where it was creating a QUICKFINDER field
          • commented out section of buildSearchField where it was attempting to set a quick finder
          • commented out getQuickfinderServiceName
          • commented out getWorkflowLookupServiceName

          DataDictionarySearchableAttribute:

          • this class appeared to be almost identity to BusinessObjectMaintenancePrimaryKeysSearchAttribute so changes were similar

          KualiPurchaseOrderIncompleteStatusesAttribute:

          • referenced some constants which no longer existed which had values of "Yes" and "No"

          OrgReviewLookupableImpl:

          • commented out various sections to get this compiling
          • does this just need to be re-implemented as a KNS lookup?

          KualiOrgReviewAttribute:

          • converted to use KNS Field and Row
            KualiPurchaseOrderBudgetAttribute
          • converted to use KNS Field and Row
            KualiPurchaseOrderContractAndGrantsAttribute
          • converted to use KNS Field and Row
            KualiVerificationWorkgroupAttribute
          • converted to use KNS Field and Row
            KualiResearchRiskAttribute
          • converted to use KNS Field and Row
            KualiPurApCommodityCodeAttribute
          • converted to use KNS Field and Row
            KualiSubAccountAttribute
          • converted to use KNS Field and Row
            KualiPurApDocumentTaxReviewAttribute
          • converted to use KNS Field and Row

          LookupableSpringContext:

          • commented out getWorkflowLookupable
            FinancialSystemResourceLoader:
          • commented out methods related to getting workflow lookupables

          SystemWorkgroupExtensionAttribute:

          • this was a workgroup type attribute implementation, since this was moved to KIM, I deleted this class
            ChartOrgExtensionAttribute:
          • as with SystemWorkgroupExtensionAttribute, deleted this class because it's no longer being used

          PurApDocumentSearchResultProcessor:

          • switched to use DocumentSearchColumn
            PurchaseOrderDocumentSearchResultProcessor:
          • switched to use DocumentSearchColumn
            RequisitionDocumentSearchResultProcessor:
          • switched to use DocumentSearchColumn
            CreditMemoDocumentSearchResultProcessor:
          • switched to use DocumentSearchColumn
            PaymentRequestDocumentSearchResultProcessor:
          • switched to use DocumentSearchColumn

          ContractManagerAssignmentDocument:

          • changed from appSpecificRouteDocumentToUser to adHocRouteDocumentToPrincipal
            PurchaseOrderDocument:
          • changed from appSpecificRouteDocumentToUser to adHocRouteDocumentToPrincipal
            ReceivingDocumentBase:
          • changed from appSpecificRouteDocumentToUser to adHocRouteDocumentToPrincipal
            PaymentRequestDocumentRuleTest
          • changed from appSpecificRouteDocumentToUser to adHocRouteDocumentToPrincipal
          • changed from appSpecificRouteDocumentToWorkgroup to adHocRouteDocumentToGroup
            MockWorkflowDocument
          • changed from appSpecificRouteDocumentToUser to adHocRouteDocumentToPrincipal
          • changed from appSpecificRouteDocumentToWorkgroup to adHocRouteDocumentToGroup

          spring-sys.xml, spring-cg.xml, spring-purap.xml, spring-vnd.xml, spring-coa.xml, spring-fp.xml, spring-ar.xml

          • commented out workflow-*-Lookupable beans

          Questions:
          1) What to do with OrgReviewLookupableImpl? Rewrite as KNS lookup?

          Future Actions Required:
          1) As part of doc search work that Chris is doing, DocumentSearchField, DocumentSearchRow and DocumentSearchColumn will go away
          2) Hook KNS lookup support into both document search and rules

          Show
          ewestfal Eric Westfall added a comment - Here are some notes related to the changes made in KFS for impacting changes related to the merge: Branch Name: https://test.kuali.org/svn/kfs/branches/kfs-rice-facetoface-merge-20081223-br BusinessObjectMaintenancePrimaryKeysSearchAttribute: replaced Row/Field with DocumentSearchRow/DocumentSearchField commented out section of createFieldRowsForBusinessObject where it was creating a QUICKFINDER field commented out section of buildSearchField where it was attempting to set a quick finder commented out getQuickfinderServiceName commented out getWorkflowLookupServiceName DataDictionarySearchableAttribute: this class appeared to be almost identity to BusinessObjectMaintenancePrimaryKeysSearchAttribute so changes were similar KualiPurchaseOrderIncompleteStatusesAttribute: referenced some constants which no longer existed which had values of "Yes" and "No" OrgReviewLookupableImpl: commented out various sections to get this compiling does this just need to be re-implemented as a KNS lookup? KualiOrgReviewAttribute: converted to use KNS Field and Row KualiPurchaseOrderBudgetAttribute converted to use KNS Field and Row KualiPurchaseOrderContractAndGrantsAttribute converted to use KNS Field and Row KualiVerificationWorkgroupAttribute converted to use KNS Field and Row KualiResearchRiskAttribute converted to use KNS Field and Row KualiPurApCommodityCodeAttribute converted to use KNS Field and Row KualiSubAccountAttribute converted to use KNS Field and Row KualiPurApDocumentTaxReviewAttribute converted to use KNS Field and Row LookupableSpringContext: commented out getWorkflowLookupable FinancialSystemResourceLoader: commented out methods related to getting workflow lookupables SystemWorkgroupExtensionAttribute: this was a workgroup type attribute implementation, since this was moved to KIM, I deleted this class ChartOrgExtensionAttribute: as with SystemWorkgroupExtensionAttribute, deleted this class because it's no longer being used PurApDocumentSearchResultProcessor: switched to use DocumentSearchColumn PurchaseOrderDocumentSearchResultProcessor: switched to use DocumentSearchColumn RequisitionDocumentSearchResultProcessor: switched to use DocumentSearchColumn CreditMemoDocumentSearchResultProcessor: switched to use DocumentSearchColumn PaymentRequestDocumentSearchResultProcessor: switched to use DocumentSearchColumn ContractManagerAssignmentDocument: changed from appSpecificRouteDocumentToUser to adHocRouteDocumentToPrincipal PurchaseOrderDocument: changed from appSpecificRouteDocumentToUser to adHocRouteDocumentToPrincipal ReceivingDocumentBase: changed from appSpecificRouteDocumentToUser to adHocRouteDocumentToPrincipal PaymentRequestDocumentRuleTest changed from appSpecificRouteDocumentToUser to adHocRouteDocumentToPrincipal changed from appSpecificRouteDocumentToWorkgroup to adHocRouteDocumentToGroup MockWorkflowDocument changed from appSpecificRouteDocumentToUser to adHocRouteDocumentToPrincipal changed from appSpecificRouteDocumentToWorkgroup to adHocRouteDocumentToGroup spring-sys.xml, spring-cg.xml, spring-purap.xml, spring-vnd.xml, spring-coa.xml, spring-fp.xml, spring-ar.xml commented out workflow-*-Lookupable beans Questions: 1) What to do with OrgReviewLookupableImpl? Rewrite as KNS lookup? Future Actions Required: 1) As part of doc search work that Chris is doing, DocumentSearchField, DocumentSearchRow and DocumentSearchColumn will go away 2) Hook KNS lookup support into both document search and rules
          Hide
          ewestfal Eric Westfall added a comment -

          This has been completed, merge logs pasted below:

          Command to find base revision:

          svn log --stop-on-copy https://test.kuali.org/svn/rice/branches/rice-release-0-9-4-facetoface-merge-br

          ...

          ------------------------------------------------------------------------
          r5785 | ewestfal | 2008-12-22 14:45:33 -0500 (Mon, 22 Dec 2008) | 1 line

          Creating a branch off of the main 0.9.4 branch to do an intermediate merge of the work on the facetoface branch of 0.9.4.
          ------------------------------------------------------------------------

          Command to execute merge into 0.9.4 branch:

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

          U kew/src/test/java/org/kuali/rice/kew/test/TestUtilities.java
          U kew/src/test/java/org/kuali/rice/kew/test/KEWTestCase.java
          U kew/src/test/java/org/kuali/rice/kew/mail/EmailReminderLifecycleTest.java
          U kew/src/test/java/org/kuali/rice/kew/postprocessor/PostProcessorTest.java
          U kew/src/test/java/org/kuali/rice/kew/notification/NotificationServiceTest.java
          U kew/src/test/java/org/kuali/rice/kew/docsearch/DocumentSearchTestBase.java
          U kew/src/test/java/org/kuali/rice/kew/docsearch/DocumentSearchTest.java
          U kew/src/test/java/org/kuali/rice/kew/docsearch/TestXMLSearchableAttributeDateTime.java
          U kew/src/test/java/org/kuali/rice/kew/docsearch/TestXMLSearchableAttributeLong.java
          U kew/src/test/java/org/kuali/rice/kew/docsearch/xml/StandardGenericXMLSearchableAttributeRangesTest.java
          U kew/src/test/java/org/kuali/rice/kew/docsearch/xml/StandardGenericXMLSearchableAttributeTest.java
          U kew/src/test/java/org/kuali/rice/kew/docsearch/TestXMLSearchableAttributeFloat.java
          U kew/src/test/java/org/kuali/rice/kew/docsearch/TestXMLSearchableAttributeString.java
          U kew/src/test/java/org/kuali/rice/kew/docsearch/MockSearchableAttribute.java
          U kew/src/test/java/org/kuali/rice/kew/docsearch/DocumentSearchSecurityTest.java
          U kew/src/test/java/org/kuali/rice/kew/docsearch/CustomDocumentSearchResultProcessorTest.java
          U kew/src/test/java/org/kuali/rice/kew/actionitem/ActionItemServiceTest.java
          A kew/src/test/java/org/kuali/rice/kew/workgroup/GroupImportTest.java
          U kew/src/test/java/org/kuali/rice/kew/actions/SuperUserActionRequestApproveEventTest.java
          U kew/src/test/java/org/kuali/rice/kew/actions/FutureRequestsTest.java
          U kew/src/test/java/org/kuali/rice/kew/actions/ReleaseWorkgroupAuthorityTest.java
          U kew/src/test/java/org/kuali/rice/kew/actions/TakeWorkgroupAuthorityTest.java
          U kew/src/test/java/org/kuali/rice/kew/actions/AcknowledgeActionTest.java
          U kew/src/test/java/org/kuali/rice/kew/actions/RevokeAdHocActionTest.java
          U kew/src/test/java/org/kuali/rice/kew/actions/ClearFYIActionTest.java
          U kew/src/test/java/org/kuali/rice/kew/actions/AdHocRouteTest.java
          A kew/src/test/java/org/kuali/rice/kew/xml/export/GroupXmlExporterTest.java
          U kew/src/test/java/org/kuali/rice/kew/routemodule/TestRouteModule.java
          U kew/src/test/java/org/kuali/rice/kew/routemodule/TestRouteModuleXMLHelper.java
          U kew/src/test/java/org/kuali/rice/kew/server/BeanConverterTester.java
          U kew/src/test/java/org/kuali/rice/kew/server/WorkflowUtilityTest.java
          U kew/src/test/java/org/kuali/rice/kew/rule/AddRuleDelegationTest.java
          U kew/src/test/java/org/kuali/rice/kew/rule/service/impl/RoleServiceTest.java
          U kew/src/test/java/org/kuali/rice/kew/rule/xmlrouting/StandardGenericXMLRuleAttributeTest.java
          U kew/src/test/java/org/kuali/rice/kew/actionlist/OutboxTest.java
          U kew/src/test/java/org/kuali/rice/kew/actionlist/ActionListTest.java
          U kew/src/test/java/org/kuali/rice/kew/actionlist/web/ActionListActionTest.java
          A kew/src/test/java/org/kuali/rice/kew/actionlist/web/ActionListFilterActionTest.java
          U kew/src/test/java/mocks/MockRuleServiceImpl.java
          U kew/src/test/resources/org/kuali/rice/kew/test/DefaultTestData.sql
          A kew/src/test/resources/org/kuali/rice/kew/workgroup/GroupXmlImportTest.xml
          U scripts/upgrades/0.9.3 to 0.9.4/kew-upgrade-0.9.3-to-0.9.4.sql
          U kns/src/test/java/org/kuali/rice/kns/service/PessimisticLockServiceTest.java
          U kns/src/test/java/org/kuali/rice/kns/impls/MockWorkflowDocument.java
          C kns/src/test/java/org/kuali/rice/kns/document/DocumentAuthorizerBaseTest.java
          U impl/src/main/java/org/kuali/rice/kim/bo/types/impl/KimTypeImpl.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/IdentityManagementServiceImpl.java
          U impl/src/main/java/org/kuali/rice/kim/service/KIMServiceLocator.java
          A impl/src/main/java/org/kuali/rice/kim/service/support/KimTypeInternalService.java
          A impl/src/main/java/org/kuali/rice/kim/service/support/impl/KimTypeInternalServiceImpl.java
          A impl/src/main/java/org/kuali/rice/kim/dao/impl/KimTypeDaoJpa.java
          A impl/src/main/java/org/kuali/rice/kim/dao/impl/KimTypeDaoOjb.java
          A impl/src/main/java/org/kuali/rice/kim/dao/KimTypeDao.java
          C impl/src/main/java/org/kuali/rice/kim/util/KimConstants.java
          U impl/src/main/java/org/kuali/rice/kew/export/ExportDataSet.java
          U impl/src/main/java/org/kuali/rice/kew/batch/XmlDigesterServiceImpl.java
          U impl/src/main/java/org/kuali/rice/kew/dto/DTOConverter.java
          U impl/src/main/java/org/kuali/rice/kew/removereplace/service/impl/RemoveReplaceDocumentServiceImpl.java
          U impl/src/main/java/org/kuali/rice/kew/removereplace/WorkgroupTarget.java
          U impl/src/main/java/org/kuali/rice/kew/removereplace/web/RemoveReplaceAction.java
          U impl/src/main/java/org/kuali/rice/kew/removereplace/web/RemoveReplaceWorkgroup.java
          U impl/src/main/java/org/kuali/rice/kew/removereplace/web/RemoveReplaceForm.java
          D impl/src/main/java/org/kuali/rice/kew/lookupable/RoleLookupableImpl.java
          D impl/src/main/java/org/kuali/rice/kew/lookupable/RuleTemplateLookupableImpl.java
          D impl/src/main/java/org/kuali/rice/kew/lookupable/EDocLiteLookupable.java
          D impl/src/main/java/org/kuali/rice/kew/lookupable/Row.java
          D impl/src/main/java/org/kuali/rice/kew/lookupable/LookupAction.java
          D impl/src/main/java/org/kuali/rice/kew/lookupable/DocumentTypeLookupableImpl.java
          D impl/src/main/java/org/kuali/rice/kew/lookupable/Field.java
          D impl/src/main/java/org/kuali/rice/kew/lookupable/WorkflowLookupable.java
          D impl/src/main/java/org/kuali/rice/kew/lookupable/RuleAttributeLookupableImpl.java
          U impl/src/main/java/org/kuali/rice/kew/lookupable/RuleBaseValuesLookupableImpl.java
          U impl/src/main/java/org/kuali/rice/kew/webservice/impl/SimpleDocumentActionsWebServiceImpl.java
          D impl/src/main/java/org/kuali/rice/kew/workgroup/WorkgroupTypeLookupable.java
          U impl/src/main/java/org/kuali/rice/kew/workgroup/WorkgroupMembershipChangeProcessor.java
          U impl/src/main/java/org/kuali/rice/kew/workgroup/BaseWorkgroupRoutingService.java
          U impl/src/main/java/org/kuali/rice/kew/actiontaken/service/ActionTakenService.java
          U impl/src/main/java/org/kuali/rice/kew/actiontaken/service/impl/ActionTakenServiceImpl.java
          U impl/src/main/java/org/kuali/rice/kew/actiontaken/ActionTakenValue.java
          U impl/src/main/java/org/kuali/rice/kew/attribute/ExtensionAttribute.java
          U impl/src/main/java/org/kuali/rice/kew/attribute/web/WebField.java
          U impl/src/main/java/org/kuali/rice/kew/attribute/web/WebExtensions.java
          U impl/src/main/java/org/kuali/rice/kew/doctype/DocumentTypeLookupableHelperServiceImpl.java
          U impl/src/main/java/org/kuali/rice/kew/doctype/web/DocumentTypeAction.java
          U impl/src/main/java/org/kuali/rice/kew/actionlist/service/impl/ActionListServiceImpl.java
          U impl/src/main/java/org/kuali/rice/kew/actionlist/service/ActionListService.java
          U impl/src/main/java/org/kuali/rice/kew/actionlist/dao/impl/ActionListDAOJpaImpl.java
          U impl/src/main/java/org/kuali/rice/kew/actionlist/dao/impl/ActionListDAOOjbImpl.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/ActionListFilterAction.java
          U impl/src/main/java/org/kuali/rice/kew/web/session/UserSession.java
          U impl/src/main/java/org/kuali/rice/kew/web/backdoor/BackdoorAction.java
          U impl/src/main/java/org/kuali/rice/kew/web/WorkflowRoutingForm.java
          C impl/src/main/java/org/kuali/rice/kew/web/WorkflowAction.java
          U impl/src/main/java/org/kuali/rice/kew/web/UserLoginFilter.java
          U impl/src/main/java/org/kuali/rice/kew/mail/service/impl/StyleableEmailContentServiceImpl.java
          U impl/src/main/java/org/kuali/rice/kew/actionrequest/service/impl/ActionRequestServiceImpl.java
          U impl/src/main/java/org/kuali/rice/kew/actionrequest/service/ActionRequestService.java
          U impl/src/main/java/org/kuali/rice/kew/actionrequest/ActionRequestValue.java
          U impl/src/main/java/org/kuali/rice/kew/actionrequest/dao/impl/ActionRequestDAOJpaImpl.java
          U impl/src/main/java/org/kuali/rice/kew/actionrequest/dao/impl/ActionRequestDAOOjbImpl.java
          U impl/src/main/java/org/kuali/rice/kew/actionrequest/dao/ActionRequestDAO.java
          U impl/src/main/java/org/kuali/rice/kew/actionrequest/ActionRequestFactory.java
          U impl/src/main/java/org/kuali/rice/kew/identity/service/impl/IdentityHelperServiceImpl.java
          U impl/src/main/java/org/kuali/rice/kew/identity/service/IdentityHelperService.java
          A impl/src/main/java/org/kuali/rice/kew/docsearch/DocumentSearchField.java
          U impl/src/main/java/org/kuali/rice/kew/docsearch/StandardDocumentSearchCriteriaProcessor.java
          U impl/src/main/java/org/kuali/rice/kew/docsearch/DocumentSearchResultComponents.java
          U impl/src/main/java/org/kuali/rice/kew/docsearch/DocSearchUtils.java
          U impl/src/main/java/org/kuali/rice/kew/docsearch/SearchableAttribute.java
          U impl/src/main/java/org/kuali/rice/kew/docsearch/service/impl/DocumentSearchServiceImpl.java
          U impl/src/main/java/org/kuali/rice/kew/docsearch/xml/DocumentSearchXMLResultProcessorImpl.java
          U impl/src/main/java/org/kuali/rice/kew/docsearch/xml/StandardGenericXMLSearchableAttribute.java
          A impl/src/main/java/org/kuali/rice/kew/docsearch/DocumentSearchColumn.java
          U impl/src/main/java/org/kuali/rice/kew/docsearch/StandardDocumentSearchResultProcessor.java
          U impl/src/main/java/org/kuali/rice/kew/docsearch/DocSearchCriteriaDTO.java
          U impl/src/main/java/org/kuali/rice/kew/docsearch/DocumentSearchCriteriaProcessor.java
          A impl/src/main/java/org/kuali/rice/kew/docsearch/DocumentSearchRow.java
          U impl/src/main/java/org/kuali/rice/kew/docsearch/StandardDocumentSearchGenerator.java
          U impl/src/main/java/org/kuali/rice/kew/docsearch/web/DocumentSearchAction.java
          U impl/src/main/java/org/kuali/rice/kew/docsearch/web/DocumentSearchForm.java
          U impl/src/main/java/org/kuali/rice/kew/actionitem/ActionItemActionListExtension.java
          U impl/src/main/java/org/kuali/rice/kew/actionitem/dao/impl/ActionItemDAOJpaImpl.java
          U impl/src/main/java/org/kuali/rice/kew/actionitem/dao/impl/ActionItemDAOOjbImpl.java
          U impl/src/main/java/org/kuali/rice/kew/superuser/web/SuperUserAction.java
          U impl/src/main/java/org/kuali/rice/kew/documentoperation/web/DocumentOperationAction.java
          U impl/src/main/java/org/kuali/rice/kew/actions/ReleaseWorkgroupAuthority.java
          U impl/src/main/java/org/kuali/rice/kew/actions/DisapproveAction.java
          U impl/src/main/java/org/kuali/rice/kew/actions/TakeWorkgroupAuthority.java
          U impl/src/main/java/org/kuali/rice/kew/actions/AdHocRevoke.java
          U impl/src/main/java/org/kuali/rice/kew/actions/ActionTakenEvent.java
          U impl/src/main/java/org/kuali/rice/kew/actions/AdHocAction.java
          U impl/src/main/java/org/kuali/rice/kew/service/impl/WorkflowUtilityWebServiceImpl.java
          U impl/src/main/java/org/kuali/rice/kew/service/impl/WorkflowDocumentActionsWebServiceImpl.java
          U impl/src/main/java/org/kuali/rice/kew/service/WorkflowDocument.java
          U impl/src/main/java/org/kuali/rice/kew/xml/export/RuleXmlExporter.java
          A impl/src/main/java/org/kuali/rice/kew/xml/export/GroupXmlExporter.java
          U impl/src/main/java/org/kuali/rice/kew/xml/export/WorkgroupXmlExporter.java
          U impl/src/main/java/org/kuali/rice/kew/xml/RuleXmlParser.java
          U impl/src/main/java/org/kuali/rice/kew/xml/WorkgroupXmlConstants.java
          U impl/src/main/java/org/kuali/rice/kew/xml/WorkgroupXmlHandler.java
          A impl/src/main/java/org/kuali/rice/kew/xml/GroupXmlServiceImpl.java
          A impl/src/main/java/org/kuali/rice/kew/xml/GroupXmlParser.java
          U impl/src/main/java/org/kuali/rice/kew/xml/XmlConstants.java
          U impl/src/main/java/org/kuali/rice/kew/engine/simulation/SimulationEngine.java
          U impl/src/main/java/org/kuali/rice/kew/engine/node/FYIByUniversityId.java
          U impl/src/main/java/org/kuali/rice/kew/engine/node/FYIByNetworkId.java
          U impl/src/main/java/org/kuali/rice/kew/routeheader/service/impl/WorkflowDocumentServiceImpl.java
          U impl/src/main/java/org/kuali/rice/kew/routeheader/service/WorkflowDocumentService.java
          U impl/src/main/java/org/kuali/rice/kew/rule/OddSearchAttribute.java
          U impl/src/main/java/org/kuali/rice/kew/rule/dao/impl/RuleDAOJpaImpl.java
          U impl/src/main/java/org/kuali/rice/kew/rule/dao/impl/RuleDAOOjbImpl.java
          U impl/src/main/java/org/kuali/rice/kew/rule/dao/RuleDAO.java
          U impl/src/main/java/org/kuali/rice/kew/rule/FlexRM.java
          U impl/src/main/java/org/kuali/rice/kew/rule/WorkgroupTypeRoutingAttribute.java
          U impl/src/main/java/org/kuali/rice/kew/rule/web/WebRuleResponsibility.java
          U impl/src/main/java/org/kuali/rice/kew/rule/web/WebRuleBaseValues.java
          U impl/src/main/java/org/kuali/rice/kew/rule/web/RoutingReportAction.java
          U impl/src/main/java/org/kuali/rice/kew/rule/web/DelegateRule2Action.java
          U impl/src/main/java/org/kuali/rice/kew/rule/web/Rule2Action.java
          U impl/src/main/java/org/kuali/rice/kew/rule/web/RuleQuickLinksForm.java
          U impl/src/main/java/org/kuali/rice/kew/rule/WorkflowAttribute.java
          U impl/src/main/java/org/kuali/rice/kew/rule/KeyValueId.java
          U impl/src/main/java/org/kuali/rice/kew/rule/RuleRoutingAttribute.java
          U impl/src/main/java/org/kuali/rice/kew/rule/service/impl/RuleServiceImpl.java
          U impl/src/main/java/org/kuali/rice/kew/rule/service/RuleService.java
          U impl/src/main/java/org/kuali/rice/kew/rule/RuleBaseValues.java
          U impl/src/main/java/org/kuali/rice/kew/rule/AbstractWorkflowAttribute.java
          U impl/src/main/java/org/kuali/rice/kew/rule/xmlrouting/StandardGenericXMLRuleAttribute.java
          U impl/src/main/java/org/kuali/rice/kew/util/ResponsibleParty.java
          U impl/src/main/java/org/kuali/rice/kew/util/KEWPropertyConstants.java
          U impl/src/main/java/org/kuali/rice/kew/util/FutureRequestDocumentStateManager.java
          D impl/src/main/java/org/kuali/rice/kew/user/UserLookupableImpl.java
          U impl/src/main/java/org/kuali/rice/kns/lookup/LookupUtils.java
          U impl/src/main/java/org/kuali/rice/kns/workflow/service/KualiWorkflowDocument.java
          U impl/src/main/java/org/kuali/rice/kns/workflow/service/impl/KualiWorkflowDocumentImpl.java
          U impl/src/main/java/org/kuali/rice/kns/workflow/service/impl/WorkflowDocumentServiceImpl.java
          D impl/src/main/java/org/kuali/rice/kns/workflow/attribute/WorkflowLookupableImpl.java
          U impl/src/main/java/org/kuali/rice/kns/workflow/WorkflowUtils.java
          U impl/src/main/java/org/kuali/rice/kns/util/FieldUtils.java
          U impl/src/main/java/org/kuali/rice/kns/web/ui/Field.java
          U impl/src/main/java/org/kuali/rice/kns/web/ui/Row.java
          U impl/src/main/java/org/kuali/rice/ken/service/impl/NotificationWorkflowDocumentServiceImpl.java
          U impl/src/main/java/org/kuali/rice/ken/service/impl/NotificationAuthorizationServiceImpl.java
          A impl/src/main/java/org/kuali/rice/ken/service/impl/NotificationRecipientServiceKimImpl.java
          A impl/src/main/resources/schema/Group.xsd
          U impl/src/main/resources/schema/WorkflowData.xsd
          U impl/src/main/resources/org/kuali/rice/kim/config/KIMSpringBeans.xml
          A impl/src/main/resources/org/kuali/rice/kew/bo/datadictionary/RuleBaseValues.xml
          U impl/src/main/resources/org/kuali/rice/kew/config/KEWSpringBeans.xml
          U impl/src/main/resources/org/kuali/rice/kns/config/KNSSpringBeans.xml
          U api/src/main/java/org/kuali/rice/kim/service/IdentityManagementService.java
          U api/src/main/java/org/kuali/rice/kim/service/GroupService.java
          U api/src/main/java/org/kuali/rice/kew/service/WorkflowDocumentActions.java
          D api/src/main/java/org/kuali/rice/kew/dto/LookupableColumnDTO.java
          U api/src/main/java/org/kuali/rice/kew/dto/AdHocRevokeDTO.java
          U api/src/main/java/org/kuali/rice/kew/dto/ResponsiblePartyDTO.java
          U api/src/main/java/org/kuali/rice/kew/dto/DocumentSearchResultDTO.java
          D api/src/main/java/org/kuali/rice/kew/identity/IdentityFactory.java
          U api/src/main/java/org/kuali/rice/kew/webservice/StandardResponse.java
          U api/src/main/java/org/kuali/rice/kew/webservice/SimpleDocumentActionsWebService.java
          U api/src/main/java/org/kuali/rice/kew/webservice/DocumentResponse.java
          U ken/src/test/java/org/kuali/rice/ken/test/TestConstants.java
          A ken/src/test/java/org/kuali/rice/ken/services/impl/NotificationRecipientServiceKimImplTest.java
          U ken/src/test/java/org/kuali/rice/ken/KEWIntegrationTest.java
          U web/src/test/java/edu/sampleu/travel/workflow/EmployeeAttribute.java
          U web/src/test/java/edu/sampleu/travel/workflow/DestinationRuleAttribute.java
          U web/src/test/resources/ServerDefaultTestData.sql
          U web/src/main/webapp/en/WEB-INF/struts-config.xml
          D web/src/main/webapp/en/WEB-INF/jsp/lookupable/Lookup.jsp
          D web/src/main/webapp/en/WEB-INF/jsp/lookupable
          U web/src/main/webapp/en/WEB-INF/jsp/backdoor/Backdoor.jsp
          U web/src/main/webapp/en/WEB-INF/jsp/rules/RuleExtensionValuesEdit.jsp
          U web/src/main/webapp/en/WEB-INF/jsp/rules/RuleQuickLinks.jsp
          U web/src/main/webapp/en/WEB-INF/jsp/rules/RuleQuickLinksDocumentTypeLinks.jsp
          U web/src/main/webapp/en/WEB-INF/jsp/docsearch/DocumentSearch.jsp
          U web/src/main/webapp/en/WEB-INF/jsp/docsearch/DocumentSearchSearchableAttributes.jsp

          KFS Branch:

          Command to find base revision:

          svn log --stop-on-copy https://test.kuali.org/svn/kfs/branches/kfs-rice-facetoface-merge-20081223-br

          ...

          ------------------------------------------------------------------------
          r19450 | ewestfal | 2008-12-23 17:13:37 -0500 (Tue, 23 Dec 2008) | 1 line

          KULRICE-2524 - merged 0.9.4 facetoface branch into a branch cut from the main 0.9.4 branch. Updated KFS on a special branch for this purpose to reflect these changes and to pull in the new Rice jars.
          ------------------------------------------------------------------------
          r19432 | ewestfal | 2008-12-23 10:45:42 -0500 (Tue, 23 Dec 2008) | 1 line

          Creating a branch for executing and testing out the face to face merge
          ------------------------------------------------------------------------

          Command to execute merge into KFS trunk:

          svn merge -r 19432:HEAD https://test.kuali.org/svn/kfs/branches/kfs-rice-facetoface-merge-20081223-br

          C build/project/rice-0.9.4-SNAPSHOT-web.zip
          U test/unit/src/org/kuali/kfs/module/purap/document/validation/impl/PaymentRequestDocumentRuleTest.java
          U test/unit/src/org/kuali/kfs/sys/document/workflow/MockWorkflowDocument.java
          U work/src/org/kuali/rice/kns/workflow/attribute/DataDictionarySearchableAttribute.java
          C work/src/org/kuali/kfs/coa/spring-coa.xml
          U work/src/org/kuali/kfs/fp/spring-fp.xml
          U work/src/org/kuali/kfs/fp/document/routing/attribute/KualiVerificationWorkgroupAttribute.java
          U work/src/org/kuali/kfs/module/ar/spring-ar.xml
          U work/src/org/kuali/kfs/module/purap/spring-purap.xml
          U work/src/org/kuali/kfs/module/purap/document/ReceivingDocumentBase.java
          U work/src/org/kuali/kfs/module/purap/document/searching/processor/RequisitionDocumentSearchResultProcessor.java
          U work/src/org/kuali/kfs/module/purap/document/searching/processor/PaymentRequestDocumentSearchResultProcessor.java
          U work/src/org/kuali/kfs/module/purap/document/searching/processor/PurchaseOrderDocumentSearchResultProcessor.java
          U work/src/org/kuali/kfs/module/purap/document/searching/processor/PurApDocumentSearchResultProcessor.java
          U work/src/org/kuali/kfs/module/purap/document/searching/processor/CreditMemoDocumentSearchResultProcessor.java
          U work/src/org/kuali/kfs/module/purap/document/searching/attribute/KualiPurchaseOrderIncompleteStatusesAttribute.java
          U work/src/org/kuali/kfs/module/purap/document/ContractManagerAssignmentDocument.java
          U work/src/org/kuali/kfs/module/purap/document/PurchaseOrderDocument.java
          U work/src/org/kuali/kfs/module/purap/document/routing/attribute/KualiPurApDocumentTaxReviewAttribute.java
          U work/src/org/kuali/kfs/module/purap/document/routing/attribute/KualiPurchaseOrderContractAndGrantsAttribute.java
          U work/src/org/kuali/kfs/module/purap/document/routing/attribute/KualiPurApCommodityCodeAttribute.java
          U work/src/org/kuali/kfs/module/purap/document/routing/attribute/KualiPurchaseOrderBudgetAttribute.java
          U work/src/org/kuali/kfs/module/cg/spring-cg.xml
          U work/src/org/kuali/kfs/module/cg/document/routing/attribute/KualiResearchRiskAttribute.java
          U work/src/org/kuali/kfs/vnd/spring-vnd.xml
          U work/src/org/kuali/kfs/sys/businessobject/lookup/LookupableSpringContext.java
          U work/src/org/kuali/kfs/sys/context/FinancialSystemResourceLoader.java
          U work/src/org/kuali/kfs/sys/spring-sys.xml
          U work/src/org/kuali/kfs/sys/document/routing/attribute/KualiSubAccountAttribute.java
          U work/src/org/kuali/kfs/sys/document/routing/attribute/KualiOrgReviewAttribute.java
          U work/src/org/kuali/kfs/sys/document/routing/OrgReviewLookupableImpl.java
          U work/src/org/kuali/kfs/sys/document/searching/attribute/BusinessObjectMaintenancePrimaryKeysSearchAttribute.java
          D work/src/org/kuali/kfs/sys/document/workflow/SystemWorkgroupExtensionAttribute.java
          D work/src/org/kuali/kfs/sys/document/workflow/ChartOrgExtensionAttribute.java
          C work/web-root/WEB-INF/lib/rice-impl-0.9.4-SNAPSHOT.jar
          C work/web-root/WEB-INF/lib/rice-api-0.9.4-SNAPSHOT.jar

          Show
          ewestfal Eric Westfall added a comment - This has been completed, merge logs pasted below: Command to find base revision: svn log --stop-on-copy https://test.kuali.org/svn/rice/branches/rice-release-0-9-4-facetoface-merge-br ... ------------------------------------------------------------------------ r5785 | ewestfal | 2008-12-22 14:45:33 -0500 (Mon, 22 Dec 2008) | 1 line Creating a branch off of the main 0.9.4 branch to do an intermediate merge of the work on the facetoface branch of 0.9.4. ------------------------------------------------------------------------ Command to execute merge into 0.9.4 branch: svn merge -r 5785:HEAD https://test.kuali.org/svn/rice/branches/rice-release-0-9-4-facetoface-merge-br U kew/src/test/java/org/kuali/rice/kew/test/TestUtilities.java U kew/src/test/java/org/kuali/rice/kew/test/KEWTestCase.java U kew/src/test/java/org/kuali/rice/kew/mail/EmailReminderLifecycleTest.java U kew/src/test/java/org/kuali/rice/kew/postprocessor/PostProcessorTest.java U kew/src/test/java/org/kuali/rice/kew/notification/NotificationServiceTest.java U kew/src/test/java/org/kuali/rice/kew/docsearch/DocumentSearchTestBase.java U kew/src/test/java/org/kuali/rice/kew/docsearch/DocumentSearchTest.java U kew/src/test/java/org/kuali/rice/kew/docsearch/TestXMLSearchableAttributeDateTime.java U kew/src/test/java/org/kuali/rice/kew/docsearch/TestXMLSearchableAttributeLong.java U kew/src/test/java/org/kuali/rice/kew/docsearch/xml/StandardGenericXMLSearchableAttributeRangesTest.java U kew/src/test/java/org/kuali/rice/kew/docsearch/xml/StandardGenericXMLSearchableAttributeTest.java U kew/src/test/java/org/kuali/rice/kew/docsearch/TestXMLSearchableAttributeFloat.java U kew/src/test/java/org/kuali/rice/kew/docsearch/TestXMLSearchableAttributeString.java U kew/src/test/java/org/kuali/rice/kew/docsearch/MockSearchableAttribute.java U kew/src/test/java/org/kuali/rice/kew/docsearch/DocumentSearchSecurityTest.java U kew/src/test/java/org/kuali/rice/kew/docsearch/CustomDocumentSearchResultProcessorTest.java U kew/src/test/java/org/kuali/rice/kew/actionitem/ActionItemServiceTest.java A kew/src/test/java/org/kuali/rice/kew/workgroup/GroupImportTest.java U kew/src/test/java/org/kuali/rice/kew/actions/SuperUserActionRequestApproveEventTest.java U kew/src/test/java/org/kuali/rice/kew/actions/FutureRequestsTest.java U kew/src/test/java/org/kuali/rice/kew/actions/ReleaseWorkgroupAuthorityTest.java U kew/src/test/java/org/kuali/rice/kew/actions/TakeWorkgroupAuthorityTest.java U kew/src/test/java/org/kuali/rice/kew/actions/AcknowledgeActionTest.java U kew/src/test/java/org/kuali/rice/kew/actions/RevokeAdHocActionTest.java U kew/src/test/java/org/kuali/rice/kew/actions/ClearFYIActionTest.java U kew/src/test/java/org/kuali/rice/kew/actions/AdHocRouteTest.java A kew/src/test/java/org/kuali/rice/kew/xml/export/GroupXmlExporterTest.java U kew/src/test/java/org/kuali/rice/kew/routemodule/TestRouteModule.java U kew/src/test/java/org/kuali/rice/kew/routemodule/TestRouteModuleXMLHelper.java U kew/src/test/java/org/kuali/rice/kew/server/BeanConverterTester.java U kew/src/test/java/org/kuali/rice/kew/server/WorkflowUtilityTest.java U kew/src/test/java/org/kuali/rice/kew/rule/AddRuleDelegationTest.java U kew/src/test/java/org/kuali/rice/kew/rule/service/impl/RoleServiceTest.java U kew/src/test/java/org/kuali/rice/kew/rule/xmlrouting/StandardGenericXMLRuleAttributeTest.java U kew/src/test/java/org/kuali/rice/kew/actionlist/OutboxTest.java U kew/src/test/java/org/kuali/rice/kew/actionlist/ActionListTest.java U kew/src/test/java/org/kuali/rice/kew/actionlist/web/ActionListActionTest.java A kew/src/test/java/org/kuali/rice/kew/actionlist/web/ActionListFilterActionTest.java U kew/src/test/java/mocks/MockRuleServiceImpl.java U kew/src/test/resources/org/kuali/rice/kew/test/DefaultTestData.sql A kew/src/test/resources/org/kuali/rice/kew/workgroup/GroupXmlImportTest.xml U scripts/upgrades/0.9.3 to 0.9.4/kew-upgrade-0.9.3-to-0.9.4.sql U kns/src/test/java/org/kuali/rice/kns/service/PessimisticLockServiceTest.java U kns/src/test/java/org/kuali/rice/kns/impls/MockWorkflowDocument.java C kns/src/test/java/org/kuali/rice/kns/document/DocumentAuthorizerBaseTest.java U impl/src/main/java/org/kuali/rice/kim/bo/types/impl/KimTypeImpl.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/IdentityManagementServiceImpl.java U impl/src/main/java/org/kuali/rice/kim/service/KIMServiceLocator.java A impl/src/main/java/org/kuali/rice/kim/service/support/KimTypeInternalService.java A impl/src/main/java/org/kuali/rice/kim/service/support/impl/KimTypeInternalServiceImpl.java A impl/src/main/java/org/kuali/rice/kim/dao/impl/KimTypeDaoJpa.java A impl/src/main/java/org/kuali/rice/kim/dao/impl/KimTypeDaoOjb.java A impl/src/main/java/org/kuali/rice/kim/dao/KimTypeDao.java C impl/src/main/java/org/kuali/rice/kim/util/KimConstants.java U impl/src/main/java/org/kuali/rice/kew/export/ExportDataSet.java U impl/src/main/java/org/kuali/rice/kew/batch/XmlDigesterServiceImpl.java U impl/src/main/java/org/kuali/rice/kew/dto/DTOConverter.java U impl/src/main/java/org/kuali/rice/kew/removereplace/service/impl/RemoveReplaceDocumentServiceImpl.java U impl/src/main/java/org/kuali/rice/kew/removereplace/WorkgroupTarget.java U impl/src/main/java/org/kuali/rice/kew/removereplace/web/RemoveReplaceAction.java U impl/src/main/java/org/kuali/rice/kew/removereplace/web/RemoveReplaceWorkgroup.java U impl/src/main/java/org/kuali/rice/kew/removereplace/web/RemoveReplaceForm.java D impl/src/main/java/org/kuali/rice/kew/lookupable/RoleLookupableImpl.java D impl/src/main/java/org/kuali/rice/kew/lookupable/RuleTemplateLookupableImpl.java D impl/src/main/java/org/kuali/rice/kew/lookupable/EDocLiteLookupable.java D impl/src/main/java/org/kuali/rice/kew/lookupable/Row.java D impl/src/main/java/org/kuali/rice/kew/lookupable/LookupAction.java D impl/src/main/java/org/kuali/rice/kew/lookupable/DocumentTypeLookupableImpl.java D impl/src/main/java/org/kuali/rice/kew/lookupable/Field.java D impl/src/main/java/org/kuali/rice/kew/lookupable/WorkflowLookupable.java D impl/src/main/java/org/kuali/rice/kew/lookupable/RuleAttributeLookupableImpl.java U impl/src/main/java/org/kuali/rice/kew/lookupable/RuleBaseValuesLookupableImpl.java U impl/src/main/java/org/kuali/rice/kew/webservice/impl/SimpleDocumentActionsWebServiceImpl.java D impl/src/main/java/org/kuali/rice/kew/workgroup/WorkgroupTypeLookupable.java U impl/src/main/java/org/kuali/rice/kew/workgroup/WorkgroupMembershipChangeProcessor.java U impl/src/main/java/org/kuali/rice/kew/workgroup/BaseWorkgroupRoutingService.java U impl/src/main/java/org/kuali/rice/kew/actiontaken/service/ActionTakenService.java U impl/src/main/java/org/kuali/rice/kew/actiontaken/service/impl/ActionTakenServiceImpl.java U impl/src/main/java/org/kuali/rice/kew/actiontaken/ActionTakenValue.java U impl/src/main/java/org/kuali/rice/kew/attribute/ExtensionAttribute.java U impl/src/main/java/org/kuali/rice/kew/attribute/web/WebField.java U impl/src/main/java/org/kuali/rice/kew/attribute/web/WebExtensions.java U impl/src/main/java/org/kuali/rice/kew/doctype/DocumentTypeLookupableHelperServiceImpl.java U impl/src/main/java/org/kuali/rice/kew/doctype/web/DocumentTypeAction.java U impl/src/main/java/org/kuali/rice/kew/actionlist/service/impl/ActionListServiceImpl.java U impl/src/main/java/org/kuali/rice/kew/actionlist/service/ActionListService.java U impl/src/main/java/org/kuali/rice/kew/actionlist/dao/impl/ActionListDAOJpaImpl.java U impl/src/main/java/org/kuali/rice/kew/actionlist/dao/impl/ActionListDAOOjbImpl.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/ActionListFilterAction.java U impl/src/main/java/org/kuali/rice/kew/web/session/UserSession.java U impl/src/main/java/org/kuali/rice/kew/web/backdoor/BackdoorAction.java U impl/src/main/java/org/kuali/rice/kew/web/WorkflowRoutingForm.java C impl/src/main/java/org/kuali/rice/kew/web/WorkflowAction.java U impl/src/main/java/org/kuali/rice/kew/web/UserLoginFilter.java U impl/src/main/java/org/kuali/rice/kew/mail/service/impl/StyleableEmailContentServiceImpl.java U impl/src/main/java/org/kuali/rice/kew/actionrequest/service/impl/ActionRequestServiceImpl.java U impl/src/main/java/org/kuali/rice/kew/actionrequest/service/ActionRequestService.java U impl/src/main/java/org/kuali/rice/kew/actionrequest/ActionRequestValue.java U impl/src/main/java/org/kuali/rice/kew/actionrequest/dao/impl/ActionRequestDAOJpaImpl.java U impl/src/main/java/org/kuali/rice/kew/actionrequest/dao/impl/ActionRequestDAOOjbImpl.java U impl/src/main/java/org/kuali/rice/kew/actionrequest/dao/ActionRequestDAO.java U impl/src/main/java/org/kuali/rice/kew/actionrequest/ActionRequestFactory.java U impl/src/main/java/org/kuali/rice/kew/identity/service/impl/IdentityHelperServiceImpl.java U impl/src/main/java/org/kuali/rice/kew/identity/service/IdentityHelperService.java A impl/src/main/java/org/kuali/rice/kew/docsearch/DocumentSearchField.java U impl/src/main/java/org/kuali/rice/kew/docsearch/StandardDocumentSearchCriteriaProcessor.java U impl/src/main/java/org/kuali/rice/kew/docsearch/DocumentSearchResultComponents.java U impl/src/main/java/org/kuali/rice/kew/docsearch/DocSearchUtils.java U impl/src/main/java/org/kuali/rice/kew/docsearch/SearchableAttribute.java U impl/src/main/java/org/kuali/rice/kew/docsearch/service/impl/DocumentSearchServiceImpl.java U impl/src/main/java/org/kuali/rice/kew/docsearch/xml/DocumentSearchXMLResultProcessorImpl.java U impl/src/main/java/org/kuali/rice/kew/docsearch/xml/StandardGenericXMLSearchableAttribute.java A impl/src/main/java/org/kuali/rice/kew/docsearch/DocumentSearchColumn.java U impl/src/main/java/org/kuali/rice/kew/docsearch/StandardDocumentSearchResultProcessor.java U impl/src/main/java/org/kuali/rice/kew/docsearch/DocSearchCriteriaDTO.java U impl/src/main/java/org/kuali/rice/kew/docsearch/DocumentSearchCriteriaProcessor.java A impl/src/main/java/org/kuali/rice/kew/docsearch/DocumentSearchRow.java U impl/src/main/java/org/kuali/rice/kew/docsearch/StandardDocumentSearchGenerator.java U impl/src/main/java/org/kuali/rice/kew/docsearch/web/DocumentSearchAction.java U impl/src/main/java/org/kuali/rice/kew/docsearch/web/DocumentSearchForm.java U impl/src/main/java/org/kuali/rice/kew/actionitem/ActionItemActionListExtension.java U impl/src/main/java/org/kuali/rice/kew/actionitem/dao/impl/ActionItemDAOJpaImpl.java U impl/src/main/java/org/kuali/rice/kew/actionitem/dao/impl/ActionItemDAOOjbImpl.java U impl/src/main/java/org/kuali/rice/kew/superuser/web/SuperUserAction.java U impl/src/main/java/org/kuali/rice/kew/documentoperation/web/DocumentOperationAction.java U impl/src/main/java/org/kuali/rice/kew/actions/ReleaseWorkgroupAuthority.java U impl/src/main/java/org/kuali/rice/kew/actions/DisapproveAction.java U impl/src/main/java/org/kuali/rice/kew/actions/TakeWorkgroupAuthority.java U impl/src/main/java/org/kuali/rice/kew/actions/AdHocRevoke.java U impl/src/main/java/org/kuali/rice/kew/actions/ActionTakenEvent.java U impl/src/main/java/org/kuali/rice/kew/actions/AdHocAction.java U impl/src/main/java/org/kuali/rice/kew/service/impl/WorkflowUtilityWebServiceImpl.java U impl/src/main/java/org/kuali/rice/kew/service/impl/WorkflowDocumentActionsWebServiceImpl.java U impl/src/main/java/org/kuali/rice/kew/service/WorkflowDocument.java U impl/src/main/java/org/kuali/rice/kew/xml/export/RuleXmlExporter.java A impl/src/main/java/org/kuali/rice/kew/xml/export/GroupXmlExporter.java U impl/src/main/java/org/kuali/rice/kew/xml/export/WorkgroupXmlExporter.java U impl/src/main/java/org/kuali/rice/kew/xml/RuleXmlParser.java U impl/src/main/java/org/kuali/rice/kew/xml/WorkgroupXmlConstants.java U impl/src/main/java/org/kuali/rice/kew/xml/WorkgroupXmlHandler.java A impl/src/main/java/org/kuali/rice/kew/xml/GroupXmlServiceImpl.java A impl/src/main/java/org/kuali/rice/kew/xml/GroupXmlParser.java U impl/src/main/java/org/kuali/rice/kew/xml/XmlConstants.java U impl/src/main/java/org/kuali/rice/kew/engine/simulation/SimulationEngine.java U impl/src/main/java/org/kuali/rice/kew/engine/node/FYIByUniversityId.java U impl/src/main/java/org/kuali/rice/kew/engine/node/FYIByNetworkId.java U impl/src/main/java/org/kuali/rice/kew/routeheader/service/impl/WorkflowDocumentServiceImpl.java U impl/src/main/java/org/kuali/rice/kew/routeheader/service/WorkflowDocumentService.java U impl/src/main/java/org/kuali/rice/kew/rule/OddSearchAttribute.java U impl/src/main/java/org/kuali/rice/kew/rule/dao/impl/RuleDAOJpaImpl.java U impl/src/main/java/org/kuali/rice/kew/rule/dao/impl/RuleDAOOjbImpl.java U impl/src/main/java/org/kuali/rice/kew/rule/dao/RuleDAO.java U impl/src/main/java/org/kuali/rice/kew/rule/FlexRM.java U impl/src/main/java/org/kuali/rice/kew/rule/WorkgroupTypeRoutingAttribute.java U impl/src/main/java/org/kuali/rice/kew/rule/web/WebRuleResponsibility.java U impl/src/main/java/org/kuali/rice/kew/rule/web/WebRuleBaseValues.java U impl/src/main/java/org/kuali/rice/kew/rule/web/RoutingReportAction.java U impl/src/main/java/org/kuali/rice/kew/rule/web/DelegateRule2Action.java U impl/src/main/java/org/kuali/rice/kew/rule/web/Rule2Action.java U impl/src/main/java/org/kuali/rice/kew/rule/web/RuleQuickLinksForm.java U impl/src/main/java/org/kuali/rice/kew/rule/WorkflowAttribute.java U impl/src/main/java/org/kuali/rice/kew/rule/KeyValueId.java U impl/src/main/java/org/kuali/rice/kew/rule/RuleRoutingAttribute.java U impl/src/main/java/org/kuali/rice/kew/rule/service/impl/RuleServiceImpl.java U impl/src/main/java/org/kuali/rice/kew/rule/service/RuleService.java U impl/src/main/java/org/kuali/rice/kew/rule/RuleBaseValues.java U impl/src/main/java/org/kuali/rice/kew/rule/AbstractWorkflowAttribute.java U impl/src/main/java/org/kuali/rice/kew/rule/xmlrouting/StandardGenericXMLRuleAttribute.java U impl/src/main/java/org/kuali/rice/kew/util/ResponsibleParty.java U impl/src/main/java/org/kuali/rice/kew/util/KEWPropertyConstants.java U impl/src/main/java/org/kuali/rice/kew/util/FutureRequestDocumentStateManager.java D impl/src/main/java/org/kuali/rice/kew/user/UserLookupableImpl.java U impl/src/main/java/org/kuali/rice/kns/lookup/LookupUtils.java U impl/src/main/java/org/kuali/rice/kns/workflow/service/KualiWorkflowDocument.java U impl/src/main/java/org/kuali/rice/kns/workflow/service/impl/KualiWorkflowDocumentImpl.java U impl/src/main/java/org/kuali/rice/kns/workflow/service/impl/WorkflowDocumentServiceImpl.java D impl/src/main/java/org/kuali/rice/kns/workflow/attribute/WorkflowLookupableImpl.java U impl/src/main/java/org/kuali/rice/kns/workflow/WorkflowUtils.java U impl/src/main/java/org/kuali/rice/kns/util/FieldUtils.java U impl/src/main/java/org/kuali/rice/kns/web/ui/Field.java U impl/src/main/java/org/kuali/rice/kns/web/ui/Row.java U impl/src/main/java/org/kuali/rice/ken/service/impl/NotificationWorkflowDocumentServiceImpl.java U impl/src/main/java/org/kuali/rice/ken/service/impl/NotificationAuthorizationServiceImpl.java A impl/src/main/java/org/kuali/rice/ken/service/impl/NotificationRecipientServiceKimImpl.java A impl/src/main/resources/schema/Group.xsd U impl/src/main/resources/schema/WorkflowData.xsd U impl/src/main/resources/org/kuali/rice/kim/config/KIMSpringBeans.xml A impl/src/main/resources/org/kuali/rice/kew/bo/datadictionary/RuleBaseValues.xml U impl/src/main/resources/org/kuali/rice/kew/config/KEWSpringBeans.xml U impl/src/main/resources/org/kuali/rice/kns/config/KNSSpringBeans.xml U api/src/main/java/org/kuali/rice/kim/service/IdentityManagementService.java U api/src/main/java/org/kuali/rice/kim/service/GroupService.java U api/src/main/java/org/kuali/rice/kew/service/WorkflowDocumentActions.java D api/src/main/java/org/kuali/rice/kew/dto/LookupableColumnDTO.java U api/src/main/java/org/kuali/rice/kew/dto/AdHocRevokeDTO.java U api/src/main/java/org/kuali/rice/kew/dto/ResponsiblePartyDTO.java U api/src/main/java/org/kuali/rice/kew/dto/DocumentSearchResultDTO.java D api/src/main/java/org/kuali/rice/kew/identity/IdentityFactory.java U api/src/main/java/org/kuali/rice/kew/webservice/StandardResponse.java U api/src/main/java/org/kuali/rice/kew/webservice/SimpleDocumentActionsWebService.java U api/src/main/java/org/kuali/rice/kew/webservice/DocumentResponse.java U ken/src/test/java/org/kuali/rice/ken/test/TestConstants.java A ken/src/test/java/org/kuali/rice/ken/services/impl/NotificationRecipientServiceKimImplTest.java U ken/src/test/java/org/kuali/rice/ken/KEWIntegrationTest.java U web/src/test/java/edu/sampleu/travel/workflow/EmployeeAttribute.java U web/src/test/java/edu/sampleu/travel/workflow/DestinationRuleAttribute.java U web/src/test/resources/ServerDefaultTestData.sql U web/src/main/webapp/en/WEB-INF/struts-config.xml D web/src/main/webapp/en/WEB-INF/jsp/lookupable/Lookup.jsp D web/src/main/webapp/en/WEB-INF/jsp/lookupable U web/src/main/webapp/en/WEB-INF/jsp/backdoor/Backdoor.jsp U web/src/main/webapp/en/WEB-INF/jsp/rules/RuleExtensionValuesEdit.jsp U web/src/main/webapp/en/WEB-INF/jsp/rules/RuleQuickLinks.jsp U web/src/main/webapp/en/WEB-INF/jsp/rules/RuleQuickLinksDocumentTypeLinks.jsp U web/src/main/webapp/en/WEB-INF/jsp/docsearch/DocumentSearch.jsp U web/src/main/webapp/en/WEB-INF/jsp/docsearch/DocumentSearchSearchableAttributes.jsp KFS Branch: Command to find base revision: svn log --stop-on-copy https://test.kuali.org/svn/kfs/branches/kfs-rice-facetoface-merge-20081223-br ... ------------------------------------------------------------------------ r19450 | ewestfal | 2008-12-23 17:13:37 -0500 (Tue, 23 Dec 2008) | 1 line KULRICE-2524 - merged 0.9.4 facetoface branch into a branch cut from the main 0.9.4 branch. Updated KFS on a special branch for this purpose to reflect these changes and to pull in the new Rice jars. ------------------------------------------------------------------------ r19432 | ewestfal | 2008-12-23 10:45:42 -0500 (Tue, 23 Dec 2008) | 1 line Creating a branch for executing and testing out the face to face merge ------------------------------------------------------------------------ Command to execute merge into KFS trunk: svn merge -r 19432:HEAD https://test.kuali.org/svn/kfs/branches/kfs-rice-facetoface-merge-20081223-br C build/project/rice-0.9.4-SNAPSHOT-web.zip U test/unit/src/org/kuali/kfs/module/purap/document/validation/impl/PaymentRequestDocumentRuleTest.java U test/unit/src/org/kuali/kfs/sys/document/workflow/MockWorkflowDocument.java U work/src/org/kuali/rice/kns/workflow/attribute/DataDictionarySearchableAttribute.java C work/src/org/kuali/kfs/coa/spring-coa.xml U work/src/org/kuali/kfs/fp/spring-fp.xml U work/src/org/kuali/kfs/fp/document/routing/attribute/KualiVerificationWorkgroupAttribute.java U work/src/org/kuali/kfs/module/ar/spring-ar.xml U work/src/org/kuali/kfs/module/purap/spring-purap.xml U work/src/org/kuali/kfs/module/purap/document/ReceivingDocumentBase.java U work/src/org/kuali/kfs/module/purap/document/searching/processor/RequisitionDocumentSearchResultProcessor.java U work/src/org/kuali/kfs/module/purap/document/searching/processor/PaymentRequestDocumentSearchResultProcessor.java U work/src/org/kuali/kfs/module/purap/document/searching/processor/PurchaseOrderDocumentSearchResultProcessor.java U work/src/org/kuali/kfs/module/purap/document/searching/processor/PurApDocumentSearchResultProcessor.java U work/src/org/kuali/kfs/module/purap/document/searching/processor/CreditMemoDocumentSearchResultProcessor.java U work/src/org/kuali/kfs/module/purap/document/searching/attribute/KualiPurchaseOrderIncompleteStatusesAttribute.java U work/src/org/kuali/kfs/module/purap/document/ContractManagerAssignmentDocument.java U work/src/org/kuali/kfs/module/purap/document/PurchaseOrderDocument.java U work/src/org/kuali/kfs/module/purap/document/routing/attribute/KualiPurApDocumentTaxReviewAttribute.java U work/src/org/kuali/kfs/module/purap/document/routing/attribute/KualiPurchaseOrderContractAndGrantsAttribute.java U work/src/org/kuali/kfs/module/purap/document/routing/attribute/KualiPurApCommodityCodeAttribute.java U work/src/org/kuali/kfs/module/purap/document/routing/attribute/KualiPurchaseOrderBudgetAttribute.java U work/src/org/kuali/kfs/module/cg/spring-cg.xml U work/src/org/kuali/kfs/module/cg/document/routing/attribute/KualiResearchRiskAttribute.java U work/src/org/kuali/kfs/vnd/spring-vnd.xml U work/src/org/kuali/kfs/sys/businessobject/lookup/LookupableSpringContext.java U work/src/org/kuali/kfs/sys/context/FinancialSystemResourceLoader.java U work/src/org/kuali/kfs/sys/spring-sys.xml U work/src/org/kuali/kfs/sys/document/routing/attribute/KualiSubAccountAttribute.java U work/src/org/kuali/kfs/sys/document/routing/attribute/KualiOrgReviewAttribute.java U work/src/org/kuali/kfs/sys/document/routing/OrgReviewLookupableImpl.java U work/src/org/kuali/kfs/sys/document/searching/attribute/BusinessObjectMaintenancePrimaryKeysSearchAttribute.java D work/src/org/kuali/kfs/sys/document/workflow/SystemWorkgroupExtensionAttribute.java D work/src/org/kuali/kfs/sys/document/workflow/ChartOrgExtensionAttribute.java C work/web-root/WEB-INF/lib/rice-impl-0.9.4-SNAPSHOT.jar C work/web-root/WEB-INF/lib/rice-api-0.9.4-SNAPSHOT.jar
          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: