Details

    • Type: Sub-task Sub-task
    • Status: Resolved
    • Priority: Major Major
    • Resolution: Fixed
    • Affects Version/s: 2.0.0
    • Fix Version/s: 2.0.0
    • Component/s: descriptor
    • Labels:
      None

      Description

      Merge pluto-util code from trunk to 1.1-286-trunk-merge branch taking care not to remove any JSR-286-related code.

        Activity

        Hide
        Craig Doremus added a comment -

        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

        Show
        Craig Doremus added a comment - 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

          People

          • Assignee:
            Craig Doremus
            Reporter:
            Craig Doremus
          • Votes:
            0 Vote for this issue
            Watchers:
            0 Start watching this issue

            Dates

            • Created:
              Updated:
              Resolved:

              Development