You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by es...@apache.org on 2008/03/29 22:12:00 UTC
svn commit: r642613 - in /portals/pluto/branches/pluto-1.1.x: ./
maven-pluto-plugin/ maven-pluto-plugin/src/site/
maven-pluto-plugin/src/site/apt/ pluto-ant-tasks/src/site/
pluto-ant-tasks/src/site/apt/ pluto-container/src/site/
pluto-container/src/sit...
Author: esm
Date: Sat Mar 29 14:11:54 2008
New Revision: 642613
URL: http://svn.apache.org/viewvc?rev=642613&view=rev
Log:
Merging pluto website updates in from trunk.
Added:
portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/src/site/apt/
- copied from r642585, portals/pluto/trunk/maven-pluto-plugin/src/site/apt/
portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/src/site/apt/index.apt
- copied unchanged from r642585, portals/pluto/trunk/maven-pluto-plugin/src/site/apt/index.apt
portals/pluto/branches/pluto-1.1.x/pluto-ant-tasks/src/site/apt/index.apt
- copied unchanged from r642585, portals/pluto/trunk/pluto-ant-tasks/src/site/apt/index.apt
portals/pluto/branches/pluto-1.1.x/pluto-container/src/site/xdoc/index.xml
- copied unchanged from r642585, portals/pluto/trunk/pluto-container/src/site/xdoc/index.xml
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/site/apt/
- copied from r642585, portals/pluto/trunk/pluto-descriptor-api/src/site/apt/
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/site/apt/index.apt
- copied unchanged from r642585, portals/pluto/trunk/pluto-descriptor-api/src/site/apt/index.apt
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/site/
- copied from r642585, portals/pluto/trunk/pluto-portal-driver-impl/src/site/
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/site/apt/
- copied from r642585, portals/pluto/trunk/pluto-portal-driver-impl/src/site/apt/
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/site/apt/index.apt
- copied unchanged from r642585, portals/pluto/trunk/pluto-portal-driver-impl/src/site/apt/index.apt
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/src/site/site.xml
- copied unchanged from r642585, portals/pluto/trunk/pluto-portal-driver-impl/src/site/site.xml
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/site/apt/
- copied from r642585, portals/pluto/trunk/pluto-portal-driver/src/site/apt/
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/site/apt/index.apt
- copied unchanged from r642585, portals/pluto/trunk/pluto-portal-driver/src/site/apt/index.apt
portals/pluto/branches/pluto-1.1.x/pluto-portal/src/site/apt/
- copied from r642598, portals/pluto/trunk/pluto-portal/src/site/apt/
portals/pluto/branches/pluto-1.1.x/pluto-portal/src/site/resources/2.0/
- copied from r642600, portals/pluto/trunk/pluto-portal/src/site/resources/2.0/
portals/pluto/branches/pluto-1.1.x/pluto-site-skin/src/main/resources/images/apache-portals.gif
- copied unchanged from r642585, portals/pluto/trunk/pluto-site-skin/src/main/resources/images/apache-portals.gif
portals/pluto/branches/pluto-1.1.x/pluto-site-skin/src/main/resources/images/architecture.png
- copied unchanged from r642585, portals/pluto/trunk/pluto-site-skin/src/main/resources/images/architecture.png
portals/pluto/branches/pluto-1.1.x/pluto-site-skin/src/main/resources/images/banner.png
- copied unchanged from r642585, portals/pluto/trunk/pluto-site-skin/src/main/resources/images/banner.png
portals/pluto/branches/pluto-1.1.x/pluto-site-skin/src/main/resources/images/download.gif
- copied unchanged from r642585, portals/pluto/trunk/pluto-site-skin/src/main/resources/images/download.gif
portals/pluto/branches/pluto-1.1.x/pluto-site-skin/src/site/
- copied from r642585, portals/pluto/trunk/pluto-site-skin/src/site/
portals/pluto/branches/pluto-1.1.x/pluto-site-skin/src/site/apt/
- copied from r642585, portals/pluto/trunk/pluto-site-skin/src/site/apt/
portals/pluto/branches/pluto-1.1.x/pluto-site-skin/src/site/apt/index.apt
- copied unchanged from r642585, portals/pluto/trunk/pluto-site-skin/src/site/apt/index.apt
portals/pluto/branches/pluto-1.1.x/pluto-site-skin/src/site/site.xml
- copied unchanged from r642585, portals/pluto/trunk/pluto-site-skin/src/site/site.xml
portals/pluto/branches/pluto-1.1.x/pluto-taglib/src/site/apt/
- copied from r642585, portals/pluto/trunk/pluto-taglib/src/site/apt/
portals/pluto/branches/pluto-1.1.x/pluto-taglib/src/site/apt/index.apt
- copied unchanged from r642585, portals/pluto/trunk/pluto-taglib/src/site/apt/index.apt
portals/pluto/branches/pluto-1.1.x/pluto-testsuite/src/site/apt/
- copied from r642585, portals/pluto/trunk/pluto-testsuite/src/site/apt/
portals/pluto/branches/pluto-1.1.x/pluto-testsuite/src/site/apt/index.apt
- copied unchanged from r642585, portals/pluto/trunk/pluto-testsuite/src/site/apt/index.apt
portals/pluto/branches/pluto-1.1.x/pluto-util/src/site/
- copied from r642585, portals/pluto/trunk/pluto-util/src/site/
portals/pluto/branches/pluto-1.1.x/pluto-util/src/site/apt/
- copied from r642585, portals/pluto/trunk/pluto-util/src/site/apt/
portals/pluto/branches/pluto-1.1.x/pluto-util/src/site/apt/index.apt
- copied unchanged from r642585, portals/pluto/trunk/pluto-util/src/site/apt/index.apt
portals/pluto/branches/pluto-1.1.x/pluto-util/src/site/site.xml
- copied unchanged from r642585, portals/pluto/trunk/pluto-util/src/site/site.xml
portals/pluto/branches/pluto-1.1.x/src/
- copied from r642585, portals/pluto/trunk/src/
portals/pluto/branches/pluto-1.1.x/src/site/
- copied from r642585, portals/pluto/trunk/src/site/
portals/pluto/branches/pluto-1.1.x/src/site/fml/
- copied from r642585, portals/pluto/trunk/src/site/fml/
portals/pluto/branches/pluto-1.1.x/src/site/fml/faq.fml
- copied unchanged from r642585, portals/pluto/trunk/src/site/fml/faq.fml
portals/pluto/branches/pluto-1.1.x/src/site/fml/helping.fml
- copied unchanged from r642585, portals/pluto/trunk/src/site/fml/helping.fml
portals/pluto/branches/pluto-1.1.x/src/site/resources/
- copied from r642585, portals/pluto/trunk/src/site/resources/
portals/pluto/branches/pluto-1.1.x/src/site/resources/css/
- copied from r642585, portals/pluto/trunk/src/site/resources/css/
portals/pluto/branches/pluto-1.1.x/src/site/resources/css/site.css
- copied unchanged from r642585, portals/pluto/trunk/src/site/resources/css/site.css
portals/pluto/branches/pluto-1.1.x/src/site/resources/xsd/
- copied from r642585, portals/pluto/trunk/src/site/resources/xsd/
portals/pluto/branches/pluto-1.1.x/src/site/resources/xsd/pluto-portal-driver-config.xsd
- copied unchanged from r642585, portals/pluto/trunk/src/site/resources/xsd/pluto-portal-driver-config.xsd
portals/pluto/branches/pluto-1.1.x/src/site/site.xml
- copied unchanged from r642585, portals/pluto/trunk/src/site/site.xml
portals/pluto/branches/pluto-1.1.x/src/site/xdoc/
- copied from r642585, portals/pluto/trunk/src/site/xdoc/
portals/pluto/branches/pluto-1.1.x/src/site/xdoc/download.xml
- copied unchanged from r642585, portals/pluto/trunk/src/site/xdoc/download.xml
portals/pluto/branches/pluto-1.1.x/src/site/xdoc/index.xml
- copied unchanged from r642585, portals/pluto/trunk/src/site/xdoc/index.xml
portals/pluto/branches/pluto-1.1.x/src/site/xdoc/mission.xml
- copied unchanged from r642585, portals/pluto/trunk/src/site/xdoc/mission.xml
portals/pluto/branches/pluto-1.1.x/src/site/xdoc/news.xml
- copied unchanged from r642585, portals/pluto/trunk/src/site/xdoc/news.xml
portals/pluto/branches/pluto-1.1.x/src/site/xdoc/powered.xml
- copied unchanged from r642585, portals/pluto/trunk/src/site/xdoc/powered.xml
portals/pluto/branches/pluto-1.1.x/src/site/xdoc/v101/
- copied from r642585, portals/pluto/trunk/src/site/xdoc/v101/
portals/pluto/branches/pluto-1.1.x/src/site/xdoc/v101/developer/
- copied from r642585, portals/pluto/trunk/src/site/xdoc/v101/developer/
portals/pluto/branches/pluto-1.1.x/src/site/xdoc/v101/developer/arch.xml
- copied unchanged from r642585, portals/pluto/trunk/src/site/xdoc/v101/developer/arch.xml
portals/pluto/branches/pluto-1.1.x/src/site/xdoc/v101/developer/build_source.xml
- copied unchanged from r642585, portals/pluto/trunk/src/site/xdoc/v101/developer/build_source.xml
portals/pluto/branches/pluto-1.1.x/src/site/xdoc/v101/developer/index.xml
- copied unchanged from r642585, portals/pluto/trunk/src/site/xdoc/v101/developer/index.xml
portals/pluto/branches/pluto-1.1.x/src/site/xdoc/v101/developer/integrate.xml
- copied unchanged from r642585, portals/pluto/trunk/src/site/xdoc/v101/developer/integrate.xml
portals/pluto/branches/pluto-1.1.x/src/site/xdoc/v101/developer/subversion.xml
- copied unchanged from r642585, portals/pluto/trunk/src/site/xdoc/v101/developer/subversion.xml
portals/pluto/branches/pluto-1.1.x/src/site/xdoc/v101/install.xml
- copied unchanged from r642585, portals/pluto/trunk/src/site/xdoc/v101/install.xml
portals/pluto/branches/pluto-1.1.x/src/site/xdoc/v101/resources.xml
- copied unchanged from r642585, portals/pluto/trunk/src/site/xdoc/v101/resources.xml
portals/pluto/branches/pluto-1.1.x/src/site/xdoc/v101/userguide/
- copied from r642585, portals/pluto/trunk/src/site/xdoc/v101/userguide/
portals/pluto/branches/pluto-1.1.x/src/site/xdoc/v101/userguide/index.xml
- copied unchanged from r642585, portals/pluto/trunk/src/site/xdoc/v101/userguide/index.xml
portals/pluto/branches/pluto-1.1.x/src/site/xdoc/v101/userguide/portal.xml
- copied unchanged from r642585, portals/pluto/trunk/src/site/xdoc/v101/userguide/portal.xml
portals/pluto/branches/pluto-1.1.x/src/site/xdoc/v101/userguide/testsuite.xml
- copied unchanged from r642585, portals/pluto/trunk/src/site/xdoc/v101/userguide/testsuite.xml
portals/pluto/branches/pluto-1.1.x/src/site/xdoc/v11/
- copied from r642585, portals/pluto/trunk/src/site/xdoc/v11/
portals/pluto/branches/pluto-1.1.x/src/site/xdoc/v11/app-servers.xml
- copied unchanged from r642585, portals/pluto/trunk/src/site/xdoc/v11/app-servers.xml
portals/pluto/branches/pluto-1.1.x/src/site/xdoc/v11/architecture.xml
- copied unchanged from r642585, portals/pluto/trunk/src/site/xdoc/v11/architecture.xml
portals/pluto/branches/pluto-1.1.x/src/site/xdoc/v11/deploying.xml
- copied unchanged from r642585, portals/pluto/trunk/src/site/xdoc/v11/deploying.xml
portals/pluto/branches/pluto-1.1.x/src/site/xdoc/v11/getting-started.xml
- copied unchanged from r642585, portals/pluto/trunk/src/site/xdoc/v11/getting-started.xml
portals/pluto/branches/pluto-1.1.x/src/site/xdoc/v11/release-notes.xml
- copied unchanged from r642585, portals/pluto/trunk/src/site/xdoc/v11/release-notes.xml
portals/pluto/branches/pluto-1.1.x/src/site/xdoc/v11/resources.xml
- copied unchanged from r642585, portals/pluto/trunk/src/site/xdoc/v11/resources.xml
portals/pluto/branches/pluto-1.1.x/src/site/xdoc/v11/subprojects.xml
- copied unchanged from r642585, portals/pluto/trunk/src/site/xdoc/v11/subprojects.xml
Removed:
portals/pluto/branches/pluto-1.1.x/pluto-ant-tasks/src/site/apt/getting-started.apt
portals/pluto/branches/pluto-1.1.x/pluto-container/src/site/xdoc/getting-started.xml
Modified:
portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/pom.xml
portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/src/site/site.xml
portals/pluto/branches/pluto-1.1.x/pluto-ant-tasks/src/site/site.xml
portals/pluto/branches/pluto-1.1.x/pluto-container/src/site/site.xml
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/pom.xml
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/site/site.xml
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/site/apt/index.apt
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/site/site.xml (contents, props changed)
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/pom.xml
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/pom.xml
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/site/site.xml (contents, props changed)
portals/pluto/branches/pluto-1.1.x/pluto-portal/pom.xml
portals/pluto/branches/pluto-1.1.x/pluto-portal/src/site/site.xml
portals/pluto/branches/pluto-1.1.x/pluto-taglib/pom.xml
portals/pluto/branches/pluto-1.1.x/pluto-taglib/src/site/site.xml
portals/pluto/branches/pluto-1.1.x/pluto-testsuite/pom.xml
portals/pluto/branches/pluto-1.1.x/pluto-testsuite/src/site/site.xml (contents, props changed)
portals/pluto/branches/pluto-1.1.x/pluto-util/pom.xml
portals/pluto/branches/pluto-1.1.x/pom.xml
Modified: portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/pom.xml?rev=642613&r1=642612&r2=642613&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/pom.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/pom.xml Sat Mar 29 14:11:54 2008
@@ -69,12 +69,6 @@
</resources>
<plugins>
<plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <resourcesDirectory>${basedir}/../pluto-site/src/site/resources</resourcesDirectory>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-plugin-plugin</artifactId>
<configuration>
<goalPrefix>pluto</goalPrefix>
Modified: portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/src/site/site.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/src/site/site.xml?rev=642613&r1=642612&r2=642613&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/src/site/site.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/src/site/site.xml Sat Mar 29 14:11:54 2008
@@ -15,30 +15,12 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="Maven">
- <bannerLeft>
- <name>Pluto Maven Plugin</name>
- <src>http://portals.apache.org/pluto/images/pluto.png</src>
- <href>http://portals.apache.org/pluto</href>
- </bannerLeft>
- <bannerRight>
- <src>http://portals.apache.org/pluto/images/banner.png</src>
- </bannerRight>
-
- <skin>
- <groupId>org.apache.pluto</groupId>
- <artifactId>pluto-site-skin</artifactId>
- <version>1.1.4-SNAPSHOT</version>
- </skin>
-
+<project name="Pluto Maven Plugin">
<body>
- <links>
- <item name="Pluto Home" href="http://portals.apache.org/pluto"/>
- <item name="JSR 168" href="http://jcp.org/en/jsr/detail?id=168"/>
- <item name="Chinese Translation" href="http://heavyz.sourceforge.net/pluto_zh/pluto-container"/>
- </links>
-
- ${reports}
-
+ <menu name="Pluto Maven Plugin">
+ <item name="About" href="/index.html"/>
+ </menu>
+ <menu ref="parent"/>
+ <menu ref="reports"/>
</body>
</project>
Modified: portals/pluto/branches/pluto-1.1.x/pluto-ant-tasks/src/site/site.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-ant-tasks/src/site/site.xml?rev=642613&r1=642612&r2=642613&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-ant-tasks/src/site/site.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-ant-tasks/src/site/site.xml Sat Mar 29 14:11:54 2008
@@ -15,33 +15,16 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="Maven">
- <bannerLeft>
- <name>Pluto Ant Plugin</name>
- <src>http://portals.apache.org/pluto/images/pluto.png</src>
- <href>http://portals.apache.org/pluto</href>
- </bannerLeft>
- <bannerRight>
- <src>http://portals.apache.org/pluto/images/banner.png</src>
- </bannerRight>
-
- <skin>
- <groupId>org.apache.pluto</groupId>
- <artifactId>pluto-site-skin</artifactId>
- <version>1.1.4-SNAPSHOT</version>
- </skin>
-
+<project name="Pluto Ant Tasks">
<body>
- <links>
- <item name="Pluto Home" href="http://portals.apache.org/pluto"/>
- <item name="JSR 168" href="http://jcp.org/en/jsr/detail?id=168"/>
- <item name="Chinese Translation" href="http://heavyz.sourceforge.net/pluto_zh/pluto-container"/>
- </links>
<menu name="Pluto Ant Tasks">
- <item name="Getting Started" href="/getting-started.html"/>
+ <item name="Getting Started" href="/index.html"/>
</menu>
- ${reports}
+ <menu ref="parent"/>
+
+ <menu ref="reports"/>
+
</body>
</project>
Modified: portals/pluto/branches/pluto-1.1.x/pluto-container/src/site/site.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-container/src/site/site.xml?rev=642613&r1=642612&r2=642613&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-container/src/site/site.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-container/src/site/site.xml Sat Mar 29 14:11:54 2008
@@ -20,38 +20,17 @@
<project name="Pluto Portlet Container">
- <bannerLeft>
- <name>Pluto</name>
- <src>http://portals.apache.org/pluto/images/pluto.png</src>
- <href>http://portals.apache.org/pluto</href>
- </bannerLeft>
- <bannerRight>
- <src>http://portals.apache.org/pluto/images/banner.png</src>
- </bannerRight>
-
- <skin>
- <groupId>org.apache.pluto</groupId>
- <artifactId>pluto-site-skin</artifactId>
- <version>1.1.4-SNAPSHOT</version>
- </skin>
-
<body>
- <links>
- <item name="Pluto Home" href="http://portals.apache.org/pluto/"/>
- <item name="JSR 168" href="http://jcp.org/en/jsr/detail?id=168"/>
- <item name="JSR 286" href="http://jcp.org/en/jsr/detail?id=286"/>
- <item name="Chinese Translation" href="http://people.apache.org/~zheng/pluto/chinese/"/>
- </links>
-
- <menu name="Portlet Container">
- <item name="Getting Started" href="/getting-started.html"/>
+ <menu name="Portlet Container" inherit="top">
+ <item name="Getting Started" href="/index.html"/>
<item name="Embedding Pluto" href="/embed.html"/>
</menu>
- ${reports}
+ <menu ref="parent"/>
+
+ <menu ref="reports"/>
</body>
</project>
-
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/pom.xml?rev=642613&r1=642612&r2=642613&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/pom.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/pom.xml Sat Mar 29 14:11:54 2008
@@ -23,12 +23,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <resourcesDirectory>${basedir}/../pluto-site/src/site/resources</resourcesDirectory>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
</plugin>
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/site/site.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/site/site.xml?rev=642613&r1=642612&r2=642613&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/site/site.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/src/site/site.xml Sat Mar 29 14:11:54 2008
@@ -15,30 +15,16 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="Maven">
- <bannerLeft>
- <name>Pluto</name>
- <src>http://portals.apache.org/pluto/images/pluto11.png</src>
- <href>http://portals.apache.org/pluto</href>
- </bannerLeft>
- <bannerRight>
- <src>http://portals.apache.org/pluto/images/banner.png</src>
- </bannerRight>
-
- <skin>
- <groupId>org.apache.pluto</groupId>
- <artifactId>pluto-site-skin</artifactId>
- <version>1.1.4-SNAPSHOT</version>
- </skin>
+<project name="Pluto Descriptor API">
<body>
- <links>
- <item name="Pluto Home" href="http://portals.apache.org/pluto"/>
- <item name="JSR 168" href="http://jcp.org/en/jsr/detail?id=168"/>
- <item name="Chinese Translation" href="http://heavyz.sourceforge.net/pluto_zh/pluto-container"/>
- </links>
+ <menu name="Pluto Descriptor API">
+ <item name="About" href="/index.html"/>
+ </menu>
+
+ <menu ref="parent"/>
- ${reports}
+ <menu ref="reports"/>
</body>
</project>
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/site/apt/index.apt?rev=642613&r1=642612&r2=642613&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/site/apt/index.apt (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/site/apt/index.apt Sat Mar 29 14:11:54 2008
@@ -20,49 +20,42 @@
---
Elliot Metsger
---
- June 1, 2006
+ March 29, 2006
Pluto Descriptor Service Implementation
The Pluto descriptor services provide an entry point for reading and
writing object models representing the web and portlet descriptor files
-(<<<WEB-INF/web.xml>>> and <<<WEB-INF/portlet.xml>>>). The implementation
-uses {{{http://www.castor.org}Castor}} for marshalling and unmarshalling
-the object models.
+(<<<WEB-INF/web.xml>>> and <<<WEB-INF/portlet.xml>>>). The Pluto 1.1
+ implementation uses {{{http://www.castor.org}Castor}} for marshalling
+and unmarshalling the object models. Pluto 2.0 uses JAXB.
If you use the Pluto descriptor services in your own project, be
sure to code to the interfaces <<<org.apache.pluto.descriptors.services.PortletAppDescriptorService>>>
and <<<org.apache.pluto.descriptors.services.WebAppDescriptorService>>> and
-not directly to the implementation classes. The purpose of this documentation
-is to detail which XML parser the descriptor service implementation uses.
+not directly to the implementation classes.
-*--------------+--------------------------------------+
-|Pluto Version |org.apache.pluto.useJaxp default value|
-*--------------+--------------------------------------+
-|1.2.x |true |
-*--------------+--------------------------------------+
-|1.1.4+ |false |
-*--------------+--------------------------------------+
-Default value of the <<<org.apache.pluto.useJaxp>>> system property
-
-* XML parsing in Pluto 1.2.x
-
- In Pluto 1.2.x, Castor uses {{{http://java.sun.com/webservices/jaxp/}JAXP API}}
-and the default JDK 1.5 XML parser for (un)marshalling the descriptor files. Note
-that JDK 1.5 or greater is required to run Pluto 1.2.x. This eliminates the need
-for Pluto to have an XML parser in a shared classloader.
-
- If for some reason you need to disable the use of JAXP, set the system property
-<<<org.apache.pluto.useJaxp>>> to the string <<<false>>>. When the property is
-set to <<<false>>>, Castor will use the parser defined by the
+* XML parsing in Pluto 2.x
+
+ In Pluto 2.x, JAXB is used to (un)marshal the descriptor files. Pluto 2.x
+requires JDK 1.5 and will use JAXP for XML parsing. No XML parsers
+are required to be endorsed.
+
+* XML parsing in Pluto 1.1.x
+
+ In Pluto 1.1.x, Castor is used to (un)marshal the descriptor files. Pluto
+1.1.x targets JDK 1.4, therefore 1.1.x distributions will include endorsed
+XML libraries in Tomcat 5's <<<common/endorsed>>> directory.
+
+ However, if your runtime is JDK 1.5 or greater and you are running
+Pluto 1.1.5+, Pluto will automatically configure Castor to use JAXP.
+If you meet these criteria (JDK 1.5+, Pluto 1.1.5+), no XML libraries need
+to be endorsed - simply delete them from Tomcat 5's common/endorsed directory.
+When Castor is configured to use JAXP, the parser that was defined by the
+Castor property <<<org.exolab.castor.parser>>> is ignored.
+
+ If for some reason you need to override the the use of JAXP, set the system
+property <<<org.apache.pluto.useJaxp>>> to the string <<<false>>>. When the
+property is set to <<<false>>>, Castor will use the parser defined by the
<<<org.exolab.castor.parser>>> property. You will be responsible for providing
the XML parser APIs and implementation libraries.
-
-* XML parsing in Pluto 1.1.4 and up
-
- If you use Pluto 1.1.4 or greater (but still within the 1.1 line), Castor will
-use the Xerces parser distributed with Pluto, to maintain JDK 1.4 compatibility.
-However, if you run Pluto 1.1.4 under JDK 1.5, you can enable JAXP by setting the
-system property <<<org.apache.pluto.useJaxp>>> equal to the string <<<true>>>. In
-this case, the parser that was defined by the Castor property <<<org.exolab.castor.parser>>>
-will be overridden.
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/site/site.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/site/site.xml?rev=642613&r1=642612&r2=642613&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/site/site.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/site/site.xml Sat Mar 29 14:11:54 2008
@@ -1,56 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied.
-
-See the License for the specific language governing permissions and
-limitations under the License.
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
-
<project name="Pluto Descriptor Implementation">
-
- <bannerLeft>
- <name>Pluto</name>
- <src>http://portals.apache.org/pluto/images/pluto.png</src>
- <href>http://portals.apache.org/pluto</href>
- </bannerLeft>
- <bannerRight>
- <src>http://portals.apache.org/pluto/images/banner.png</src>
- </bannerRight>
-
- <skin>
- <groupId>org.apache.pluto</groupId>
- <artifactId>pluto-site-skin</artifactId>
- <version>1.1.4-SNAPSHOT</version>
- </skin>
-
+
<body>
-
- <links>
- <item name="Pluto Home" href="http://portals.apache.org/pluto/"/>
- <item name="JSR 168" href="http://jcp.org/en/jsr/detail?id=168"/>
- <item name="JSR 286" href="http://jcp.org/en/jsr/detail?id=286"/>
- <item name="Chinese Translation" href="http://people.apache.org/~zheng/pluto/chinese/"/>
- </links>
-
- <menu name="Descriptor Services Implementation">
- <item name="Getting Started" href="/index.html"/>
- </menu>
-
- ${reports}
-
+ <menu name="Pluto Descriptor Implementation">
+ <item name="About" href="/index.html"/>
+ </menu>
+
+ <menu ref="parent"/>
+
+ <menu ref="reports"/>
+
</body>
-
</project>
-
Propchange: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/site/site.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/pom.xml?rev=642613&r1=642612&r2=642613&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/pom.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/pom.xml Sat Mar 29 14:11:54 2008
@@ -118,12 +118,6 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <resourcesDirectory>${basedir}/../pluto-site/src/site/resources</resourcesDirectory>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
</plugin>
Modified: portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/pom.xml?rev=642613&r1=642612&r2=642613&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/pom.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/pom.xml Sat Mar 29 14:11:54 2008
@@ -119,16 +119,10 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <resourcesDirectory>${basedir}/../pluto-site/src/site/resources</resourcesDirectory>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/site/site.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/site/site.xml?rev=642613&r1=642612&r2=642613&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/site/site.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/site/site.xml Sat Mar 29 14:11:54 2008
@@ -15,30 +15,16 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="Pluto Taglib">
- <bannerLeft>
- <name>Pluto Taglib</name>
- <src>http://portals.apache.org/pluto/images/pluto.png</src>
- <href>http://portals.apache.org/pluto</href>
- </bannerLeft>
- <bannerRight>
- <src>http://portals.apache.org/pluto/images/banner.png</src>
- </bannerRight>
-
- <skin>
- <groupId>org.apache.pluto</groupId>
- <artifactId>pluto-site-skin</artifactId>
- <version>1.1.4-SNAPSHOT</version>
- </skin>
+<project name="Pluto Portal Driver">
<body>
- <links>
- <item name="Pluto Home" href="http://portals.apache.org/pluto"/>
- <item name="JSR 168" href="http://jcp.org/en/jsr/detail?id=168"/>
- <item name="Chinese Translation" href="http://heavyz.sourceforge.net/pluto_zh/pluto-container"/>
- </links>
+ <menu name="Pluto Portal Driver">
+ <item name="About" href="/index.html"/>
+ </menu>
+
+ <menu ref="parent"/>
- ${reports}
+ <menu ref="reports"/>
</body>
</project>
Propchange: portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/site/site.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: portals/pluto/branches/pluto-1.1.x/pluto-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal/pom.xml?rev=642613&r1=642612&r2=642613&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-portal/pom.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-portal/pom.xml Sat Mar 29 14:11:54 2008
@@ -123,14 +123,6 @@
</plugin>
<plugin>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-5</version>
- <configuration>
- <resourcesDirectory>${basedir}/../pluto-site/src/site/resources</resourcesDirectory>
- </configuration>
- </plugin>
-
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
</plugin>
Modified: portals/pluto/branches/pluto-1.1.x/pluto-portal/src/site/site.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal/src/site/site.xml?rev=642613&r1=642612&r2=642613&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-portal/src/site/site.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-portal/src/site/site.xml Sat Mar 29 14:11:54 2008
@@ -15,30 +15,16 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="Maven">
- <bannerLeft>
- <name>Pluto</name>
- <src>http://portals.apache.org/pluto/images/pluto.png</src>
- <href>http://portals.apache.org/pluto</href>
- </bannerLeft>
- <bannerRight>
- <src>http://portals.apache.org/pluto/images/banner.png</src>
- </bannerRight>
-
- <skin>
- <groupId>org.apache.pluto</groupId>
- <artifactId>pluto-site-skin</artifactId>
- <version>1.1.4-SNAPSHOT</version>
- </skin>
+<project name="Pluto Portal">
<body>
- <links>
- <item name="Pluto Home" href="http://portals.apache.org/pluto"/>
- <item name="JSR 168" href="http://jcp.org/en/jsr/detail?id=168"/>
- <item name="Chinese Translation" href="http://heavyz.sourceforge.net/pluto_zh/pluto-container"/>
- </links>
+ <menu name="Pluto Portal Webapp">
+ <item name="About" href="/index.html"/>
+ </menu>
+
+ <menu ref="parent"/>
- ${reports}
+ <menu ref="reports"/>
</body>
</project>
Modified: portals/pluto/branches/pluto-1.1.x/pluto-taglib/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-taglib/pom.xml?rev=642613&r1=642612&r2=642613&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-taglib/pom.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-taglib/pom.xml Sat Mar 29 14:11:54 2008
@@ -60,12 +60,6 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <resourcesDirectory>${basedir}/../pluto-site/src/site/resources</resourcesDirectory>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
</plugin>
Modified: portals/pluto/branches/pluto-1.1.x/pluto-taglib/src/site/site.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-taglib/src/site/site.xml?rev=642613&r1=642612&r2=642613&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-taglib/src/site/site.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-taglib/src/site/site.xml Sat Mar 29 14:11:54 2008
@@ -16,29 +16,13 @@
limitations under the License.
-->
<project name="Pluto Taglib">
- <bannerLeft>
- <name>Pluto Taglib</name>
- <src>http://portals.apache.org/pluto/images/pluto.png</src>
- <href>http://portals.apache.org/pluto</href>
- </bannerLeft>
- <bannerRight>
- <src>http://portals.apache.org/pluto/images/banner.png</src>
- </bannerRight>
-
- <skin>
- <groupId>org.apache.pluto</groupId>
- <artifactId>pluto-site-skin</artifactId>
- <version>1.1.4-SNAPSHOT</version>
- </skin>
-
<body>
- <links>
- <item name="Pluto Home" href="http://portals.apache.org/pluto"/>
- <item name="JSR 168" href="http://jcp.org/en/jsr/detail?id=168"/>
- <item name="Chinese Translation" href="http://heavyz.sourceforge.net/pluto_zh/pluto-container"/>
- </links>
+ <menu name="Pluto Taglib">
+ <item name="About" href="/index.html"/>
+ </menu>
+ <menu ref="parent"/>
- ${reports}
+ <menu ref="reports"/>
</body>
</project>
Modified: portals/pluto/branches/pluto-1.1.x/pluto-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-testsuite/pom.xml?rev=642613&r1=642612&r2=642613&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-testsuite/pom.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-testsuite/pom.xml Sat Mar 29 14:11:54 2008
@@ -100,12 +100,6 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <resourcesDirectory>${basedir}/../pluto-site/src/site/resources</resourcesDirectory>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
</plugin>
Modified: portals/pluto/branches/pluto-1.1.x/pluto-testsuite/src/site/site.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-testsuite/src/site/site.xml?rev=642613&r1=642612&r2=642613&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-testsuite/src/site/site.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-testsuite/src/site/site.xml Sat Mar 29 14:11:54 2008
@@ -15,30 +15,16 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="Pluto Taglib">
- <bannerLeft>
- <name>Pluto Taglib</name>
- <src>http://portals.apache.org/pluto/images/pluto.png</src>
- <href>http://portals.apache.org/pluto</href>
- </bannerLeft>
- <bannerRight>
- <src>http://portals.apache.org/pluto/images/banner.png</src>
- </bannerRight>
-
- <skin>
- <groupId>org.apache.pluto</groupId>
- <artifactId>pluto-site-skin</artifactId>
- <version>1.1.4-SNAPSHOT</version>
- </skin>
+<project name="Pluto Testsuite">
<body>
- <links>
- <item name="Pluto Home" href="http://portals.apache.org/pluto"/>
- <item name="JSR 168" href="http://jcp.org/en/jsr/detail?id=168"/>
- <item name="Chinese Translation" href="http://heavyz.sourceforge.net/pluto_zh/pluto-container"/>
- </links>
+ <menu name="Pluto Testsuite">
+ <item name="About" href="/index.html"/>
+ </menu>
+
+ <menu ref="parent"/>
- ${reports}
+ <menu ref="reports"/>
</body>
</project>
Propchange: portals/pluto/branches/pluto-1.1.x/pluto-testsuite/src/site/site.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: portals/pluto/branches/pluto-1.1.x/pluto-util/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-util/pom.xml?rev=642613&r1=642612&r2=642613&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-util/pom.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-util/pom.xml Sat Mar 29 14:11:54 2008
@@ -68,24 +68,11 @@
</dependencies>
- <distributionManagement>
- <site>
- <id>website</id>
- <url>scp://people.apache.org/www/portals.apache.org/pluto/pluto-1.1</url>
- </site>
- </distributionManagement>
-
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <resourcesDirectory>${basedir}/../pluto-site/src/site/resources</resourcesDirectory>
- </configuration>
</plugin>
</plugins>
</reporting>
Modified: portals/pluto/branches/pluto-1.1.x/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pom.xml?rev=642613&r1=642612&r2=642613&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pom.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pom.xml Sat Mar 29 14:11:54 2008
@@ -278,7 +278,7 @@
<module>pluto-ant-tasks</module>
<!-- Pluto Documentations -->
- <module>pluto-site</module>
+ <!--module>pluto-site</module-->
<module>pluto-site-skin</module>
</modules>
@@ -359,8 +359,20 @@
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-2</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.0-beta-7-SNAPSHOT</version>
+ </plugin>
</plugins>
</pluginManagement>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ </plugin>
+ </plugins>
</build>
<reporting>