[
https://issues.apache.org/jira/browse/PLUTO-402?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#action_12519949
]
Craig Doremus commented on PLUTO-402:
-------------------------------------
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 SVN trunk with 1.1-286-COMPATIBILITY branch using 1.1-286-trunk-merge
> branch
> -----------------------------------------------------------------------------------
>
> Key: PLUTO-402
> URL: https://issues.apache.org/jira/browse/PLUTO-402
> Project: Pluto
> Issue Type: Task
> Components: build system, deployer, descriptor, documentation,
> general, maven pluto plugin, portal driver, portlet container, portlet
> container taglibs, portlets-admin, portlets-testsuite
> Affects Versions: 1.1-286-trunk-merge
> Reporter: Craig Doremus
> Fix For: 1.1-286-trunk-merge
>
>
> This is a parent task to merge changes in the trunk with those in the
> 1.1-286-COMPATIBILITY branch that was separated about 8 months and five 1.1.x
> releases ago. Hopefully, this effort starts the movement of Pluto toward a
> general availability release of the JSR-286 Reference Implementation that
> began in the 1.1-286-COMPATIBILITY branch.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
