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/11 20:45:43 UTC
[jira] Created: (PLUTO-402) Merge SVN trunk with
1.1-286-COMPATIBILITY branch using 1.1-286-trunk-merge branch
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.
[jira] Commented: (PLUTO-402) Merge SVN trunk with
1.1-286-COMPATIBILITY branch using 1.1-286-trunk-merge branch
Posted by "Craig Doremus (JIRA)" <ji...@apache.org>.
[ https://issues.apache.org/jira/browse/PLUTO-402?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#action_12524273 ]
Craig Doremus commented on PLUTO-402:
-------------------------------------
Applied ResponseImpl_for_requestDispatcher_310807.patch from PLUTO-423 in SVN rev 571764.
> 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.
[jira] Commented: (PLUTO-402) Merge SVN trunk with
1.1-286-COMPATIBILITY branch using 1.1-286-trunk-merge branch
Posted by "Craig Doremus (JIRA)" <ji...@apache.org>.
[ https://issues.apache.org/jira/browse/PLUTO-402?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#action_12522981 ]
Craig Doremus commented on PLUTO-402:
-------------------------------------
Applied PortletRequestDispatcher_082707.patch from PLUTO-423 in SVN revisions 570071 and 570072 to 1.1-286-trunk-merge branch. Thank you Torsten.
> 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.
[jira] Closed: (PLUTO-402) Merge SVN trunk with
1.1-286-COMPATIBILITY branch using 1.1-286-trunk-merge branch
Posted by "Craig Doremus (JIRA)" <ji...@apache.org>.
[ https://issues.apache.org/jira/browse/PLUTO-402?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Craig Doremus closed PLUTO-402.
-------------------------------
Resolution: Fixed
This is no longer relevant since all JSR-286 code has now been merged from the 1.1-286-COMPATIBILITY branch into the Pluto trunk.
> 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: 2.0.0
> Reporter: Craig Doremus
> Fix For: 2.0.0
>
>
> 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.
[jira] Commented: (PLUTO-402) Merge SVN trunk with
1.1-286-COMPATIBILITY branch using 1.1-286-trunk-merge branch
Posted by "Craig Doremus (JIRA)" <ji...@apache.org>.
[ https://issues.apache.org/jira/browse/PLUTO-402?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#action_12521394 ]
Craig Doremus commented on PLUTO-402:
-------------------------------------
Applied container_runtime_options.plus_properties.200707.patch from PLUTO-418 in SVN revs 568066 and 568069.
> 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.
[jira] Commented: (PLUTO-402) Merge SVN trunk with
1.1-286-COMPATIBILITY branch using 1.1-286-trunk-merge branch
Posted by "Craig Doremus (JIRA)" <ji...@apache.org>.
[ https://issues.apache.org/jira/browse/PLUTO-402?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#action_12520213 ]
Craig Doremus commented on PLUTO-402:
-------------------------------------
Applied resource_serving161007.patch from PLUTO-263 in SVN rev 566664
> 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.
[jira] Commented: (PLUTO-402) Merge SVN trunk with
1.1-286-COMPATIBILITY branch using 1.1-286-trunk-merge branch
Posted by "Craig Doremus (JIRA)" <ji...@apache.org>.
[ 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.
[jira] Updated: (PLUTO-402) Merge SVN trunk with
1.1-286-COMPATIBILITY branch using 1.1-286-trunk-merge branch
Posted by "Craig Doremus (JIRA)" <ji...@apache.org>.
[ https://issues.apache.org/jira/browse/PLUTO-402?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Craig Doremus updated PLUTO-402:
--------------------------------
Comment: was deleted
> 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.
[jira] Commented: (PLUTO-402) Merge SVN trunk with
1.1-286-COMPATIBILITY branch using 1.1-286-trunk-merge branch
Posted by "Craig Doremus (JIRA)" <ji...@apache.org>.
[ https://issues.apache.org/jira/browse/PLUTO-402?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#action_12520245 ]
Craig Doremus commented on PLUTO-402:
-------------------------------------
SVN rev 564990 applied portlet_api_change_rev21_to_rev22_081007.patch from PLUTO-401 to 1.1-286-trunk-merge branch. It involved upping the portlet api sources to draft rev 22 of the JSR-286 specification. This patch was done on 08/11/2007.
> 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.
[jira] Updated: (PLUTO-402) Merge SVN trunk with
1.1-286-COMPATIBILITY branch using 1.1-286-trunk-merge branch
Posted by "Craig Doremus (JIRA)" <ji...@apache.org>.
[ https://issues.apache.org/jira/browse/PLUTO-402?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Craig Doremus updated PLUTO-402:
--------------------------------
Comment: was deleted
> 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.
[jira] Commented: (PLUTO-402) Merge SVN trunk with
1.1-286-COMPATIBILITY branch using 1.1-286-trunk-merge branch
Posted by "Craig Doremus (JIRA)" <ji...@apache.org>.
[ https://issues.apache.org/jira/browse/PLUTO-402?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#action_12519350 ]
Craig Doremus commented on PLUTO-402:
-------------------------------------
Merged pluto-ant-tasks from the trunk in SVN revision 565062. Here are the details of this merge:
pom.xml - nothing copied from trunk as it is structurally the same as trunk (except for license comments)
PublishTask.java - removed as it is not in the trunk
ExamineArchiveTask.java - copied from trunk
AssembleTask.java - merged entire file from the trunk
> 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.
[jira] Commented: (PLUTO-402) Merge SVN trunk with
1.1-286-COMPATIBILITY branch using 1.1-286-trunk-merge branch
Posted by "Craig Doremus (JIRA)" <ji...@apache.org>.
[ https://issues.apache.org/jira/browse/PLUTO-402?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#action_12521393 ]
Craig Doremus commented on PLUTO-402:
-------------------------------------
Applied jaxb_public_render_add_qname_name_and_alias.190807.patch from PLUTO-271 in SVN revision 568061.
> 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.
[jira] Commented: (PLUTO-402) Merge SVN trunk with
1.1-286-COMPATIBILITY branch using 1.1-286-trunk-merge branch
Posted by "Craig Doremus (JIRA)" <ji...@apache.org>.
[ https://issues.apache.org/jira/browse/PLUTO-402?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#action_12519262 ]
Craig Doremus commented on PLUTO-402:
-------------------------------------
This branch is based on the 1.1-286-COMPATIBILITY branch. The following modules have been carried over from the trunk since they do not have a counterpart in the 1.1-286-COMPATIBILITY branch or have not been modified in that branch:
assembly
pluto-site
pluto-site-skin
This branch has been created and added to using SVN copy to preserve the original version history.
> 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.
[jira] Commented: (PLUTO-402) Merge SVN trunk with
1.1-286-COMPATIBILITY branch using 1.1-286-trunk-merge branch
Posted by "Craig Doremus (JIRA)" <ji...@apache.org>.
[ https://issues.apache.org/jira/browse/PLUTO-402?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#action_12524269 ]
Craig Doremus commented on PLUTO-402:
-------------------------------------
Applied Refactor_ResponseImpl_083107.patch from PLUTO-428 in SVN rev 571763.
> 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.
[jira] Updated: (PLUTO-402) Merge SVN trunk with
1.1-286-COMPATIBILITY branch using 1.1-286-trunk-merge branch
Posted by "Craig Doremus (JIRA)" <ji...@apache.org>.
[ https://issues.apache.org/jira/browse/PLUTO-402?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Craig Doremus updated PLUTO-402:
--------------------------------
Comment: was deleted
> 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.
[jira] Commented: (PLUTO-402) Merge SVN trunk with
1.1-286-COMPATIBILITY branch using 1.1-286-trunk-merge branch
Posted by "Craig Doremus (JIRA)" <ji...@apache.org>.
[ https://issues.apache.org/jira/browse/PLUTO-402?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#action_12519274 ]
Craig Doremus commented on PLUTO-402:
-------------------------------------
Merged pluto-util module with the same trunk.module including doing an svn copy of the following from trunk:
src/main/java/org/apache/pluto/util/assemble/AbstractArchiveAssembler.java
src/main/java/org/apache/pluto/util/file/WebXmlRewritingAssembler.java
src/main/java/org/apache/pluto/util/assemble/io directory and associated files
src/main/java/org/apache/pluto/util/assemble/war directory and associated subdirs and files
src/main/java/org/apache/pluto/util/assemble/ear directory and associated subdirs and files
src/main/java/org/apache/pluto/util/install/file/tomcat6 directory and associated subdirs and files
src/test directory and associated files
Removed code copied from the 1.1-286-COMPATIBILITY branch:
src/main/java/org/apache/pluto/util/deploy/file directory and associated subdirs and files
src/main/java/org/apache/pluto/util/publish/http directory and associated subdirs and files
from SVN revision 564921 and 564922
> 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.
[jira] Commented: (PLUTO-402) Merge SVN trunk with
1.1-286-COMPATIBILITY branch using 1.1-286-trunk-merge branch
Posted by "Craig Doremus (JIRA)" <ji...@apache.org>.
[ https://issues.apache.org/jira/browse/PLUTO-402?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#action_12519276 ]
Craig Doremus commented on PLUTO-402:
-------------------------------------
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 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.
[jira] Commented: (PLUTO-402) Merge SVN trunk with
1.1-286-COMPATIBILITY branch using 1.1-286-trunk-merge branch
Posted by "Craig Doremus (JIRA)" <ji...@apache.org>.
[ https://issues.apache.org/jira/browse/PLUTO-402?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#action_12520847 ]
Craig Doremus commented on PLUTO-402:
-------------------------------------
Applied portlet_api_change_rev22_to_rev23_081707.patch from PLUTO-415 in SVN rev 567273. Thank you Torsten.
> 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.
[jira] Issue Comment Edited: (PLUTO-402) Merge SVN trunk with
1.1-286-COMPATIBILITY branch using 1.1-286-trunk-merge branch
Posted by "Craig Doremus (JIRA)" <ji...@apache.org>.
[ https://issues.apache.org/jira/browse/PLUTO-402?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#action_12520213 ]
cdoremus edited comment on PLUTO-402 at 8/16/07 6:27 AM:
--------------------------------------------------------------
Applied resource_serving161007.patch from PLUTO-263 in SVN rev 566664 to 1.1-286-trunk-merge branch.
was (Author: cdoremus):
Applied resource_serving161007.patch from PLUTO-263 in SVN rev 566664
> 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.
[jira] Commented: (PLUTO-402) Merge SVN trunk with
1.1-286-COMPATIBILITY branch using 1.1-286-trunk-merge branch
Posted by "Craig Doremus (JIRA)" <ji...@apache.org>.
[ https://issues.apache.org/jira/browse/PLUTO-402?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#action_12552932 ]
Craig Doremus commented on PLUTO-402:
-------------------------------------
All original testsuite JSR-168 tests now work (errors reported here: https://issues.apache.org/jira/browse/PLUTO-404#action_12550041). The fix for the final broken test (MiscTest.checkContextServerInfo) was committed in SVN rev 605359.
> 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.
[jira] Updated: (PLUTO-402) Merge SVN trunk with
1.1-286-COMPATIBILITY branch using 1.1-286-trunk-merge branch
Posted by "Craig Doremus (JIRA)" <ji...@apache.org>.
[ https://issues.apache.org/jira/browse/PLUTO-402?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Craig Doremus updated PLUTO-402:
--------------------------------
Comment: was deleted
> 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.
[jira] Commented: (PLUTO-402) Merge SVN trunk with
1.1-286-COMPATIBILITY branch using 1.1-286-trunk-merge branch
Posted by "Craig Doremus (JIRA)" <ji...@apache.org>.
[ https://issues.apache.org/jira/browse/PLUTO-402?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#action_12538217 ]
Craig Doremus commented on PLUTO-402:
-------------------------------------
Updated root pom.xml by applied part of updateToRev26_container_fixes102307.patch in PLUTO-404 in SVN Rev 589139.
> 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.
[jira] Commented: (PLUTO-402) Merge SVN trunk with
1.1-286-COMPATIBILITY branch using 1.1-286-trunk-merge branch
Posted by "Craig Doremus (JIRA)" <ji...@apache.org>.
[ https://issues.apache.org/jira/browse/PLUTO-402?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#action_12520860 ]
Craig Doremus commented on PLUTO-402:
-------------------------------------
Applied portlet-app_xsd_rev22_rev23.patch to 1.1-286-trunk-merge branch from PLUTO-415 in SVN rev 567288.
> 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.