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

Craig Doremus resolved PLUTO-411.
---------------------------------

    Resolution: Fixed

Merged pluto-descriptor-api from trunk SVN. Changes were made in SVN versions 
564943, 564944 and 564945.

Unless noted, no changes were copied from trunk except missing or changed 
license headers

pom.xml - only moved over maven-remote-resources-plugin plugin reference from 
trunk. Removed reference to maven 1 plugin carried over from 
1.1.0-286-COMPATIBILITY branch

common package
DescriptionDD -- svn copied from trunk
DisplayNameDD -- svn copied from trunk
UserDataConstraintDD -- svn copied from trunk

portlet package
CustomWindowStateDD - trunk has List of descriptions while 1.1-286 branch has 
only description String (NO CHANGES COPIED OVER)
UserDataConstraintDD.java - removed due to addition of same class in common 
package from trunk
UserAttributeDD - trunk has List of descriptions while 1.1-286 branch has only 
description String (NO CHANGES COPIED OVER)

servlet package
DistributableDD.java - svn copied from trunk
UserDataConstraintDD.java - removed due to addition of same class in common 
package from trunk
WebAppDD.java - moved over trunk version and changed value of servletVersion 
field to 2.4


> Merge pluto-descriptor-api code from trunk to 1.1-286-trunk-merge branch
> ------------------------------------------------------------------------
>
>                 Key: PLUTO-411
>                 URL: https://issues.apache.org/jira/browse/PLUTO-411
>             Project: Pluto
>          Issue Type: Sub-task
>          Components: descriptor
>    Affects Versions: 1.1-286-trunk-merge
>            Reporter: Craig Doremus
>            Assignee: Craig Doremus
>             Fix For: 1.1-286-trunk-merge
>
>
> Merge pluto-util code from trunk to 1.1-286-trunk-merge branch taking care 
> not to remove any JSR-286-related code.

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

Reply via email to