Details

      Description

      Once the kra branch of 0.9.3 is done we need to merge it back into the main 0.9.3 development line.

        Attachments

          Activity

          Hide
          ewestfal Eric Westfall added a comment -

          As indicated by Geoff McGregor, KRA will be "freezing" development on 6/20 so we can look at merging it in at the beginning of the following week.

          Show
          ewestfal Eric Westfall added a comment - As indicated by Geoff McGregor, KRA will be "freezing" development on 6/20 so we can look at merging it in at the beginning of the following week.
          Hide
          ewestfal Eric Westfall added a comment - - edited

          svn log --stop-on-copy https://test.kuali.org/svn/rice/branches/rice-release-0-9-3-kra-br

          Yields a starting revision of:

          ------------------------------------------------------------------------
          r3234 | ewestfal | 2008-02-13 15:55:36 -0500 (Wed, 13 Feb 2008) | 1 line

          KULRICE-1638 - Created branch rice-release-0-9-3-kra-br from rice-release-0-9-3-br.
          ------------------------------------------------------------------------

          Merge command will be:

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

          Show
          ewestfal Eric Westfall added a comment - - edited svn log --stop-on-copy https://test.kuali.org/svn/rice/branches/rice-release-0-9-3-kra-br Yields a starting revision of: ------------------------------------------------------------------------ r3234 | ewestfal | 2008-02-13 15:55:36 -0500 (Wed, 13 Feb 2008) | 1 line KULRICE-1638 - Created branch rice-release-0-9-3-kra-br from rice-release-0-9-3-br. ------------------------------------------------------------------------ Merge command will be: svn merge -r 3234:HEAD https://test.kuali.org/svn/rice/branches/rice-release-0-9-3-kra-br
          Hide
          ewestfal Eric Westfall added a comment -

          Merge output below...yikes:

          129-79-44-31:rice-0.9.3 ewestfal$ svn merge -r 3234:HEAD https://test.kuali.org/svn/rice/branches/rice-release-0-9-3-kra-br
          U ksb/pom.xml
          U kim/pom.xml
          U kew/src/test/java/mocks/MockPostProcessor.java
          U kew/src/test/java/edu/iu/uis/eden/routemanager/ExceptionRoutingTestPostProcessor.java
          U kew/src/test/java/edu/iu/uis/eden/docsearch/xml/StandardGenericXMLSearchableAttributePostProcessor.java
          U kew/src/test/java/edu/iu/uis/eden/actions/FutureRequestsTest.java
          U kew/src/test/java/edu/iu/uis/eden/actions/SuperUserActionInvalidPostProcessor.java
          U kew/src/test/java/edu/iu/uis/eden/engine/PostProcessorSpawnDocument.java
          C kew/src/main/java/edu/iu/uis/eden/routetemplate/RuleTemplate.java
          U kew/src/main/java/edu/iu/uis/eden/IDocumentEvent.java
          U kew/src/main/java/edu/iu/uis/eden/actionlist/dao/ActionListDAOOjbImpl.java
          U kew/src/main/java/edu/iu/uis/eden/actionlist/dao/ActionListDAO.java
          U kew/src/main/java/edu/iu/uis/eden/actionlist/ActionListServiceImpl.java
          U kew/src/main/java/edu/iu/uis/eden/postprocessor/PostProcessorRemoteAdapter.java
          U kew/src/main/java/edu/iu/uis/eden/postprocessor/PostProcessor.java
          U kew/src/main/java/edu/iu/uis/eden/postprocessor/DefaultPostProcessor.java
          C kew/src/main/java/edu/iu/uis/eden/docsearch/StandardDocumentSearchResultProcessor.java
          U kew/src/main/java/edu/iu/uis/eden/engine/StandardWorkflowEngine.java
          U kew/src/main/java/edu/iu/uis/eden/util/Utilities.java
          A kew/src/main/java/edu/iu/uis/eden/AfterProcessEvent.java
          U kew/src/main/java/edu/iu/uis/eden/server/BeanConverter.java
          U kew/src/main/java/edu/iu/uis/eden/clientapp/PostProcessorRemote.java
          A kew/src/main/java/edu/iu/uis/eden/clientapp/vo/AfterProcessEventVO.java
          U kew/src/main/java/edu/iu/uis/eden/clientapp/vo/DocumentEventVO.java
          A kew/src/main/java/edu/iu/uis/eden/clientapp/vo/BeforeProcessEventVO.java
          C kew/src/main/java/edu/iu/uis/eden/mail/StyleableEmailContentServiceImpl.java
          A kew/src/main/java/edu/iu/uis/eden/BeforeProcessEvent.java
          U kew/src/main/java/edu/iu/uis/eden/SpringLoader.java
          U kew/pom.xml
          U kom/pom.xml
          C kim-api/pom.xml
          A scripts/CheckTestResults.groovy
          U scripts/launch/rice - JettyServer.launch
          A scripts/upgrades/0.9.1 to 0.9.2/rebuild-system-params-0.9.2.sql
          C scripts/upgrades/0.9.2 to 0.9.3/kns-upgrade-0.9.2-to-0.9.3.sql
          C scripts/createproject.groovy
          U core/pom.xml
          Skipped missing target: 'standalone/pom.xml'
          Skipped missing target: 'standalone'
          U pom.xml
          Skipped missing target: 'kns/src/test/java/org/kuali/rice/TestBase.java'
          Skipped missing target: 'kns/src/test/java/org/kuali/core/datadictionary/exporter/TransactionalDocumentEntryMapperTest.java'
          A kns/src/test/java/org/kuali/core/service/BusinessObjectServiceTest.java
          A kns/src/test/java/org/kuali/core/service/PessimisticLockServiceTest.java
          C kns/src/test/java/org/kuali/core/impls/MockWorkflowDocument.java
          Skipped 'kns/src/test/java/org/kuali/core/util'
          C kns/src/test/java/org/kuali/core/util/KualiDecimalTest.java
          A kns/src/test/java/org/kuali/core/util/ObjectUtilsTest.java
          A kns/src/test/java/org/kuali/core/document/PessimisticLockTestDocumentAuthorizer.java
          C kns/src/test/java/org/kuali/core/document/DocumentAuthorizerBaseTest.java
          A kns/src/test/java/org/kuali/core/document/TestDocumentAuthorizerBase.java
          Skipped missing target: 'kns/src/test/resources/SpringBeans.xml'
          Skipped missing target: 'kns/src/test/resources/DefaultTestData.sql'
          Skipped missing target: 'kns/src/test/resources/edu/sampleu/travel/datadictionary/TravelRequestDocument.xml'
          Skipped missing target: 'kns/src/test/resources/edu/sampleu/travel/datadictionary'
          Skipped missing target: 'kns/src/test/resources/edu/sampleu/travel'
          Skipped missing target: 'kns/src/test/resources/edu/sampleu'
          Skipped missing target: 'kns/src/test/resources/edu'
          Skipped missing target: 'kns/src/test/resources/DefaultTestData.xml'
          Skipped missing target: 'kns/src/test/webapp/WEB-INF/struts-config.xml'
          Skipped missing target: 'kns/src/test/webapp/WEB-INF/jsp/travelDocument2.jsp'
          Skipped missing target: 'kns/src/test/webapp/WEB-INF/jsp'
          C kns/src/test/webapp/WEB-INF/web.xml
          Skipped missing target: 'kns/src/test/webapp/WEB-INF/tags/kr/page.tag'
          Skipped missing target: 'kns/src/test/webapp/WEB-INF/tags/kr/lockMessages.tag'
          Skipped missing target: 'kns/src/test/webapp/WEB-INF/tags/kr/htmlControlAttribute.tag'
          Skipped missing target: 'kns/src/test/webapp/WEB-INF/tags/kr/rowDisplay.tag'
          Skipped missing target: 'kns/src/test/webapp/WEB-INF/tags/kr/documentControls.tag'
          Skipped missing target: 'kns/src/test/webapp/WEB-INF/tags/kr/tab.tag'
          Skipped missing target: 'kns/src/test/webapp/WEB-INF/tags/kr/expandedTextArea.tag'
          Skipped missing target: 'kns/src/test/webapp/WEB-INF/tags/kr/notes.tag'
          Skipped missing target: 'kns/src/test/webapp/WEB-INF/tags/kr/documentPage.tag'
          Skipped missing target: 'kns/src/test/webapp/WEB-INF/tags/kr'
          Skipped missing target: 'kns/src/test/webapp/WEB-INF/tags'
          Skipped missing target: 'kns/src/test/webapp/index.html'
          Skipped missing target: 'kns/src/test/webapp/kr/WEB-INF/struts-config.xml'
          Skipped missing target: 'kns/src/test/webapp/kr/WEB-INF/jsp/TextArea.jsp'
          Skipped missing target: 'kns/src/test/webapp/kr/WEB-INF/jsp/KualiExceptionIncident.jsp'
          Skipped missing target: 'kns/src/test/webapp/kr/WEB-INF/jsp'
          Skipped missing target: 'kns/src/test/webapp/kr/WEB-INF'
          Skipped missing target: 'kns/src/test/webapp/kr/scripts/core.js'
          Skipped missing target: 'kns/src/test/webapp/kr/scripts'
          Skipped missing target: 'kns/src/test/webapp/kr/static/images/pencil_add1.png'
          Skipped missing target: 'kns/src/test/webapp/kr/static/images/pencil_add.png'
          Skipped missing target: 'kns/src/test/webapp/kr/static/images'
          Skipped missing target: 'kns/src/test/webapp/kr/static'
          Skipped missing target: 'kns/src/test/webapp/kr/css/kuali.css'
          Skipped missing target: 'kns/src/test/webapp/kr/css'
          Skipped missing target: 'kns/src/test/webapp/kr'
          Skipped missing target: 'kns/src/main/java/org/kuali/RiceConstants.java'
          C kns/src/main/java/org/kuali/rice/KNSServiceLocator.java
          C kns/src/main/java/org/kuali/rice/testharness/KNSTestCase.java
          C kns/src/main/java/org/kuali/rice/TestBase.java
          Skipped missing target: 'kns/src/main/java/org/kuali/RicePropertyConstants.java'
          C kns/src/main/java/org/kuali/core/exceptions/ExceptionIncident.java
          C kns/src/main/java/org/kuali/core/exceptions/KualiExceptionIncident.java
          A kns/src/main/java/org/kuali/core/exceptions/PessimisticLockingException.java
          A kns/src/main/java/org/kuali/core/exceptions/KualiException.java
          C kns/src/main/java/org/kuali/core/datadictionary/control/ControlDefinitionBase.java
          A kns/src/main/java/org/kuali/core/datadictionary/control/FileControlDefinition.java
          C kns/src/main/java/org/kuali/core/datadictionary/control/ControlDefinition.java
          C kns/src/main/java/org/kuali/core/datadictionary/WorkflowProperty.java
          C kns/src/main/java/org/kuali/core/datadictionary/WorkflowPropertyGroup.java
          C kns/src/main/java/org/kuali/core/datadictionary/DocumentEntry.java
          C kns/src/main/java/org/kuali/core/datadictionary/WorkflowProperties.java
          C kns/src/main/java/org/kuali/core/datadictionary/exporter/DocumentEntryMapper.java
          A kns/src/main/java/org/kuali/core/bo/PersistableAttachmentBase.java
          A kns/src/main/java/org/kuali/core/bo/PersistableAttachment.java
          A kns/src/main/java/org/kuali/core/bo/AttributeReferenceElements.java
          A kns/src/main/java/org/kuali/core/bo/DocumentAttachment.java
          A kns/src/main/java/org/kuali/core/service/impl/PessimisticLockServiceImpl.java
          A kns/src/main/java/org/kuali/core/service/impl/DocumentSerializerServiceImpl.java
          C kns/src/main/java/org/kuali/core/service/impl/PersistenceServiceImpl.java
          U kns/src/main/java/org/kuali/core/service/impl/PostProcessorServiceImpl.java
          C kns/src/main/java/org/kuali/core/service/impl/PersistenceServiceStructureImplBase.java
          C kns/src/main/java/org/kuali/core/service/impl/KualiExceptionIncidentServiceImpl.java
          A kns/src/main/java/org/kuali/core/service/PessimisticLockService.java
          A kns/src/main/java/org/kuali/core/service/DocumentSerializerService.java
          A kns/src/main/java/org/kuali/core/service/KualiExceptionIncidentService.java
          C kns/src/main/java/org/kuali/core/dao/ojb/BusinessObjectDaoOjb.java
          A kns/src/main/java/org/kuali/core/lookup/PessimisticLockLookupableHelperServiceImpl.java
          C kns/src/main/java/org/kuali/core/workflow/service/KualiWorkflowDocument.java
          C kns/src/main/java/org/kuali/core/workflow/service/impl/KualiWorkflowDocumentImpl.java
          U kns/src/main/java/org/kuali/core/util/FieldUtils.java
          C kns/src/main/java/org/kuali/core/util/KualiDecimal.java
          U kns/src/main/java/org/kuali/core/util/ObjectUtils.java
          Skipped 'kns/src/main/java/org/kuali/core/util/documentserializer'
          A kns/src/main/java/org/kuali/core/util/documentserializer/AlwaysTruePropertySerializibilityEvaluator.java
          C kns/src/main/java/org/kuali/core/util/documentserializer/PropertySerializerTrie.java
          A kns/src/main/java/org/kuali/core/util/documentserializer/BusinessObjectPropertySerializibilityEvaluator.java
          A kns/src/main/java/org/kuali/core/util/documentserializer/PropertySerializabilityEvaluatorBase.java
          A kns/src/main/java/org/kuali/core/util/documentserializer/PropertySerializabilityMetadata.java
          A kns/src/main/java/org/kuali/core/util/documentserializer/PropertyType.java
          A kns/src/main/java/org/kuali/core/util/documentserializer/PropertySerializabilityEvaluator.java
          A kns/src/main/java/org/kuali/core/util/documentserializer/PropertySerializerTrieNode.java
          A kns/src/main/java/org/kuali/core/util/documentserializer/DocumentSerializationState.java
          U kns/src/main/java/org/kuali/core/util/TypeUtils.java
          A kns/src/main/java/org/kuali/core/util/AbstractKualiDecimal.java
          C kns/src/main/java/org/kuali/core/web/struts/form/KualiDocumentFormBase.java
          U kns/src/main/java/org/kuali/core/web/struts/form/InquiryForm.java
          A kns/src/main/java/org/kuali/core/web/struts/form/KualiExceptionIncidentForm.java
          U kns/src/main/java/org/kuali/core/web/struts/form/KualiForm.java
          C kns/src/main/java/org/kuali/core/web/struts/form/KualiMaintenanceForm.java
          C kns/src/main/java/org/kuali/core/web/struts/pojo/StrutsExceptionIncidentHandler.java
          C kns/src/main/java/org/kuali/core/web/struts/action/KualiAction.java
          U kns/src/main/java/org/kuali/core/web/struts/action/KualiMaintenanceDocumentAction.java
          C kns/src/main/java/org/kuali/core/web/struts/action/KualiRequestProcessor.java
          C kns/src/main/java/org/kuali/core/web/struts/action/KualiExceptionHandlerAction.java
          C kns/src/main/java/org/kuali/core/web/struts/action/KualiDocumentActionBase.java
          U kns/src/main/java/org/kuali/core/web/filter/KualiCasFilter.java
          A kns/src/main/java/org/kuali/core/web/listener/KualiHttpSessionListener.java
          U kns/src/main/java/org/kuali/core/web/format/Formatter.java
          U kns/src/main/java/org/kuali/core/web/ui/ExtraButton.java
          C kns/src/main/java/org/kuali/core/web/ui/FieldBridge.java
          U kns/src/main/java/org/kuali/core/web/ui/Field.java
          A kns/src/main/java/org/kuali/core/web/ui/HeaderField.java
          A kns/src/main/java/org/kuali/core/document/authorization/PessimisticLock.java
          U kns/src/main/java/org/kuali/core/document/authorization/DocumentAuthorizerBase.java
          U kns/src/main/java/org/kuali/core/document/authorization/DocumentAuthorizer.java
          C kns/src/main/java/org/kuali/core/document/DocumentBase.java
          C kns/src/main/java/org/kuali/core/document/MaintenanceDocumentBase.java
          C kns/src/main/java/org/kuali/core/document/Document.java
          U kns/src/main/java/org/kuali/workflow/postprocessor/KualiPostProcessor.java
          U kns/src/main/config/sql/rice_db_bootstrap.sql
          C kns/src/main/config/sql/rice_sampleapp_create.sql
          U kns/src/main/config/sql/KNSBootstrap.sql
          C kns/src/main/config/sql/rice_sampleapp_destroy.sql
          U kns/src/main/config/sql/rice_db_destroy.sql
          A kns/src/main/config/ddl/indexes/KNS_PESSIMISTIC_LOCK_T.index.ddl
          A kns/src/main/config/ddl/tables/KNS_PESSIMISTIC_LOCK_T.table.ddl
          A kns/src/main/config/ddl/sequences/LOCK_ID_SEQ.sequence.ddl
          C kns/src/main/config/userhome/kuali/main/dev/sample-app-config.xml.template
          C kns/src/main/resources/OJB-repository-kns.xml
          C kns/src/main/resources/KNSSpringBeans.xml
          Skipped missing target: 'kns/src/main/resources/org/kuali/core/datadictionary/digesterRules.xml'
          Skipped missing target: 'kns/src/main/resources/org/kuali/core/datadictionary/validationPatternRules.xml'
          Skipped missing target: 'kns/src/main/resources/org/kuali/core/datadictionary/dataDictionary-1_0.dtd'
          Skipped missing target: 'kns/src/main/resources/org/kuali/core/datadictionary/controlRules.xml'
          A kns/src/main/resources/org/kuali/core/bo/datadictionary/PessimisticLock.xml
          C kns/src/main/resources/org/kuali/core/bo/datadictionary/AttributeReferenceElements.xml
          C kns/src/main/resources/org/kuali/core/document/datadictionary/ParameterMaintenanceDocument.xml
          C kns/src/main/resources/org/kuali/core/document/datadictionary/EmployeeTypeMaintenanceDocument.xml
          C kns/src/main/resources/org/kuali/core/document/datadictionary/ParameterTypeMaintenanceDocument.xml
          C kns/src/main/resources/org/kuali/core/document/datadictionary/EmployeeStatusMaintenanceDocument.xml
          C kns/src/main/resources/org/kuali/core/document/datadictionary/ParameterDetailTypeMaintenanceDocument.xml
          C kns/src/main/resources/org/kuali/core/document/datadictionary/UniversalUserMaintenanceDocument.xml
          C kns/src/main/resources/org/kuali/core/document/datadictionary/ParameterNamespaceMaintenanceDocument.xml
          U kns/pom.xml
          U kom-api/pom.xml
          C build.xml
          U kcb/pom.xml
          C testharness/src/main/java/org/kuali/rice/test/lifecycles/JettyServerLifecycle.java
          C testharness/src/main/java/org/kuali/rice/test/RiceTestCase.java
          C testharness/pom.xml
          U kcb-api/pom.xml
          U shared/pom.xml
          U ken/src/main/java/org/kuali/notification/postprocessor/kew/NotificationSenderFormPostProcessor.java
          U ken/src/main/java/org/kuali/notification/postprocessor/kew/NotificationPostProcessor.java
          C ken/pom.xml

          Show
          ewestfal Eric Westfall added a comment - Merge output below...yikes: 129-79-44-31:rice-0.9.3 ewestfal$ svn merge -r 3234:HEAD https://test.kuali.org/svn/rice/branches/rice-release-0-9-3-kra-br U ksb/pom.xml U kim/pom.xml U kew/src/test/java/mocks/MockPostProcessor.java U kew/src/test/java/edu/iu/uis/eden/routemanager/ExceptionRoutingTestPostProcessor.java U kew/src/test/java/edu/iu/uis/eden/docsearch/xml/StandardGenericXMLSearchableAttributePostProcessor.java U kew/src/test/java/edu/iu/uis/eden/actions/FutureRequestsTest.java U kew/src/test/java/edu/iu/uis/eden/actions/SuperUserActionInvalidPostProcessor.java U kew/src/test/java/edu/iu/uis/eden/engine/PostProcessorSpawnDocument.java C kew/src/main/java/edu/iu/uis/eden/routetemplate/RuleTemplate.java U kew/src/main/java/edu/iu/uis/eden/IDocumentEvent.java U kew/src/main/java/edu/iu/uis/eden/actionlist/dao/ActionListDAOOjbImpl.java U kew/src/main/java/edu/iu/uis/eden/actionlist/dao/ActionListDAO.java U kew/src/main/java/edu/iu/uis/eden/actionlist/ActionListServiceImpl.java U kew/src/main/java/edu/iu/uis/eden/postprocessor/PostProcessorRemoteAdapter.java U kew/src/main/java/edu/iu/uis/eden/postprocessor/PostProcessor.java U kew/src/main/java/edu/iu/uis/eden/postprocessor/DefaultPostProcessor.java C kew/src/main/java/edu/iu/uis/eden/docsearch/StandardDocumentSearchResultProcessor.java U kew/src/main/java/edu/iu/uis/eden/engine/StandardWorkflowEngine.java U kew/src/main/java/edu/iu/uis/eden/util/Utilities.java A kew/src/main/java/edu/iu/uis/eden/AfterProcessEvent.java U kew/src/main/java/edu/iu/uis/eden/server/BeanConverter.java U kew/src/main/java/edu/iu/uis/eden/clientapp/PostProcessorRemote.java A kew/src/main/java/edu/iu/uis/eden/clientapp/vo/AfterProcessEventVO.java U kew/src/main/java/edu/iu/uis/eden/clientapp/vo/DocumentEventVO.java A kew/src/main/java/edu/iu/uis/eden/clientapp/vo/BeforeProcessEventVO.java C kew/src/main/java/edu/iu/uis/eden/mail/StyleableEmailContentServiceImpl.java A kew/src/main/java/edu/iu/uis/eden/BeforeProcessEvent.java U kew/src/main/java/edu/iu/uis/eden/SpringLoader.java U kew/pom.xml U kom/pom.xml C kim-api/pom.xml A scripts/CheckTestResults.groovy U scripts/launch/rice - JettyServer.launch A scripts/upgrades/0.9.1 to 0.9.2/rebuild-system-params-0.9.2.sql C scripts/upgrades/0.9.2 to 0.9.3/kns-upgrade-0.9.2-to-0.9.3.sql C scripts/createproject.groovy U core/pom.xml Skipped missing target: 'standalone/pom.xml' Skipped missing target: 'standalone' U pom.xml Skipped missing target: 'kns/src/test/java/org/kuali/rice/TestBase.java' Skipped missing target: 'kns/src/test/java/org/kuali/core/datadictionary/exporter/TransactionalDocumentEntryMapperTest.java' A kns/src/test/java/org/kuali/core/service/BusinessObjectServiceTest.java A kns/src/test/java/org/kuali/core/service/PessimisticLockServiceTest.java C kns/src/test/java/org/kuali/core/impls/MockWorkflowDocument.java Skipped 'kns/src/test/java/org/kuali/core/util' C kns/src/test/java/org/kuali/core/util/KualiDecimalTest.java A kns/src/test/java/org/kuali/core/util/ObjectUtilsTest.java A kns/src/test/java/org/kuali/core/document/PessimisticLockTestDocumentAuthorizer.java C kns/src/test/java/org/kuali/core/document/DocumentAuthorizerBaseTest.java A kns/src/test/java/org/kuali/core/document/TestDocumentAuthorizerBase.java Skipped missing target: 'kns/src/test/resources/SpringBeans.xml' Skipped missing target: 'kns/src/test/resources/DefaultTestData.sql' Skipped missing target: 'kns/src/test/resources/edu/sampleu/travel/datadictionary/TravelRequestDocument.xml' Skipped missing target: 'kns/src/test/resources/edu/sampleu/travel/datadictionary' Skipped missing target: 'kns/src/test/resources/edu/sampleu/travel' Skipped missing target: 'kns/src/test/resources/edu/sampleu' Skipped missing target: 'kns/src/test/resources/edu' Skipped missing target: 'kns/src/test/resources/DefaultTestData.xml' Skipped missing target: 'kns/src/test/webapp/WEB-INF/struts-config.xml' Skipped missing target: 'kns/src/test/webapp/WEB-INF/jsp/travelDocument2.jsp' Skipped missing target: 'kns/src/test/webapp/WEB-INF/jsp' C kns/src/test/webapp/WEB-INF/web.xml Skipped missing target: 'kns/src/test/webapp/WEB-INF/tags/kr/page.tag' Skipped missing target: 'kns/src/test/webapp/WEB-INF/tags/kr/lockMessages.tag' Skipped missing target: 'kns/src/test/webapp/WEB-INF/tags/kr/htmlControlAttribute.tag' Skipped missing target: 'kns/src/test/webapp/WEB-INF/tags/kr/rowDisplay.tag' Skipped missing target: 'kns/src/test/webapp/WEB-INF/tags/kr/documentControls.tag' Skipped missing target: 'kns/src/test/webapp/WEB-INF/tags/kr/tab.tag' Skipped missing target: 'kns/src/test/webapp/WEB-INF/tags/kr/expandedTextArea.tag' Skipped missing target: 'kns/src/test/webapp/WEB-INF/tags/kr/notes.tag' Skipped missing target: 'kns/src/test/webapp/WEB-INF/tags/kr/documentPage.tag' Skipped missing target: 'kns/src/test/webapp/WEB-INF/tags/kr' Skipped missing target: 'kns/src/test/webapp/WEB-INF/tags' Skipped missing target: 'kns/src/test/webapp/index.html' Skipped missing target: 'kns/src/test/webapp/kr/WEB-INF/struts-config.xml' Skipped missing target: 'kns/src/test/webapp/kr/WEB-INF/jsp/TextArea.jsp' Skipped missing target: 'kns/src/test/webapp/kr/WEB-INF/jsp/KualiExceptionIncident.jsp' Skipped missing target: 'kns/src/test/webapp/kr/WEB-INF/jsp' Skipped missing target: 'kns/src/test/webapp/kr/WEB-INF' Skipped missing target: 'kns/src/test/webapp/kr/scripts/core.js' Skipped missing target: 'kns/src/test/webapp/kr/scripts' Skipped missing target: 'kns/src/test/webapp/kr/static/images/pencil_add1.png' Skipped missing target: 'kns/src/test/webapp/kr/static/images/pencil_add.png' Skipped missing target: 'kns/src/test/webapp/kr/static/images' Skipped missing target: 'kns/src/test/webapp/kr/static' Skipped missing target: 'kns/src/test/webapp/kr/css/kuali.css' Skipped missing target: 'kns/src/test/webapp/kr/css' Skipped missing target: 'kns/src/test/webapp/kr' Skipped missing target: 'kns/src/main/java/org/kuali/RiceConstants.java' C kns/src/main/java/org/kuali/rice/KNSServiceLocator.java C kns/src/main/java/org/kuali/rice/testharness/KNSTestCase.java C kns/src/main/java/org/kuali/rice/TestBase.java Skipped missing target: 'kns/src/main/java/org/kuali/RicePropertyConstants.java' C kns/src/main/java/org/kuali/core/exceptions/ExceptionIncident.java C kns/src/main/java/org/kuali/core/exceptions/KualiExceptionIncident.java A kns/src/main/java/org/kuali/core/exceptions/PessimisticLockingException.java A kns/src/main/java/org/kuali/core/exceptions/KualiException.java C kns/src/main/java/org/kuali/core/datadictionary/control/ControlDefinitionBase.java A kns/src/main/java/org/kuali/core/datadictionary/control/FileControlDefinition.java C kns/src/main/java/org/kuali/core/datadictionary/control/ControlDefinition.java C kns/src/main/java/org/kuali/core/datadictionary/WorkflowProperty.java C kns/src/main/java/org/kuali/core/datadictionary/WorkflowPropertyGroup.java C kns/src/main/java/org/kuali/core/datadictionary/DocumentEntry.java C kns/src/main/java/org/kuali/core/datadictionary/WorkflowProperties.java C kns/src/main/java/org/kuali/core/datadictionary/exporter/DocumentEntryMapper.java A kns/src/main/java/org/kuali/core/bo/PersistableAttachmentBase.java A kns/src/main/java/org/kuali/core/bo/PersistableAttachment.java A kns/src/main/java/org/kuali/core/bo/AttributeReferenceElements.java A kns/src/main/java/org/kuali/core/bo/DocumentAttachment.java A kns/src/main/java/org/kuali/core/service/impl/PessimisticLockServiceImpl.java A kns/src/main/java/org/kuali/core/service/impl/DocumentSerializerServiceImpl.java C kns/src/main/java/org/kuali/core/service/impl/PersistenceServiceImpl.java U kns/src/main/java/org/kuali/core/service/impl/PostProcessorServiceImpl.java C kns/src/main/java/org/kuali/core/service/impl/PersistenceServiceStructureImplBase.java C kns/src/main/java/org/kuali/core/service/impl/KualiExceptionIncidentServiceImpl.java A kns/src/main/java/org/kuali/core/service/PessimisticLockService.java A kns/src/main/java/org/kuali/core/service/DocumentSerializerService.java A kns/src/main/java/org/kuali/core/service/KualiExceptionIncidentService.java C kns/src/main/java/org/kuali/core/dao/ojb/BusinessObjectDaoOjb.java A kns/src/main/java/org/kuali/core/lookup/PessimisticLockLookupableHelperServiceImpl.java C kns/src/main/java/org/kuali/core/workflow/service/KualiWorkflowDocument.java C kns/src/main/java/org/kuali/core/workflow/service/impl/KualiWorkflowDocumentImpl.java U kns/src/main/java/org/kuali/core/util/FieldUtils.java C kns/src/main/java/org/kuali/core/util/KualiDecimal.java U kns/src/main/java/org/kuali/core/util/ObjectUtils.java Skipped 'kns/src/main/java/org/kuali/core/util/documentserializer' A kns/src/main/java/org/kuali/core/util/documentserializer/AlwaysTruePropertySerializibilityEvaluator.java C kns/src/main/java/org/kuali/core/util/documentserializer/PropertySerializerTrie.java A kns/src/main/java/org/kuali/core/util/documentserializer/BusinessObjectPropertySerializibilityEvaluator.java A kns/src/main/java/org/kuali/core/util/documentserializer/PropertySerializabilityEvaluatorBase.java A kns/src/main/java/org/kuali/core/util/documentserializer/PropertySerializabilityMetadata.java A kns/src/main/java/org/kuali/core/util/documentserializer/PropertyType.java A kns/src/main/java/org/kuali/core/util/documentserializer/PropertySerializabilityEvaluator.java A kns/src/main/java/org/kuali/core/util/documentserializer/PropertySerializerTrieNode.java A kns/src/main/java/org/kuali/core/util/documentserializer/DocumentSerializationState.java U kns/src/main/java/org/kuali/core/util/TypeUtils.java A kns/src/main/java/org/kuali/core/util/AbstractKualiDecimal.java C kns/src/main/java/org/kuali/core/web/struts/form/KualiDocumentFormBase.java U kns/src/main/java/org/kuali/core/web/struts/form/InquiryForm.java A kns/src/main/java/org/kuali/core/web/struts/form/KualiExceptionIncidentForm.java U kns/src/main/java/org/kuali/core/web/struts/form/KualiForm.java C kns/src/main/java/org/kuali/core/web/struts/form/KualiMaintenanceForm.java C kns/src/main/java/org/kuali/core/web/struts/pojo/StrutsExceptionIncidentHandler.java C kns/src/main/java/org/kuali/core/web/struts/action/KualiAction.java U kns/src/main/java/org/kuali/core/web/struts/action/KualiMaintenanceDocumentAction.java C kns/src/main/java/org/kuali/core/web/struts/action/KualiRequestProcessor.java C kns/src/main/java/org/kuali/core/web/struts/action/KualiExceptionHandlerAction.java C kns/src/main/java/org/kuali/core/web/struts/action/KualiDocumentActionBase.java U kns/src/main/java/org/kuali/core/web/filter/KualiCasFilter.java A kns/src/main/java/org/kuali/core/web/listener/KualiHttpSessionListener.java U kns/src/main/java/org/kuali/core/web/format/Formatter.java U kns/src/main/java/org/kuali/core/web/ui/ExtraButton.java C kns/src/main/java/org/kuali/core/web/ui/FieldBridge.java U kns/src/main/java/org/kuali/core/web/ui/Field.java A kns/src/main/java/org/kuali/core/web/ui/HeaderField.java A kns/src/main/java/org/kuali/core/document/authorization/PessimisticLock.java U kns/src/main/java/org/kuali/core/document/authorization/DocumentAuthorizerBase.java U kns/src/main/java/org/kuali/core/document/authorization/DocumentAuthorizer.java C kns/src/main/java/org/kuali/core/document/DocumentBase.java C kns/src/main/java/org/kuali/core/document/MaintenanceDocumentBase.java C kns/src/main/java/org/kuali/core/document/Document.java U kns/src/main/java/org/kuali/workflow/postprocessor/KualiPostProcessor.java U kns/src/main/config/sql/rice_db_bootstrap.sql C kns/src/main/config/sql/rice_sampleapp_create.sql U kns/src/main/config/sql/KNSBootstrap.sql C kns/src/main/config/sql/rice_sampleapp_destroy.sql U kns/src/main/config/sql/rice_db_destroy.sql A kns/src/main/config/ddl/indexes/KNS_PESSIMISTIC_LOCK_T.index.ddl A kns/src/main/config/ddl/tables/KNS_PESSIMISTIC_LOCK_T.table.ddl A kns/src/main/config/ddl/sequences/LOCK_ID_SEQ.sequence.ddl C kns/src/main/config/userhome/kuali/main/dev/sample-app-config.xml.template C kns/src/main/resources/OJB-repository-kns.xml C kns/src/main/resources/KNSSpringBeans.xml Skipped missing target: 'kns/src/main/resources/org/kuali/core/datadictionary/digesterRules.xml' Skipped missing target: 'kns/src/main/resources/org/kuali/core/datadictionary/validationPatternRules.xml' Skipped missing target: 'kns/src/main/resources/org/kuali/core/datadictionary/dataDictionary-1_0.dtd' Skipped missing target: 'kns/src/main/resources/org/kuali/core/datadictionary/controlRules.xml' A kns/src/main/resources/org/kuali/core/bo/datadictionary/PessimisticLock.xml C kns/src/main/resources/org/kuali/core/bo/datadictionary/AttributeReferenceElements.xml C kns/src/main/resources/org/kuali/core/document/datadictionary/ParameterMaintenanceDocument.xml C kns/src/main/resources/org/kuali/core/document/datadictionary/EmployeeTypeMaintenanceDocument.xml C kns/src/main/resources/org/kuali/core/document/datadictionary/ParameterTypeMaintenanceDocument.xml C kns/src/main/resources/org/kuali/core/document/datadictionary/EmployeeStatusMaintenanceDocument.xml C kns/src/main/resources/org/kuali/core/document/datadictionary/ParameterDetailTypeMaintenanceDocument.xml C kns/src/main/resources/org/kuali/core/document/datadictionary/UniversalUserMaintenanceDocument.xml C kns/src/main/resources/org/kuali/core/document/datadictionary/ParameterNamespaceMaintenanceDocument.xml U kns/pom.xml U kom-api/pom.xml C build.xml U kcb/pom.xml C testharness/src/main/java/org/kuali/rice/test/lifecycles/JettyServerLifecycle.java C testharness/src/main/java/org/kuali/rice/test/RiceTestCase.java C testharness/pom.xml U kcb-api/pom.xml U shared/pom.xml U ken/src/main/java/org/kuali/notification/postprocessor/kew/NotificationSenderFormPostProcessor.java U ken/src/main/java/org/kuali/notification/postprocessor/kew/NotificationPostProcessor.java C ken/pom.xml
          Hide
          ewestfal Eric Westfall added a comment -

          Merge completed at revision 4001.

          Show
          ewestfal Eric Westfall added a comment - Merge completed at revision 4001.
          Hide
          ewestfal Eric Westfall added a comment -

          Actually, revision where the merge was committed was 4002.

          Show
          ewestfal Eric Westfall added a comment - Actually, revision where the merge was committed was 4002.

            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: