You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-dev@portals.apache.org by "Craig Doremus (JIRA)" <ji...@apache.org> on 2007/08/15 15:37:31 UTC

[jira] Resolved: (PLUTO-413) Merge pluto-descriptor-impl code from trunk to 1.1-286-trunk-merge branch

     [ https://issues.apache.org/jira/browse/PLUTO-413?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Craig Doremus resolved PLUTO-413.
---------------------------------

       Resolution: Fixed
    Fix Version/s: 1.1-286-trunk-merge
         Assignee: Craig Doremus

Merged pluto-descriptor-impl from the trunk in SVN rev 566125. Here are the details of non-trivial changes:
pom.xml - only moved over maven-remote-resources-plugin plugin reference from trunk.

services/castor package (src/main/resources dir):
castor-portlet-xml-mapping.xml - changes in trunk were cherry picked to prevent overwriting of new JSR-286 properties
castor-web-xml-mapping.xml - all of trunk version copied over.

services/castor package (src/main/java dir)
DistributableCastorFieldHandler.java - svn copied from trunk
DistributableDDCastorFieldHandler.java - svn copied from trunk
ServletVersionCastorFieldHandler.java - svn copied from trunk
WebAppDescriptorServiceImpl - all changes copied over from trunk. Changed reference to servlet version from 2.3 to 2.4 in setCastorMarshallerOptions() method.


> Merge pluto-descriptor-impl code from trunk to 1.1-286-trunk-merge branch
> -------------------------------------------------------------------------
>
>                 Key: PLUTO-413
>                 URL: https://issues.apache.org/jira/browse/PLUTO-413
>             Project: Pluto
>          Issue Type: Sub-task
>            Reporter: Craig Doremus
>            Assignee: Craig Doremus
>             Fix For: 1.1-286-trunk-merge
>
>


-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.