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

Merge rice-release-1-1-0-ria-pdf-work-br/ branch into 1.0.3 branch

    Details

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

      Description

      Need to merge pdf routing changes from rice-release-1-1-0-ria-pdf-work-br/ into rice-1-0-3

        Attachments

          Issue Links

            Activity

            Hide
            jjhanso Jeremy Hanson added a comment - - edited

            See these notes on the subversion merge process:

            https://test.kuali.org/confluence/x/KYApAQ

            merge command is:
            svn merge -r 11179:HEAD https://test.kuali.org/svn/rice/branches/rice-release-1-1-0-ria-pdf-work-br

            Show
            jjhanso Jeremy Hanson added a comment - - edited See these notes on the subversion merge process: https://test.kuali.org/confluence/x/KYApAQ merge command is: svn merge -r 11179:HEAD https://test.kuali.org/svn/rice/branches/rice-release-1-1-0-ria-pdf-work-br
            Hide
            jjhanso Jeremy Hanson added a comment -

            output from merge:

            — Merging r11180 through r13340 into '.':
            C scripts\launch\rice - JettyServer.launch
            A scripts\upgrades\1.0.1 to 1.1.0
            A scripts\upgrades\1.0.1 to 1.1.0\db-updates
            A scripts\upgrades\1.0.1 to 1.1.0\db-updates\01-26-2010.sql
            A impl\src\main\java\org\kuali\rice\kew\ria
            A impl\src\main\java\org\kuali\rice\kew\ria\bo
            A impl\src\main\java\org\kuali\rice\kew\ria\bo\RIADocTypeMap.java
            A impl\src\main\java\org\kuali\rice\kew\ria\service
            A impl\src\main\java\org\kuali\rice\kew\ria\service\RIAServiceLocator.java
            A impl\src\main\java\org\kuali\rice\kew\ria\service\impl
            A impl\src\main\java\org\kuali\rice\kew\ria\service\impl\RIADocumentServiceImpl.java
            A impl\src\main\java\org\kuali\rice\kew\ria\service\RIADocumentService.java
            A impl\src\main\java\org\kuali\rice\kew\ria\valuefinder
            A impl\src\main\java\org\kuali\rice\kew\ria\valuefinder\YesNoValueFinder.java
            A impl\src\main\java\org\kuali\rice\kew\ria\valuefinder\RIADocTypeMapNextIdFinder.java
            A impl\src\main\java\org\kuali\rice\kew\ria\valuefinder\SequenceNextIdFinder.java
            A impl\src\main\java\org\kuali\rice\kew\ria\RIAConstants.java
            A impl\src\main\java\org\kuali\rice\kew\ria\authorizer
            A impl\src\main\java\org\kuali\rice\kew\ria\authorizer\RIADocumentAuthorizer.java
            A impl\src\main\java\org\kuali\rice\kew\ria\web
            A impl\src\main\java\org\kuali\rice\kew\ria\web\RIADocumentAction.java
            A impl\src\main\java\org\kuali\rice\kew\ria\web\RIADocumentForm.java
            A impl\src\main\java\org\kuali\rice\kew\ria\document
            A impl\src\main\java\org\kuali\rice\kew\ria\document\RIADocument.java
            U impl\src\main\java\org\kuali\rice\kns\datadictionary\DataDictionary.java
            A impl\src\main\java\org\kuali\rice\kns\datadictionary\RIADataDictionaryMapper.java
            A impl\src\main\java\org\kuali\rice\kns\datadictionary\DataDictionaryMapper.java
            A impl\src\main\java\org\kuali\rice\kns\datadictionary\DataDictionaryIndex.java
            A impl\src\main\java\org\kuali\rice\kns\datadictionary\DataDictionaryIndexMapper.java
            U impl\src\main\java\org\kuali\rice\kns\service\impl\DataDictionaryServiceImpl.java
            U impl\src\main\resources\org\kuali\rice\kew\config\KEWSpringBeans.xml
            U impl\src\main\resources\org\kuali\rice\kew\config\OJB-repository-kew.xml
            A impl\src\main\resources\org\kuali\rice\kew\ria
            A impl\src\main\resources\org\kuali\rice\kew\ria\bo
            A impl\src\main\resources\org\kuali\rice\kew\ria\bo\datadictionary
            A impl\src\main\resources\org\kuali\rice\kew\ria\bo\datadictionary\RIADocTypeMap.xml
            A impl\src\main\resources\org\kuali\rice\kew\ria\document
            A impl\src\main\resources\org\kuali\rice\kew\ria\document\datadictionary
            A impl\src\main\resources\org\kuali\rice\kew\ria\document\datadictionary\RIADocTypeMapMaintenanceDocument.xml
            A impl\src\main\resources\org\kuali\rice\kew\ria\document\datadictionary\RIADocument.xml
            U impl\src\main\resources\org\kuali\rice\kns\config\KNSSpringBeans.xml
            A config\ria
            A config\ria\ria-acrobat.js
            A config\ria\RIADocumentBootstrap.xml
            U web\src\main\webapp\kew\WEB-INF\struts-config.xml
            A web\src\main\webapp\kew\WEB-INF\jsp\ria
            A web\src\main\webapp\kew\WEB-INF\jsp\ria\riaDocument.jsp
            A web\src\main\webapp\kew\scripts\ria
            A web\src\main\webapp\kew\scripts\ria\plugins
            A web\src\main\webapp\kew\scripts\ria\plugins\pdf-plugin
            A web\src\main\webapp\kew\scripts\ria\plugins\pdf-plugin\pdf-plugin.js
            A web\src\main\webapp\kew\scripts\ria\plugins\pdf-plugin\pdfobject.js
            A web\src\main\webapp\kew\scripts\ria\plugins\pdf-plugin\jquery.browser.min.js
            A web\src\main\webapp\kew\scripts\ria\plugins\vimeo-plugin
            A web\src\main\webapp\kew\scripts\ria\plugins\vimeo-plugin\swfobject.js
            A web\src\main\webapp\kew\scripts\ria\plugins\vimeo-plugin\vimeo-plugin.js
            A web\src\main\webapp\kew\scripts\ria\plugins\vimeo-plugin\expressInstall.swf
            A web\src\main\webapp\kew\scripts\ria\work
            A web\src\main\webapp\kew\scripts\ria\work\ria.js
            A web\src\main\webapp\kew\scripts\ria\work\index.html
            A web\src\main\webapp\kew\scripts\ria\work\jquery-1.4.1.min.js
            A web\src\main\webapp\kew\scripts\ria\ria.js
            A web\src\main\webapp\kew\scripts\ria\jquery-1.4.1.min.js
            A web\src\main\webapp\kew\css\ria.css
            U web\src\main\webapp\WEB-INF\tags\rice-portal\channel\main\workflow.tag
            U web\src\main\webapp\WEB-INF\tags\kr\page.tag
            U web\src\main\webapp\WEB-INF\tags\kr\help.tag
            U web\src\main\webapp\WEB-INF\tags\kr\documentPage.tag
            Summary of conflicts:
            Tree conflicts: 1

            Show
            jjhanso Jeremy Hanson added a comment - output from merge: — Merging r11180 through r13340 into '.': C scripts\launch\rice - JettyServer.launch A scripts\upgrades\1.0.1 to 1.1.0 A scripts\upgrades\1.0.1 to 1.1.0\db-updates A scripts\upgrades\1.0.1 to 1.1.0\db-updates\01-26-2010.sql A impl\src\main\java\org\kuali\rice\kew\ria A impl\src\main\java\org\kuali\rice\kew\ria\bo A impl\src\main\java\org\kuali\rice\kew\ria\bo\RIADocTypeMap.java A impl\src\main\java\org\kuali\rice\kew\ria\service A impl\src\main\java\org\kuali\rice\kew\ria\service\RIAServiceLocator.java A impl\src\main\java\org\kuali\rice\kew\ria\service\impl A impl\src\main\java\org\kuali\rice\kew\ria\service\impl\RIADocumentServiceImpl.java A impl\src\main\java\org\kuali\rice\kew\ria\service\RIADocumentService.java A impl\src\main\java\org\kuali\rice\kew\ria\valuefinder A impl\src\main\java\org\kuali\rice\kew\ria\valuefinder\YesNoValueFinder.java A impl\src\main\java\org\kuali\rice\kew\ria\valuefinder\RIADocTypeMapNextIdFinder.java A impl\src\main\java\org\kuali\rice\kew\ria\valuefinder\SequenceNextIdFinder.java A impl\src\main\java\org\kuali\rice\kew\ria\RIAConstants.java A impl\src\main\java\org\kuali\rice\kew\ria\authorizer A impl\src\main\java\org\kuali\rice\kew\ria\authorizer\RIADocumentAuthorizer.java A impl\src\main\java\org\kuali\rice\kew\ria\web A impl\src\main\java\org\kuali\rice\kew\ria\web\RIADocumentAction.java A impl\src\main\java\org\kuali\rice\kew\ria\web\RIADocumentForm.java A impl\src\main\java\org\kuali\rice\kew\ria\document A impl\src\main\java\org\kuali\rice\kew\ria\document\RIADocument.java U impl\src\main\java\org\kuali\rice\kns\datadictionary\DataDictionary.java A impl\src\main\java\org\kuali\rice\kns\datadictionary\RIADataDictionaryMapper.java A impl\src\main\java\org\kuali\rice\kns\datadictionary\DataDictionaryMapper.java A impl\src\main\java\org\kuali\rice\kns\datadictionary\DataDictionaryIndex.java A impl\src\main\java\org\kuali\rice\kns\datadictionary\DataDictionaryIndexMapper.java U impl\src\main\java\org\kuali\rice\kns\service\impl\DataDictionaryServiceImpl.java U impl\src\main\resources\org\kuali\rice\kew\config\KEWSpringBeans.xml U impl\src\main\resources\org\kuali\rice\kew\config\OJB-repository-kew.xml A impl\src\main\resources\org\kuali\rice\kew\ria A impl\src\main\resources\org\kuali\rice\kew\ria\bo A impl\src\main\resources\org\kuali\rice\kew\ria\bo\datadictionary A impl\src\main\resources\org\kuali\rice\kew\ria\bo\datadictionary\RIADocTypeMap.xml A impl\src\main\resources\org\kuali\rice\kew\ria\document A impl\src\main\resources\org\kuali\rice\kew\ria\document\datadictionary A impl\src\main\resources\org\kuali\rice\kew\ria\document\datadictionary\RIADocTypeMapMaintenanceDocument.xml A impl\src\main\resources\org\kuali\rice\kew\ria\document\datadictionary\RIADocument.xml U impl\src\main\resources\org\kuali\rice\kns\config\KNSSpringBeans.xml A config\ria A config\ria\ria-acrobat.js A config\ria\RIADocumentBootstrap.xml U web\src\main\webapp\kew\WEB-INF\struts-config.xml A web\src\main\webapp\kew\WEB-INF\jsp\ria A web\src\main\webapp\kew\WEB-INF\jsp\ria\riaDocument.jsp A web\src\main\webapp\kew\scripts\ria A web\src\main\webapp\kew\scripts\ria\plugins A web\src\main\webapp\kew\scripts\ria\plugins\pdf-plugin A web\src\main\webapp\kew\scripts\ria\plugins\pdf-plugin\pdf-plugin.js A web\src\main\webapp\kew\scripts\ria\plugins\pdf-plugin\pdfobject.js A web\src\main\webapp\kew\scripts\ria\plugins\pdf-plugin\jquery.browser.min.js A web\src\main\webapp\kew\scripts\ria\plugins\vimeo-plugin A web\src\main\webapp\kew\scripts\ria\plugins\vimeo-plugin\swfobject.js A web\src\main\webapp\kew\scripts\ria\plugins\vimeo-plugin\vimeo-plugin.js A web\src\main\webapp\kew\scripts\ria\plugins\vimeo-plugin\expressInstall.swf A web\src\main\webapp\kew\scripts\ria\work A web\src\main\webapp\kew\scripts\ria\work\ria.js A web\src\main\webapp\kew\scripts\ria\work\index.html A web\src\main\webapp\kew\scripts\ria\work\jquery-1.4.1.min.js A web\src\main\webapp\kew\scripts\ria\ria.js A web\src\main\webapp\kew\scripts\ria\jquery-1.4.1.min.js A web\src\main\webapp\kew\css\ria.css U web\src\main\webapp\WEB-INF\tags\rice-portal\channel\main\workflow.tag U web\src\main\webapp\WEB-INF\tags\kr\page.tag U web\src\main\webapp\WEB-INF\tags\kr\help.tag U web\src\main\webapp\WEB-INF\tags\kr\documentPage.tag Summary of conflicts: Tree conflicts: 1
            Hide
            jjhanso Jeremy Hanson added a comment -

            Changes have been committed to Rice 1.0.3.

            There is an sql file (renamed to 2010-05-14.sql) that needs to be run against the master database once it is created. I will create a separate jira for that.

            Show
            jjhanso Jeremy Hanson added a comment - Changes have been committed to Rice 1.0.3. There is an sql file (renamed to 2010-05-14.sql) that needs to be run against the master database once it is created. I will create a separate jira for that.

              People

              • Assignee:
                jjhanso Jeremy Hanson
                Reporter:
                jjhanso Jeremy Hanson
              • Votes:
                0 Vote for this issue
                Watchers:
                0 Start watching this issue

                Dates

                • Created:
                  Updated:
                  Resolved: