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/27 03:43:06 UTC
svn commit: r641695 - in /portals/pluto/branches/pluto-1.1.x:
pluto-site-skin/ pluto-site-skin/src/main/resources/images/
pluto-site-skin/src/main/resources/images/v101/ pluto-site/
pluto-site/src/site/ pluto-site/src/site/fml/ pluto-site/src/site/reso...
Author: esm
Date: Wed Mar 26 19:43:03 2008
New Revision: 641695
URL: http://svn.apache.org/viewvc?rev=641695&view=rev
Log:
Merging pluto-site and pluto-site-skin contents from trunk to the 1.1.x branch. The site should probably be maintined in trunk and merged into the 1.1.x branch as required.
Added:
portals/pluto/branches/pluto-1.1.x/pluto-site-skin/src/main/resources/images/apache-maven-project-2.png
- copied unchanged from r641692, portals/pluto/trunk/pluto-site-skin/src/main/resources/images/apache-maven-project-2.png
portals/pluto/branches/pluto-1.1.x/pluto-site-skin/src/main/resources/images/banner.jpg
- copied unchanged from r641692, portals/pluto/trunk/pluto-site-skin/src/main/resources/images/banner.jpg
portals/pluto/branches/pluto-1.1.x/pluto-site-skin/src/main/resources/images/bg.jpg
- copied unchanged from r641692, portals/pluto/trunk/pluto-site-skin/src/main/resources/images/bg.jpg
portals/pluto/branches/pluto-1.1.x/pluto-site-skin/src/main/resources/images/breadcrumbs.jpg
- copied unchanged from r641692, portals/pluto/trunk/pluto-site-skin/src/main/resources/images/breadcrumbs.jpg
portals/pluto/branches/pluto-1.1.x/pluto-site-skin/src/main/resources/images/collapsed.gif
- copied unchanged from r641692, portals/pluto/trunk/pluto-site-skin/src/main/resources/images/collapsed.gif
portals/pluto/branches/pluto-1.1.x/pluto-site-skin/src/main/resources/images/expanded.gif
- copied unchanged from r641692, portals/pluto/trunk/pluto-site-skin/src/main/resources/images/expanded.gif
portals/pluto/branches/pluto-1.1.x/pluto-site-skin/src/main/resources/images/external-pluto.png
- copied unchanged from r641692, portals/pluto/trunk/pluto-site-skin/src/main/resources/images/external-pluto.png
portals/pluto/branches/pluto-1.1.x/pluto-site-skin/src/main/resources/images/external.png
- copied unchanged from r641692, portals/pluto/trunk/pluto-site-skin/src/main/resources/images/external.png
portals/pluto/branches/pluto-1.1.x/pluto-site-skin/src/main/resources/images/h3.jpg
- copied unchanged from r641692, portals/pluto/trunk/pluto-site-skin/src/main/resources/images/h3.jpg
portals/pluto/branches/pluto-1.1.x/pluto-site-skin/src/main/resources/images/h5.jpg
- copied unchanged from r641692, portals/pluto/trunk/pluto-site-skin/src/main/resources/images/h5.jpg
portals/pluto/branches/pluto-1.1.x/pluto-site-skin/src/main/resources/images/icon_error_sml.gif
- copied unchanged from r641692, portals/pluto/trunk/pluto-site-skin/src/main/resources/images/icon_error_sml.gif
portals/pluto/branches/pluto-1.1.x/pluto-site-skin/src/main/resources/images/icon_info_sml.gif
- copied unchanged from r641692, portals/pluto/trunk/pluto-site-skin/src/main/resources/images/icon_info_sml.gif
portals/pluto/branches/pluto-1.1.x/pluto-site-skin/src/main/resources/images/icon_success_sml.gif
- copied unchanged from r641692, portals/pluto/trunk/pluto-site-skin/src/main/resources/images/icon_success_sml.gif
portals/pluto/branches/pluto-1.1.x/pluto-site-skin/src/main/resources/images/icon_warning_sml.gif
- copied unchanged from r641692, portals/pluto/trunk/pluto-site-skin/src/main/resources/images/icon_warning_sml.gif
portals/pluto/branches/pluto-1.1.x/pluto-site-skin/src/main/resources/images/logo_apache.jpg
- copied unchanged from r641692, portals/pluto/trunk/pluto-site-skin/src/main/resources/images/logo_apache.jpg
portals/pluto/branches/pluto-1.1.x/pluto-site-skin/src/main/resources/images/logo_maven.jpg
- copied unchanged from r641692, portals/pluto/trunk/pluto-site-skin/src/main/resources/images/logo_maven.jpg
portals/pluto/branches/pluto-1.1.x/pluto-site-skin/src/main/resources/images/maven-logo-2.gif
- copied unchanged from r641692, portals/pluto/trunk/pluto-site-skin/src/main/resources/images/maven-logo-2.gif
portals/pluto/branches/pluto-1.1.x/pluto-site-skin/src/main/resources/images/newwindow.png
- copied unchanged from r641692, portals/pluto/trunk/pluto-site-skin/src/main/resources/images/newwindow.png
Removed:
portals/pluto/branches/pluto-1.1.x/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
portals/pluto/branches/pluto-1.1.x/pluto-site-skin/src/main/resources/images/download.gif
portals/pluto/branches/pluto-1.1.x/pluto-site-skin/src/main/resources/images/pluto11.png
portals/pluto/branches/pluto-1.1.x/pluto-site-skin/src/main/resources/images/v101/
Modified:
portals/pluto/branches/pluto-1.1.x/pluto-site-skin/ (props changed)
portals/pluto/branches/pluto-1.1.x/pluto-site/pom.xml
portals/pluto/branches/pluto-1.1.x/pluto-site/src/site/fml/faq.fml
portals/pluto/branches/pluto-1.1.x/pluto-site/src/site/resources/css/site.css (props changed)
portals/pluto/branches/pluto-1.1.x/pluto-site/src/site/site.xml
portals/pluto/branches/pluto-1.1.x/pluto-site/src/site/xdoc/download.xml
portals/pluto/branches/pluto-1.1.x/pluto-site/src/site/xdoc/news.xml
portals/pluto/branches/pluto-1.1.x/pluto-site/src/site/xdoc/v11/getting-started.xml
Propchange: portals/pluto/branches/pluto-1.1.x/pluto-site-skin/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Mar 26 19:43:03 2008
@@ -1 +1,5 @@
target
+
+.classpath
+
+.project
Modified: portals/pluto/branches/pluto-1.1.x/pluto-site/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-site/pom.xml?rev=641695&r1=641694&r2=641695&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-site/pom.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-site/pom.xml Wed Mar 26 19:43:03 2008
@@ -48,9 +48,9 @@
</reporting>
<!-- repeated here so that pluto-site is not appended -->
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/portals/pluto/tags/pluto-1.1.1</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/pluto/tags/pluto-1.1.1</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/portals/pluto/tags/pluto-1.1.1</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/portals/pluto/tags/pluto-1.1.5</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/pluto/tags/pluto-1.1.5</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/portals/pluto/tags/pluto-1.1.5</url>
</scm>
</project>
Modified: portals/pluto/branches/pluto-1.1.x/pluto-site/src/site/fml/faq.fml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-site/src/site/fml/faq.fml?rev=641695&r1=641694&r2=641695&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-site/src/site/fml/faq.fml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-site/src/site/fml/faq.fml Wed Mar 26 19:43:03 2008
@@ -155,5 +155,21 @@
</textarea>
</answer>
</faq>
+
+ <faq id="xml-parsing">
+ <question>
+ Do I need to have xml parsers in an endorsed classloader? (e.g.in
+ Tomcat's 5.5 common/endorsed directory)
+ </question>
+ <answer>
+ <p>If you have installed Pluto 1.1.5 or greater, and are running on
+ Java 5 or greater, then you do not need to endorse any XML
+ libraries. Pluto will use JAXP.</p>
+ <p>The Pluto 1.1.x codebase targets Java 1.4, and so the bundled
+ distribution of Pluto includes Tomcat with XML libraries in
+ <code>common/endorsed</code>. Simply remove the XML libraries
+ from <code>common/endorsed</code> if you meet the above requirements.</p>
+ </answer>
+ </faq>
</part>
</faqs>
Propchange: portals/pluto/branches/pluto-1.1.x/pluto-site/src/site/resources/css/site.css
('svn:mime-type' removed)
Modified: portals/pluto/branches/pluto-1.1.x/pluto-site/src/site/site.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-site/src/site/site.xml?rev=641695&r1=641694&r2=641695&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-site/src/site/site.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-site/src/site/site.xml Wed Mar 26 19:43:03 2008
@@ -32,7 +32,7 @@
<skin>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto-site-skin</artifactId>
- <version>1.1.4</version>
+ <version>1.1.6-SNAPSHOT</version>
</skin>
<body>
@@ -40,7 +40,6 @@
<links>
<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="The Pluto Project">
@@ -50,6 +49,7 @@
<item name="News" href="/news.html"/>
<item name="FAQ" href="/faq.html"/>
<item name="Wiki" href="http://wiki.apache.org/portals/Pluto"/>
+ <item name="Issue Tracker (JIRA)" href="https://issues.apache.org/jira/browse/PLUTO"/>
<item name="Powered By Pluto" href="/powered.html"/>
<item name="Get Involved" href="/helping.html"/>
</menu>
Modified: portals/pluto/branches/pluto-1.1.x/pluto-site/src/site/xdoc/download.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-site/src/site/xdoc/download.xml?rev=641695&r1=641694&r2=641695&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-site/src/site/xdoc/download.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-site/src/site/xdoc/download.xml Wed Mar 26 19:43:03 2008
@@ -50,19 +50,9 @@
<a href="http://www.apache.org/dyn/closer.cgi/portals/pluto/">a Pluto
distribution mirror</a>.
</p>
- <br/>
- <br/>
<p>
- <strong>Please note:</strong> It was discovered during the 1.1.4 release process
- that Pluto 1.1.<em>3</em> was not binary compatible with Pluto 1.1.<em>2</em>. The <em>1.1.4</em> release
- maintains binary compatability with <em>1.1.3.</em>
- </p>
- <br/>
- <br/>
- <p>
- <strong>Please note:</strong> It was discovered during the 1.1.4 release process
- that Pluto 1.1.<em>3</em> was not binary compatible with Pluto 1.1.<em>2</em>. The <em>1.1.4</em> release
- maintains binary compatability with <em>1.1.3.</em>
+ <strong>Please note:</strong> Pluto 1.1.<em>3</em> is not binary compatible with Pluto 1.1.<em>2</em>.
+ The <em>1.1.x</em> releases maintain binary compatability with <em>1.1.3.</em>
</p>
</section>
Modified: portals/pluto/branches/pluto-1.1.x/pluto-site/src/site/xdoc/news.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-site/src/site/xdoc/news.xml?rev=641695&r1=641694&r2=641695&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-site/src/site/xdoc/news.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-site/src/site/xdoc/news.xml Wed Mar 26 19:43:03 2008
@@ -27,7 +27,7 @@
<body>
<section name="News and Status">
- <h4>7 March 2008 - Portals Pluto 1.1.5</h4>
+ <h4>26 March 2008 - Portals Pluto 1.1.5</h4>
<p>
The Apache Pluto project is proud to announce the General Availability release of Pluto 1.1.5.
This is the sixth GA release of the 1.1 line of Pluto, which is a major refactoring of
Modified: portals/pluto/branches/pluto-1.1.x/pluto-site/src/site/xdoc/v11/getting-started.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-site/src/site/xdoc/v11/getting-started.xml?rev=641695&r1=641694&r2=641695&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-site/src/site/xdoc/v11/getting-started.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-site/src/site/xdoc/v11/getting-started.xml Wed Mar 26 19:43:03 2008
@@ -106,8 +106,9 @@
<pre>svn checkout https://svn.apache.org/repos/asf/portals/pluto/trunk/ pluto</pre>
</p>
- <p>To check out Pluto 1.1.4 source to the 'pluto' directory use this command:
- <pre>svn checkout https://svn.apache.org/repos/asf/portals/pluto/tags/pluto-1.1.4 pluto</pre>
+ <p>To check out Pluto 1.1.<code>x</code> source to the 'pluto' directory use this command (substituting '<code>x</code>' for the
+ current release number, e.g. 1.1.<code>5</code>):
+ <pre>svn checkout https://svn.apache.org/repos/asf/portals/pluto/tags/pluto-1.1.x pluto</pre>
</p>
<p>
@@ -137,7 +138,7 @@
</p>
<p>
<code><PLUTO_SRCHOME></code> is the local directory where the
- Pluto 1.1 source distribution has been checked out or unzipped into.
+ Pluto 1.1/2.0 source distribution has been checked out or unzipped into.
</p>
<p>
<source><![CDATA[
@@ -187,7 +188,7 @@
<code><TOMCAT_HOME>/shared/lib</code>:
<ul>
<li>activation-1.1.jar (Pluto 2.0 only)</li>
- <li>castor-1.1.1.jar</li>
+ <li>castor-1.1.1.jar (Pluto 1.1.x only)</li>
<li>portlet-api-1.0.jar or portlet-api-2.0.jar</li>
<li>jaxb-api-2.1.jar (Pluto 2.0 only)</li>
<li>jaxb-impl-2.1.2.jar (Pluto 2.0 only)</li>
@@ -200,18 +201,12 @@
<li>pluto-descriptor-api-x.x.x.jar (x.x.x is the version of Pluto you built)</li>
<li>pluto-descriptor-impl-x.x.x.jar (x.x.x is the version of Pluto you built)</li>
<li>pluto-taglib-x.x.x.jar (x.x.x is the version of Pluto you built)</li>
-
- <li>castor-1.0.jar</li>
- <li>portlet-api-1.0.jar</li>
- <li>pluto-container-1.1.4.jar</li>
- <li>pluto-descriptor-api-1.1.4.jar</li>
- <li>pluto-descriptor-impl-1.1.4.jar</li>
- <li>pluto-taglib-1.1.4.jar</li>
</ul>
</p>
<p>
- <b>Step 3:</b> For Pluto 1.1, copy the following to
- <code><TOMCAT_HOME>/common/endorsed</code>:
+ <b>Step 3:</b> For platforms running on Java 1.4 and Pluto 1.1, copy the following to
+ <code><TOMCAT_HOME>/common/endorsed</code> (if you are running Java 1.5+, or you are
+ running Pluto 2.0, it is recommended to skip this step):
<ul>
<li>xercesImpl-2.6.2.jar</li>
<li>xmlParserAPIs-2.6.2.jar</li>