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 cd...@apache.org on 2008/01/05 16:43:04 UTC

svn commit: r609156 - in /portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site: fml/faq.fml site.xml xdoc/index.xml xdoc/powered.xml xdoc/v11/architecture.xml xdoc/v11/deploying.xml xdoc/v11/getting-started.xml xdoc/v11/subprojects.xml

Author: cdoremus
Date: Sat Jan  5 07:42:00 2008
New Revision: 609156

URL: http://svn.apache.org/viewvc?rev=609156&view=rev
Log:
Modified web site documentation to include Pluto 2.0 info.

Modified:
    portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/fml/faq.fml
    portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/site.xml
    portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/xdoc/index.xml
    portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/xdoc/powered.xml
    portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/xdoc/v11/architecture.xml
    portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/xdoc/v11/deploying.xml
    portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/xdoc/v11/getting-started.xml
    portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/xdoc/v11/subprojects.xml

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/fml/faq.fml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/fml/faq.fml?rev=609156&r1=609155&r2=609156&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/fml/faq.fml (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/fml/faq.fml Sat Jan  5 07:42:00 2008
@@ -30,21 +30,12 @@
         </p>
 
         <p>
-          Pluto 1.2.x is currently under development. The primary
-          chanages between 1.1.x and 1.2.x is that the 1.2 series
-          will require Java1.5. If you are looking for generics
-          support and other Java5 features, you may want to become
-          an early adopter of 1.2.x.
+          Pluto 2.x is currently under development. This is the 
+          reference implementation of JSR-286, the 2nd version
+          of the Java Portlet Specification. Pluto 2.x requires
+          the use of Java 5(a.k.a 1.5).
         </p>
 
-        <p>
-          There is also a branch which has been created to foster
-          the development of JSR-286 support. We hope that this
-          branch eventually becomes the 2.x series, however, the
-          development is currently very immature. If you are
-          looking for JSR-286 support, we recommend that you
-          utilize and help us flush out this version.
-        </p>
       </answer>
     </faq>
 
@@ -68,9 +59,9 @@
           Now that Pluto 1.1.0 has been released, our team highly
           recommends that you migrate to it. Pluto 1.0.x development
           has been stagnant for some time and there are no plans to
-          support it in the future. Pluto 1.1.0 on the otherhand
-          will be the basis for all development currently envisioned
-          (including jsr 286 support).
+          support it in the future. Pluto 1.1.x is also the basis for
+          Pluto 2.x, which is the reference implementation for
+          JSR-286 (Portlet 2.0).
         </p>
       </answer>
     </faq>

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/site.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/site.xml?rev=609156&r1=609155&r2=609156&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/site.xml (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/site.xml Sat Jan  5 07:42:00 2008
@@ -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">
@@ -54,7 +53,7 @@
       <item name="Get Involved" href="/helping.html"/>
     </menu>
     
-    <menu name="Pluto 1.1">
+    <menu name="Pluto 1.1 and 2.0">
       <item name="Getting Started" href="/v11/getting-started.html"/>
       <item name="Release Notes" href="/v11/release-notes.html"/>
       <item name="Deploying" href="/v11/deploying.html"/>

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/xdoc/index.xml?rev=609156&r1=609155&r2=609156&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/xdoc/index.xml (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/xdoc/index.xml Sat Jan  5 07:42:00 2008
@@ -37,7 +37,7 @@
           Details on the specification work can be
           found at the <a href="http://jcp.org/en/jsr/detail?id=286">JSR-286 web
           site</a>. Drafts of the new portlet specification and API can
-		  be found at <a href="http://ipc658.inf-swt.uni-jena.de/spec/">http://ipc658.inf-swt.uni-jena.de/spec/</a>.
+		  be found at <a href="http://hnsp.inf-bb.uni-jena.de/spec/">http://hnsp.inf-bb.uni-jena.de/spec/</a>.
 		  The Expert Group is very interested in feedback from the
           community. Send your comments to <a href="mailto:jsr-286-comments@jcp.org">
           jsr-286-comments@jcp.org</a>.
@@ -60,7 +60,8 @@
      
       <p>
         Pluto is the Reference Implementation of the Java Portlet Specfication.
-        The current version of this specification is JSR 168.
+        The current version (1.0) of this specification is JSR-168. Version 2.0
+        of the Specification is under development by the JSR-286 Expert Group. 
       </p>
       <p>
         Portlets are designed to run in the context of a portal. They are
@@ -100,9 +101,18 @@
     <section name="Project Status">
       <p>
         Apache Pluto is a subproject of the Apache Portals Project. The current
-        stable release of Apache Pluto is version 1.1.4.  Pluto 1.1 is being
-        actively developed as the Reference Implementation of JSR-286.
+        stable release of Apache Pluto is version 1.1.4.  
       </p>
+      <subsection name="Pluto 2.0">
+        <p>
+          Pluto 2.0, built from the Pluto 1.1 code-base, is the reference implementation
+          of version 2.0 of the Java Portlet API specification (JSR-286). The JSR-286
+          specification adds interportlet coordination (events and shared render parameters), 
+          portlet filters and resource serving to the Portlet API in addition to 
+          numerous other changes from version 1.0.
+        </p>
+      </subsection>
+      
       <subsection name="Pluto 1.1">
         <p>
           Pluto 1.1 introduces a new container architecture. If you are

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/xdoc/powered.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/xdoc/powered.xml?rev=609156&r1=609155&r2=609156&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/xdoc/powered.xml (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/xdoc/powered.xml Sat Jan  5 07:42:00 2008
@@ -74,7 +74,7 @@
           <td><a href="http://geronimo.apache.org/">http://geronimo.apache.org</a></td>
           <td>Apache 2.0</td>
           <td>Web Management Console</td>
-          <td>1.0.1</td></tr>
+          <td>1.1</td></tr>
 	  <tr><td>Java Studio Creator 2.0</td>
           <td><a href="http://developers.sun.com/prodtech/javatools/jscreator/">http://developers.sun.com/prodtech/javatools/jscreator/</a></td>
           <td>Sun Microsystems Inc.</td>

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/xdoc/v11/architecture.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/xdoc/v11/architecture.xml?rev=609156&r1=609155&r2=609156&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/xdoc/v11/architecture.xml (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/xdoc/v11/architecture.xml Sat Jan  5 07:42:00 2008
@@ -28,7 +28,7 @@
     <section name="Architectural Diagrams">
       <p>
         The following diagram depicts the architectural
-        components of Pluto 1.1. More details coming soon.
+        components of Pluto 1.1 and 2.0. More details coming soon.
         <img src="../images/architecture.png"/>
       </p>
     </section>

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/xdoc/v11/deploying.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/xdoc/v11/deploying.xml?rev=609156&r1=609155&r2=609156&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/xdoc/v11/deploying.xml (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/xdoc/v11/deploying.xml Sat Jan  5 07:42:00 2008
@@ -29,7 +29,7 @@
     <section name="Deploying Portlet to Pluto Portal">
       
       <p>
-        There are 2 steps involved in deploying a portlet application in Pluto 1.1:
+        There are 2 steps involved in deploying a portlet application in Pluto 1.1 or 2.0:
         <ul>
           <li>
             <b>Assembly</b>: All portlet applications must be run through the
@@ -113,8 +113,9 @@
   <name>${pom.artifactId}</name>
   <!-- Dependency Version Properties ======================================= -->
   <properties>
-    <!-- Change this for a new Pluto version -->
+    <!-- Change this to 2.0.0 for Pluto 2.0 or to another appropriate version -->
     <pluto.version>1.1.4</pluto.version>
+    <!-- Change this to 2.0 for Pluto 2.0 -->
     <portlet-api.version>1.0</portlet-api.version>
     <servlet-api.version>2.4</servlet-api.version>
     <jsp-api.version>2.0</jsp-api.version>
@@ -215,6 +216,7 @@
             <configuration>
               <tasks>
                   <property environment="env"/>
+                  <!-- This assumes that you have set a CATALINA_HOME environmental variable -->
                   <property name="pluto.home" value="${env.CATALINA_HOME}"/>
                   <copy file="target/${pom.name}.war" todir="${pluto.home}/webapps"/>
               </tasks>

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/xdoc/v11/getting-started.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/xdoc/v11/getting-started.xml?rev=609156&r1=609155&r2=609156&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/xdoc/v11/getting-started.xml (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/xdoc/v11/getting-started.xml Sat Jan  5 07:42:00 2008
@@ -30,6 +30,9 @@
       <div class="highlightBox">
         <h4>About Pluto Distributions</h4>
         <p>
+          Currently, only Pluto 1.1 has a binary distribution.
+        </p>
+        <p>
           There are a number of distributions to choose from depending
           on your needs.
           <ul>
@@ -58,21 +61,21 @@
 	        	<li>Use shutdown.bat/shutdown.sh to stop the portal</li>
 			</ol>
         <li>Browse to <a href="http://localhost:8080/pluto/portal">http://localhost:8080/pluto/portal</a></li>
-        <li>Login as the user pluto (password=pluto).</li>
+        <li>Login as user pluto (password=pluto) or tomcat (password=tomcat).</li>
       </ol>
 
     </section>
 	    
-    <section name="Building Pluto from Source">
+    <section name="Building Pluto 1.1 and 2.0 from Source">
       
       <p>
         Maven 2 is utilized as the project management and build system for
-        Pluto 1.1. Pluto currently provides Maven plugins which can be used to
+        Pluto 1.1 and 2.0. Pluto currently provides Maven plugins which can be used to
         install the Pluto Portal, assemble portlet applications, deploy
         applications, and publish portlet applications to the Pluto Portal.
       </p>
 
-      <subsection name="Obtaining Pluto 1.1 Source Code">
+      <subsection name="Obtaining Pluto 1.1/2.0 Source Code">
 		<p>The Pluto project uses the
 		<a href="http://subversion.tigris.org/">Subversion</a> version control
 		system.  If you're new to Subversion, you can check out the
@@ -84,7 +87,7 @@
     	<p><b>Web Access to Subversion</b></p>
     	
 		<p>
-		To browse the Pluto 1.1 source code, you can use the
+		To browse the Pluto source code, you can use the
 		<a href="http://svn.apache.org/viewcvs.cgi/portals/pluto/trunk?root=Apache-SVN">ViewCVS
 		web interface</a> to Subversion. This is current at all times.
 		</p>
@@ -98,7 +101,7 @@
 
 		<h3>Check out from Subversion</h3>
 		
-		<p>Again, anyone can do this.  To check out the latest distribution of Pluto 1.1 (trunk) to a directory 
+		<p>Again, anyone can do this.  To check out the latest distribution of Pluto 2.0 (trunk) to a directory 
 		called 'pluto' use this command:
 		<pre>svn checkout https://svn.apache.org/repos/asf/portals/pluto/trunk/ pluto</pre>
 		</p>
@@ -108,7 +111,7 @@
 		</p>
 
         <p>
-          Zipped up Pluto source distributions can also be downloaded from
+          Zipped up Pluto 1.1 source distributions can also be downloaded from
         a <a href="http://www.apache.org/dyn/closer.cgi/portals/pluto/">distribution mirror</a>.  
         </p>          
 
@@ -133,12 +136,12 @@
 	  then the <code>pluto:install</code> will fail.
 	</p>
         <p>
-          <code>&lt;PLUTO-1.1-SRCHOME&gt;</code> is the local directory where the
-          Pluto 1.1 source distribution has been checked out or unzipped into.
+          <code>&lt;PLUTO_SRCHOME&gt;</code> is the local directory where the
+          Pluto 1.1/2.0 source distribution has been checked out or unzipped into.
         </p>
         <p>
           <source><![CDATA[
-$> cd <PLUTO-1.1-SRCHOME>
+$> cd <PLUTO_SRCHOME>
 $> mvn install
 $> mvn pluto:install -DinstallDir=path/to/appserver
           ]]></source>
@@ -151,7 +154,7 @@
         <p>
           The <code>pluto:install</code> goal will take the resulting artifacts
           and properly deploy them within the configured Tomcat installation.
-          Currently, the Pluto 1.1 install has been tested on Tomcat 5.5.9, 5.5.17 and 5.5.20, 5.5.23, and 6.0.13.
+          Currently, the Pluto install has been tested on Tomcat 5.5.9, 5.5.17 and 5.5.20, 5.5.23, and 6.0.13.
           The Tomcat 5 archive can be found <a href="http://archive.apache.org/dist/tomcat/tomcat-5/archive">here</a>.
         </p>
         <p>
@@ -168,14 +171,14 @@
       
       <subsection name="Installing Pluto Manually">
         <p>
-        This section documents the manual installation of Pluto into Tomcat. It replaces 
+        This section documents the manual installation of Pluto 1.1 and 2.0 into Tomcat. It replaces 
         the pluto:install goal, but requires that the built-in Maven 2 install goal 
-        (<code>mvn install</code>) be run from <code>&lt;PLUTO-1.1-SRCHOME&gt;</code>.
+        (<code>mvn install</code>) be run from <code>&lt;PLUTO_SRCHOME&gt;</code>.
         </p>
         <p>
           <b>Step 1:</b>
           <source><![CDATA[
-$> cd <PLUTO-1.1-SRCHOME>
+$> cd <PLUTO_SRCHOME>
 $> mvn install
           ]]></source>
         </p>
@@ -183,16 +186,24 @@
           <b>Step 2:</b> Copy the following to
           <code>&lt;TOMCAT_HOME&gt;/shared/lib</code>:
           <ul>
-            <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>
+            <li>activation-1.1.jar (Pluto 2.0 only)</li>
+            <li>castor-1.1.1.jar</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>
+            <li>ccpp-1.0.jar (Pluto 2.0 only)</li>
+            <li>stax-1.2.0.jar (Pluto 2.0 only)</li>
+            <li>stax-api-1.0.1.jar (Pluto 2.0 only)</li>
+            <li>xercesImpl-2.6.2.jar (Pluto 2.0 only)</li>
+            <li>xmlParserAPIs-2.6.2.jar (Pluto 2.0 only)</li>
+            <li>pluto-container-x.x.x.jar (x.x.x is the version of Pluto you built)</li>
+            <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>
           </ul>
         </p>
         <p>
-          <b>Step 3:</b> Copy the following to
+          <b>Step 3:</b> For Pluto 1.1, copy the following to
           <code>&lt;TOMCAT_HOME&gt;/common/endorsed</code>:
           <ul>
             <li>xercesImpl-2.6.2.jar</li>
@@ -217,14 +228,6 @@
         </p>
       </subsection>
       
-      <subsection name="Installing Pluto with a Windows EXE">
-        <p>
-          The NSIS Installer is not yet complete, but we hope to have a fully
-          functional one soon.  Anyone is more than welcome to assist us in
-          this process.
-        </p>
-      </subsection>
-          
     <subsection name="Configuring Source-Built Pluto for Application Scope PortletSession Attributes">
     <p>To be able to use application-scoped <code>PortletSession</code> attributes in Pluto, modify
     the Connector element for port 8080 in <code>&lt;TOMCAT_HOME&gt;/conf/server.xml</code> by

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/xdoc/v11/subprojects.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/xdoc/v11/subprojects.xml?rev=609156&r1=609155&r2=609156&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/xdoc/v11/subprojects.xml (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-site/src/site/xdoc/v11/subprojects.xml Sat Jan  5 07:42:00 2008
@@ -28,7 +28,7 @@
     <section name="Pluto Subprojects">
       
       <p>
-        Pluto 1.1 utilizes Maven 2 as it's project management and build
+        Pluto 1.1 and 2.0 utilizes Maven 2 as it's project management and build
         automation tool.  Pluto follows maven's best practices and is organized
         into modules or subprojects.
       </p>