portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r514329 [7/7] - in /portals/jetspeed-2/trunk/xdocs: ./ guides/ style/
Date Sun, 04 Mar 2007 02:13:24 GMT
Modified: portals/jetspeed-2/trunk/xdocs/guides/guide-tomcat-sso-cross-context-j2-realm.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/xdocs/guides/guide-tomcat-sso-cross-context-j2-realm.xml?view=diff&rev=514329&r1=514328&r2=514329
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/guides/guide-tomcat-sso-cross-context-j2-realm.xml (original)
+++ portals/jetspeed-2/trunk/xdocs/guides/guide-tomcat-sso-cross-context-j2-realm.xml Sat Mar  3 18:13:22 2007
@@ -1,101 +1,101 @@
-<?xml version="1.0"?>
-<!--
-	Copyright 2006 The Apache Software Foundation
-	
-	Licensed 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.
--->
-<document>
-	<properties>
-		<title>Tomcat SSO and Cross Context Webapps Guide</title>
-		<subtitle>Documentation for using the Jetspeed Authentication accross multiple webapps running in the same Tomcat container</subtitle>
-		<authors>
-			<person name="Philip Mark Donaghy" email="philip.donaghy@gmail.com" />
-		</authors>
-	</properties>
-	<body>
-		<section name="Sharing the Jetspeed Realm Across Tomcat Webapps">
-			<p>
-				This guide provides a tutorial for creating a shared authentication Realm
-				between multiple webapps running in the same Tomcat(&gt;=5.5) container.
-			</p>
-			<subsection name="1. The Jetspeed Realm">
-				<p>
-				Realms are configured in the Engine element of $CATALINA_HOME/conf/server.xml. Move the Jetspeed Realm element from $CATALINA_HOME/conf/Catalina/localhost/jetspeed.xml to $CATALINA_HOME/conf/server.xml replacng or commenting out the UserDatabase Realm. 
-				<source><![CDATA[
-<Realm className="org.apache.catalina.realm.JAASRealm"
-           appName="Jetspeed"
-           userClassNames="org.apache.jetspeed.security.impl.UserPrincipalImpl"
-           roleClassNames="org.apache.jetspeed.security.impl.RolePrincipalImpl"
-           useContextClassLoader="false"
-           debug="0"/>]]>
-				</source>
-				</p>
-			</subsection>
-			<subsection name="2. Enable the Tomcat SingleSignOn Valve">
-			<p>
-			Uncomment the Tomcat single sign on Valve in $CATALINA_HOME/conf/server.xml.
-			<source><![CDATA[
-<Host name="localhost" appBase="webapps">
-    <!-- Enable tomcat SSO *** -->
-    <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
-</Host>]]>
-			</source>
-			</p>
-			</subsection>
-			<subsection name="3. Each web.xml">
-			<p>
-			Create a security-constraint in each webapp web.xml descriptor.
-			<source><![CDATA[
-  <security-constraint>
-    <web-resource-collection>
-       <web-resource-name>Whatever</web-resource-name>
-       <url-pattern>/*</url-pattern>
-    </web-resource-collection>
-    <auth-constraint>
-      <role-name>manager</role-name>
-    </auth-constraint>
-  </security-constraint>
-
-  <!-- Define the Login Configuration for this Application -->
-  <login-config>
-    <auth-method>BASIC</auth-method>
-    <realm-name>Jetspeed</realm-name>
-  </login-config>
-
-  <!-- Security roles referenced by this web application -->
-  <security-role>
-    <description>
-        The role that is required to log in to the Manager Application
-    </description>
-    <role-name>manager</role-name>
-  </security-role>]]>
-			</source>
-			</p>
-			</subsection>
-			<subsection name="4. Known Issues">
-			<p>
-			1. The default Tomcat Realm must be replaced, removed, or commented out. A known side effect of this prevents the Tomcat manager application from working. It can be resolved by using the Jetspeed realm in $CATALINA_HOME/server/webapps/manager/manager.xml.
-			<source><![CDATA[
-  <login-config>
-    <auth-method>BASIC</auth-method>
-    <realm-name>Jetspeed</realm-name>
-  </login-config>]]>
-			</source>
-			</p>
-			<p>
-			2. Authentication must be made in Jetspeed before accessing other webapps.
-			</p>
-			</subsection>
-		</section>
-	</body>
-</document>
+<?xml version="1.0"?>
+<!--
+	Copyright 2006 The Apache Software Foundation
+	
+	Licensed 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.
+-->
+<document>
+	<properties>
+		<title>Tomcat SSO and Cross Context Webapps Guide</title>
+		<subtitle>Documentation for using the Jetspeed Authentication accross multiple webapps running in the same Tomcat container</subtitle>
+		<authors>
+			<person name="Philip Mark Donaghy" email="philip.donaghy@gmail.com" />
+		</authors>
+	</properties>
+	<body>
+		<section name="Sharing the Jetspeed Realm Across Tomcat Webapps">
+			<p>
+				This guide provides a tutorial for creating a shared authentication Realm
+				between multiple webapps running in the same Tomcat(&gt;=5.5) container.
+			</p>
+			<subsection name="1. The Jetspeed Realm">
+				<p>
+				Realms are configured in the Engine element of $CATALINA_HOME/conf/server.xml. Move the Jetspeed Realm element from $CATALINA_HOME/conf/Catalina/localhost/jetspeed.xml to $CATALINA_HOME/conf/server.xml replacng or commenting out the UserDatabase Realm. 
+				<source><![CDATA[
+<Realm className="org.apache.catalina.realm.JAASRealm"
+           appName="Jetspeed"
+           userClassNames="org.apache.jetspeed.security.impl.UserPrincipalImpl"
+           roleClassNames="org.apache.jetspeed.security.impl.RolePrincipalImpl"
+           useContextClassLoader="false"
+           debug="0"/>]]>
+				</source>
+				</p>
+			</subsection>
+			<subsection name="2. Enable the Tomcat SingleSignOn Valve">
+			<p>
+			Uncomment the Tomcat single sign on Valve in $CATALINA_HOME/conf/server.xml.
+			<source><![CDATA[
+<Host name="localhost" appBase="webapps">
+    <!-- Enable tomcat SSO *** -->
+    <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+</Host>]]>
+			</source>
+			</p>
+			</subsection>
+			<subsection name="3. Each web.xml">
+			<p>
+			Create a security-constraint in each webapp web.xml descriptor.
+			<source><![CDATA[
+  <security-constraint>
+    <web-resource-collection>
+       <web-resource-name>Whatever</web-resource-name>
+       <url-pattern>/*</url-pattern>
+    </web-resource-collection>
+    <auth-constraint>
+      <role-name>manager</role-name>
+    </auth-constraint>
+  </security-constraint>
+
+  <!-- Define the Login Configuration for this Application -->
+  <login-config>
+    <auth-method>BASIC</auth-method>
+    <realm-name>Jetspeed</realm-name>
+  </login-config>
+
+  <!-- Security roles referenced by this web application -->
+  <security-role>
+    <description>
+        The role that is required to log in to the Manager Application
+    </description>
+    <role-name>manager</role-name>
+  </security-role>]]>
+			</source>
+			</p>
+			</subsection>
+			<subsection name="4. Known Issues">
+			<p>
+			1. The default Tomcat Realm must be replaced, removed, or commented out. A known side effect of this prevents the Tomcat manager application from working. It can be resolved by using the Jetspeed realm in $CATALINA_HOME/server/webapps/manager/manager.xml.
+			<source><![CDATA[
+  <login-config>
+    <auth-method>BASIC</auth-method>
+    <realm-name>Jetspeed</realm-name>
+  </login-config>]]>
+			</source>
+			</p>
+			<p>
+			2. Authentication must be made in Jetspeed before accessing other webapps.
+			</p>
+			</subsection>
+		</section>
+	</body>
+</document>

Propchange: portals/jetspeed-2/trunk/xdocs/guides/guide-tomcat-sso-cross-context-j2-realm.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/trunk/xdocs/guides/guide-user-attributes.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/xdocs/guides/guide-user-attributes.xml?view=diff&rev=514329&r1=514328&r2=514329
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/guides/guide-user-attributes.xml (original)
+++ portals/jetspeed-2/trunk/xdocs/guides/guide-user-attributes.xml Sat Mar  3 18:13:22 2007
@@ -1,141 +1,141 @@
-<?xml version="1.0"?>
-<!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed 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.
--->
-<document>
-  <properties>
-    <title>Guide to Defining User Attributes</title>
-    <subtitle>PLT.17 User Information Configuration</subtitle>
-    <authors>
-      <person name="Ate Douma" email="ate@douma.nu"/>
-    </authors>
-  </properties>
-  <body>
-    <section name="Defining User Attributes">
-      <p>
-        The Portlet Specification defines how Portlet Applications can use User Attributes.<br/>
-        The attributes must be defined in the portlet.xml like (see PLT.17.1):</p>
-      <source><![CDATA[
-<portlet-app version="1.0" xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
-   <user-attribute>
-      <description>User Given Name</description>
-      <name>user.name.given</name>
-   </user-attribute>
-   <user-attribute>
-      <description>User Last Name</description>
-      <name>user.name.family</name>
-   </user-attribute>
-   <user-attribute>
-      <description>User eMail</description>
-      <name>user.home-info.online.email</name>
-   </user-attribute>
-   ...
-</portlet-app>]]></source>
-      <p>
-        Once attributes are defined like this, a portlet can access the current values for the logged on
-        user as an unmodifiable Map from the PortletRequest using the USER_INFO constant defined in the
-        PortletRequest interface (see PLT.17.2):</p>
-      <source>
-Map userInfo = (Map)request.getAttribute(PortletRequest.USER_INFO);
-String givenName = (userInfo!=null) ? (String)userInfo.get("user.name.given") : "";
-String lastName = (userInfo!=null) ? (String)userInfo.get("user.name.family") : "";
-String email = (userInfo!=null) ? (String)userInfo.get("user.home-info.online.email") : "";</source>
-      <p>
-        What is not defined by the Portlet Specification is <em>how</em> the Portal
-        must map the defined User Attributes to concrete attributes of a user.</p>
-    </section>
-    <section name="Mapping User Attributes">
-      <p>
-        Jetspeed-2 provides a very flexible way to define concrete User attributes and defining access to them.</p>
-      <p>
-        Concrete User attributes are stored using User Preferences for which Jetspeed-2 provides its own database
-        back end for storage (which is customizable by the way like almost any component of Jetspeed-2).  The user
-        attributes implementation leverages Jetspeed's 
-        <a href="../multiproject/jetspeed-prefs/index.html">java.util.prefs.Preferences</a> implementation.<br/>
-        The concrete User attributes are stored under a specific node in the User preferences and can contain
-        any named attribute at will.<br/>
-        These concrete User attributes can be mapped to the defined User Attributes in the portlet.xml in two ways:
-        <ol>
-          <li>
-            Using an exact match of attribute names 
-          </li>
-          <li>
-            Using a custom mapping definition in a jetspeed-portlet.xml 
-          </li>
-        </ol> 
-      </p>
-      <subsection name="Custom User Attribute Mapping">
-        <p>
-          If you write new Portlet Applications with Jetspeed-2 as target Portal, defining User Attributes which
-          match the concrete User attributes in the Portal usually will be quite straightforward<br/>
-          But, if you have an existing Portlet Application which you want to deploy on Jetspeed-2, there might
-          be a mismatch between the attribute names needed by the Portlet Application and the
-          concrete attribute names as stored in the Jetspeed-2 User Preferences.</p>
-        <p>
-          <em>
-            Note: The Portlet Specification defines a set of attribute names which are recommended to be used
-            in Appendix PLT.D.<br/>
-            Portlet Applications using these attribute names and Portals storing the concrete User attributes
-            also using these names won't need any custom attribute mapping as will be described below.<br/>
-            Although Jetspeed-2 allows a fully free definition of the concrete User attributes,
-            it is recommended to use these predefined attributes names as much as possible.</em></p>
-        <p>
-          The jetspeed-portlet.xml allows jetspeed specific configurations and customizations to be specified.<br/>
-          This deployment document isn't required, but will be processed if found within the WEB-INF folder of a 
-          Portlet Application war.<br/>
-          Jetspeed specific configurations must be defined using the "http://portals.apache.org/jetspeed" namespace.</p>
-        <p>
-          User attribute mapping is defined using an "user-attribute-ref" element containing a "name" element defining
-          the custom user attribute name and a "name-link" element defining the concrete attribute name to which it
-          is mapped:</p>
-        <source><![CDATA[
-<portlet-app version="1.0" 
-   xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" 
-   xmlns:js="http://portals.apache.org/jetspeed"> 
-   <js:user-attribute-ref>
-      <js:name>user-name-given</js:name>
-      <js:name-link>user.name.given</js:name-link>
-   </js:user-attribute>
-   <js:user-attribute-ref>
-      <js:name>user-name-family</js:name>
-      <js:name-link>user.name.family</js:name-link>
-   </js:user-attribute>
-   ...
-</portlet-app>]]></source>
-        <p>
-          Using the above custom mapping as an example, the Portlet can now access the user attributes as follows:</p>
-        <source>
-Map userInfo = (Map)request.getAttribute(PortletRequest.USER_INFO);
-String givenName = (userInfo!=null) ? (String)userInfo.get("user-name-given") : "";
-String lastName = (userInfo!=null) ? (String)userInfo.get("user-name-family") : "";
-String email = (userInfo!=null) ? (String)userInfo.get("user.home-info.online.email") : "";</source>
-        <p>
-          Note that the email attribute for which no custom mapping was defined still can be access using
-          exact name matching (provided the concrete attribute is defined for the logged on user).</p>
-      </subsection>  
-    </section>
-    <section name="Defining User Attributes in Jetspeed-2">
-      <p>
-        Jetspeed-2 is provided with several Administrative Portlets, including for User Management.<br/>
-        Using the User Management Portlets, it is very easy to define or modify concrete attributes for a user:</p>      
-      <img src="../images/definingUserAttributes.jpg"/>
-      <p>
-        The User Info Test demo Portlet, default deployed in Jetspeed-2 and displayed on the start page, uses
-        the above example User Attribute definitions and displays the values for the logged on user (also showing that
-        these can be accessed from both the PortletRequest as well as the HttpServletRequest from within a servlet):</p>
-      <img src="../images/usingUserAttributes.jpg"/>
-    </section>
-  </body>
-</document>
+<?xml version="1.0"?>
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed 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.
+-->
+<document>
+  <properties>
+    <title>Guide to Defining User Attributes</title>
+    <subtitle>PLT.17 User Information Configuration</subtitle>
+    <authors>
+      <person name="Ate Douma" email="ate@douma.nu"/>
+    </authors>
+  </properties>
+  <body>
+    <section name="Defining User Attributes">
+      <p>
+        The Portlet Specification defines how Portlet Applications can use User Attributes.<br/>
+        The attributes must be defined in the portlet.xml like (see PLT.17.1):</p>
+      <source><![CDATA[
+<portlet-app version="1.0" xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
+   <user-attribute>
+      <description>User Given Name</description>
+      <name>user.name.given</name>
+   </user-attribute>
+   <user-attribute>
+      <description>User Last Name</description>
+      <name>user.name.family</name>
+   </user-attribute>
+   <user-attribute>
+      <description>User eMail</description>
+      <name>user.home-info.online.email</name>
+   </user-attribute>
+   ...
+</portlet-app>]]></source>
+      <p>
+        Once attributes are defined like this, a portlet can access the current values for the logged on
+        user as an unmodifiable Map from the PortletRequest using the USER_INFO constant defined in the
+        PortletRequest interface (see PLT.17.2):</p>
+      <source>
+Map userInfo = (Map)request.getAttribute(PortletRequest.USER_INFO);
+String givenName = (userInfo!=null) ? (String)userInfo.get("user.name.given") : "";
+String lastName = (userInfo!=null) ? (String)userInfo.get("user.name.family") : "";
+String email = (userInfo!=null) ? (String)userInfo.get("user.home-info.online.email") : "";</source>
+      <p>
+        What is not defined by the Portlet Specification is <em>how</em> the Portal
+        must map the defined User Attributes to concrete attributes of a user.</p>
+    </section>
+    <section name="Mapping User Attributes">
+      <p>
+        Jetspeed-2 provides a very flexible way to define concrete User attributes and defining access to them.</p>
+      <p>
+        Concrete User attributes are stored using User Preferences for which Jetspeed-2 provides its own database
+        back end for storage (which is customizable by the way like almost any component of Jetspeed-2).  The user
+        attributes implementation leverages Jetspeed's 
+        <a href="../multiproject/jetspeed-prefs/index.html">java.util.prefs.Preferences</a> implementation.<br/>
+        The concrete User attributes are stored under a specific node in the User preferences and can contain
+        any named attribute at will.<br/>
+        These concrete User attributes can be mapped to the defined User Attributes in the portlet.xml in two ways:
+        <ol>
+          <li>
+            Using an exact match of attribute names 
+          </li>
+          <li>
+            Using a custom mapping definition in a jetspeed-portlet.xml 
+          </li>
+        </ol> 
+      </p>
+      <subsection name="Custom User Attribute Mapping">
+        <p>
+          If you write new Portlet Applications with Jetspeed-2 as target Portal, defining User Attributes which
+          match the concrete User attributes in the Portal usually will be quite straightforward<br/>
+          But, if you have an existing Portlet Application which you want to deploy on Jetspeed-2, there might
+          be a mismatch between the attribute names needed by the Portlet Application and the
+          concrete attribute names as stored in the Jetspeed-2 User Preferences.</p>
+        <p>
+          <em>
+            Note: The Portlet Specification defines a set of attribute names which are recommended to be used
+            in Appendix PLT.D.<br/>
+            Portlet Applications using these attribute names and Portals storing the concrete User attributes
+            also using these names won't need any custom attribute mapping as will be described below.<br/>
+            Although Jetspeed-2 allows a fully free definition of the concrete User attributes,
+            it is recommended to use these predefined attributes names as much as possible.</em></p>
+        <p>
+          The jetspeed-portlet.xml allows jetspeed specific configurations and customizations to be specified.<br/>
+          This deployment document isn't required, but will be processed if found within the WEB-INF folder of a 
+          Portlet Application war.<br/>
+          Jetspeed specific configurations must be defined using the "http://portals.apache.org/jetspeed" namespace.</p>
+        <p>
+          User attribute mapping is defined using an "user-attribute-ref" element containing a "name" element defining
+          the custom user attribute name and a "name-link" element defining the concrete attribute name to which it
+          is mapped:</p>
+        <source><![CDATA[
+<portlet-app version="1.0" 
+   xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" 
+   xmlns:js="http://portals.apache.org/jetspeed"> 
+   <js:user-attribute-ref>
+      <js:name>user-name-given</js:name>
+      <js:name-link>user.name.given</js:name-link>
+   </js:user-attribute>
+   <js:user-attribute-ref>
+      <js:name>user-name-family</js:name>
+      <js:name-link>user.name.family</js:name-link>
+   </js:user-attribute>
+   ...
+</portlet-app>]]></source>
+        <p>
+          Using the above custom mapping as an example, the Portlet can now access the user attributes as follows:</p>
+        <source>
+Map userInfo = (Map)request.getAttribute(PortletRequest.USER_INFO);
+String givenName = (userInfo!=null) ? (String)userInfo.get("user-name-given") : "";
+String lastName = (userInfo!=null) ? (String)userInfo.get("user-name-family") : "";
+String email = (userInfo!=null) ? (String)userInfo.get("user.home-info.online.email") : "";</source>
+        <p>
+          Note that the email attribute for which no custom mapping was defined still can be access using
+          exact name matching (provided the concrete attribute is defined for the logged on user).</p>
+      </subsection>  
+    </section>
+    <section name="Defining User Attributes in Jetspeed-2">
+      <p>
+        Jetspeed-2 is provided with several Administrative Portlets, including for User Management.<br/>
+        Using the User Management Portlets, it is very easy to define or modify concrete attributes for a user:</p>      
+      <img src="../images/definingUserAttributes.jpg"/>
+      <p>
+        The User Info Test demo Portlet, default deployed in Jetspeed-2 and displayed on the start page, uses
+        the above example User Attribute definitions and displays the values for the logged on user (also showing that
+        these can be accessed from both the PortletRequest as well as the HttpServletRequest from within a servlet):</p>
+      <img src="../images/usingUserAttributes.jpg"/>
+    </section>
+  </body>
+</document>

Propchange: portals/jetspeed-2/trunk/xdocs/guides/guide-user-attributes.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/trunk/xdocs/how-to-help.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/xdocs/how-to-help.xml?view=diff&rev=514329&r1=514328&r2=514329
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/how-to-help.xml (original)
+++ portals/jetspeed-2/trunk/xdocs/how-to-help.xml Sat Mar  3 18:13:22 2007
@@ -1,78 +1,78 @@
-<?xml version="1.0"?>
-<!--
-	Copyright 2004 The Apache Software Foundation
-	
-	Licensed 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.
--->
-<document>
-	<properties>
-		<title>How to Help?</title>
-		<subtitle>How to Help?</subtitle>
-		<authors>
-			<person name="David Le Strat" email="dlestrat@apache.org" />
-		</authors>
-	</properties>
-	<body>
-		<section name="How to Help?">
-		<subsection name="Simple Things I Can Do to Help">
-		<p>
-		There are many ways to help with Jetspeed-2 as with most open source projects:
-		<ul>
-		<li>Subscribe to the <a href="mail-lists.html">user mailing list</a> and help answer questions from the community.
-		In open source a thriving community makes the project successful.  Don't be shy to ask basic questions, we have all
-		been there.</li>
-		<li>Report bugs and issues that you encounter in <a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10492">Jetspeed-2 bug tracking system</a>.
-		Prior to reporting a bug, make sure to discuss the issue on the <a href="mail-lists.html">user mailing list</a> or even the 
-		<a href="mail-lists.html">developer mailing list</a>.</li>
-		<li>When you encounter an issue, you may be compelled to fix it.  We encourage this as this makes for a vibrant
-		community.  Once you have a fix, <a href="guides/guide-j2-development.html">submit a patch</a> on the reporting issue.</li>
-		</ul>
-		</p>
-		</subsection>
-		<subsection name="Why Should I Get Involved?">
-		<p>
-		There are many reasons why you want to help, just a few strong points:
-		<ul>
-		<li>If you help others solve there issues, they will most likely help you when you run into some problems.</li>
-		<li>By contributing patches, you can influence the prioritization of functionality and get your changes incorporated.</li>
-		<li>By reporting issues, you help Jetspeed-2 become a stronger project and improve its quality overall.</li>
-		<li>You will meet and get to know great people as well as share and learn best practices which will help you on
-		your project.</li>
-		</ul>
-		We are looking forward to have you part of our community!
-		</p>
-		</subsection>
-		<subsection name="How do I Join the Project?">
-		<p>
-		Projects at Apache operate under a <a href="http://www.apache.org/foundation/how-it-works.html#meritocracy">meritocracy</a>.
-		To become a committer, you first need to demonstrate your committment.  The best way to do so is to start contributing patch,
-		participate in the community and make your interest known.  It takes time and willingness to help and contribute!  This may
-		seem a bit intimidating at first, but the community will always help people who show interest and committment.
-		</p>
-		</subsection>
-		<subection name="Other Resources for Help">
-		<p>
-		Here are some useful links for other resources for help.
-		<ul>
-		<li><a href="http://portals.apache.org/development/code-standards.html">Portals project coding standards</a>.</li>
-		<li><a href="http://portals.apache.org/development/documentation.html">Portals project documentation standards</a>.</li>
-		<li><a href="http://www.apache.org/foundation/how-it-works.html">How does the Apache Software Foundation work</a>?</li>
-		<li><a href="http://people.apache.org/~coar/mlists.html#portals.apache.org">Portals mailing lists statistics</a>.  This can be helpful
-		to help you decide which mailing list to subscribe to.</li>
-		</ul>
-		</p>
-		</subection>
-		</section>
-	</body>
-</document>
-
+<?xml version="1.0"?>
+<!--
+	Copyright 2004 The Apache Software Foundation
+	
+	Licensed 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.
+-->
+<document>
+	<properties>
+		<title>How to Help?</title>
+		<subtitle>How to Help?</subtitle>
+		<authors>
+			<person name="David Le Strat" email="dlestrat@apache.org" />
+		</authors>
+	</properties>
+	<body>
+		<section name="How to Help?">
+		<subsection name="Simple Things I Can Do to Help">
+		<p>
+		There are many ways to help with Jetspeed-2 as with most open source projects:
+		<ul>
+		<li>Subscribe to the <a href="mail-lists.html">user mailing list</a> and help answer questions from the community.
+		In open source a thriving community makes the project successful.  Don't be shy to ask basic questions, we have all
+		been there.</li>
+		<li>Report bugs and issues that you encounter in <a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10492">Jetspeed-2 bug tracking system</a>.
+		Prior to reporting a bug, make sure to discuss the issue on the <a href="mail-lists.html">user mailing list</a> or even the 
+		<a href="mail-lists.html">developer mailing list</a>.</li>
+		<li>When you encounter an issue, you may be compelled to fix it.  We encourage this as this makes for a vibrant
+		community.  Once you have a fix, <a href="guides/guide-j2-development.html">submit a patch</a> on the reporting issue.</li>
+		</ul>
+		</p>
+		</subsection>
+		<subsection name="Why Should I Get Involved?">
+		<p>
+		There are many reasons why you want to help, just a few strong points:
+		<ul>
+		<li>If you help others solve there issues, they will most likely help you when you run into some problems.</li>
+		<li>By contributing patches, you can influence the prioritization of functionality and get your changes incorporated.</li>
+		<li>By reporting issues, you help Jetspeed-2 become a stronger project and improve its quality overall.</li>
+		<li>You will meet and get to know great people as well as share and learn best practices which will help you on
+		your project.</li>
+		</ul>
+		We are looking forward to have you part of our community!
+		</p>
+		</subsection>
+		<subsection name="How do I Join the Project?">
+		<p>
+		Projects at Apache operate under a <a href="http://www.apache.org/foundation/how-it-works.html#meritocracy">meritocracy</a>.
+		To become a committer, you first need to demonstrate your committment.  The best way to do so is to start contributing patch,
+		participate in the community and make your interest known.  It takes time and willingness to help and contribute!  This may
+		seem a bit intimidating at first, but the community will always help people who show interest and committment.
+		</p>
+		</subsection>
+		<subection name="Other Resources for Help">
+		<p>
+		Here are some useful links for other resources for help.
+		<ul>
+		<li><a href="http://portals.apache.org/development/code-standards.html">Portals project coding standards</a>.</li>
+		<li><a href="http://portals.apache.org/development/documentation.html">Portals project documentation standards</a>.</li>
+		<li><a href="http://www.apache.org/foundation/how-it-works.html">How does the Apache Software Foundation work</a>?</li>
+		<li><a href="http://people.apache.org/~coar/mlists.html#portals.apache.org">Portals mailing lists statistics</a>.  This can be helpful
+		to help you decide which mailing list to subscribe to.</li>
+		</ul>
+		</p>
+		</subection>
+		</section>
+	</body>
+</document>
+

Propchange: portals/jetspeed-2/trunk/xdocs/how-to-help.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/trunk/xdocs/j1-users.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/xdocs/j1-users.xml?view=diff&rev=514329&r1=514328&r2=514329
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/j1-users.xml (original)
+++ portals/jetspeed-2/trunk/xdocs/j1-users.xml Sat Mar  3 18:13:22 2007
@@ -1,216 +1,216 @@
-<?xml version="1.0"?>
-<!--
-	Copyright 2004 The Apache Software Foundation
-	
-	Licensed 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.
--->
-<document>
-	<properties>
-		<title>For Jetspeed-1 Users</title>
-		<subtitle>For Jetspeed-1 Users</subtitle>
-		<authors>
-			<person name="David Le Strat" email="dlestrat@apache.org" />
-		</authors>
-	</properties>
-	<body>
-		<section name="For Jetspeed-1 Users">
-	    <p>Jetspeed-2 is a new project, written from groundup and does not have any dependencies on Jetspeed-1.		   
-		   Jetspeed-2 is based on industry standards, designed for high-volume enterprise portals applications.
-		   The foremost difference is Jetspeeds Component Oriented Architecture, all assembled together with Spring.
-		   Components replace Turbine services with a standardized component model. 
-		   Deployment of new portlet applications, which was completely missing in Jetspeed-1, 
-		   is implemented to the Portlet API specification. Turbines file-based configuration 
-		   for properties are replaced managed components. Jetspeed-2 is fully decoupled from 
-		   the legacy projects that were intertwined in the Jetspeed-1 architecture.
-		   </p>
-		</section>
-		<section name="Whats New in Jetspeed-2">
-			<ul>
-			<li>1.	Fully Compliant with Java Portlet API Standard</li>
-			<li>2.	Separation of Portlet Applications From Portal</li>
-			<li>3.	Live Deployment Model for Portlet Applications and Portal Layouts</li>
-			<li>4.	Spring Component Based Architecture</li>
-			<li>5.	Multi-threaded Portlet Aggregation Engine</li>
-			<li>6.	Scalable Architecture</li>
-			<li>7.	Pipeline-based Request Processing</li>
-			<li>8.	JAAS Security</li>
-			<li>9.	Bridges Integration with Struts, JSF, PHP, Perl, Velocity</li>
-			<li>19.	CMS-based Site Navigations</li>	
-		</ul>				
-		</section>
-		<section name="Whats the same in Jetspeed-2">		
-			<p>Not much.</p>
-			<p>
-			In fact Jetspeed-2 does not re-use any of the code in Jetspeed-1. 
-			Some concepts are continued in Jetspeed-2, but with new design and implementations. 
-			The table below shows some of the concepts continued in Jetspeed-2 from Jetspeed-1. 
-			Note that even though the concepts are continued, they are have changed, 
-			in some cases significantly:
-				</p>
-			<ul>
-			<li>1.	PSML  -  Portlet Structured Markup Language. 
-				    Defines the layout of portlets on a page. 
-				    While the purpose is still the same, the XML format has changed. 
-				    Porting is possible, requires a migration tool. 
-				    PSML now fits into an overall Jetspeed Navigation Site as a page-type resource.
-				    No PSML porting tool is currently available. However, an XSLT transform could be a good choice.
-			</li>	
-			<li>2.	Portal Wide Security Policy and Constraints  -  Jetspeed-2 has two kinds of security 
-				    mechanisms: JAAS-based security policies, and declarative security constraints 
-				    much like Jetspeed-1 constraints. Where as Jetspeed-1 constraints were limited
-				    to PSML, Jetspeed-2 declarative security constraints are also applied to folders
-				    and links.</li>
-			<li>3.	Portlets  -  Portlets now must adhere to the new Portlet API. 
-				    No porting tool is currently available. 
-				    The Jetspeed-1 Portlet API will not be continued in Jetspeed-2.
-				    </li>
-			<li>4.  Turbine Services are out (Fulcrum). Jetspeed-2 is based on Spring components.</li>	
-			<li>5.  Registries  -  The Jetspeed-1 Registries are discontinued in Jetspeed-2. 
-				    All portlets are now stored in a Registry database in Jetspeed-2. 
-				    No porting tool is available. 
-				    Recommend converting your portlets to JSR-168 portlets, 
-				   packaging all portlets in a portlet application, 
-				   and deploying as standard WAR file. 
-				   Other registries are all deprecated.</li>
-			<li>6. JSP and Velocity Templates  -  Templates can be re-used to some extend. 
-				   Any references to Rundata or any other Turbine or Jetspeed-1 tools or 
-				   tags must be converted.</li>				
-			<li>7. Controls and Controllers  -  These concepts have changed, and are now called 
-				   decorators and layouts. The Turbine module concept, which backed controls 
-				   and controllers, is no longer supported. Layouts and decorators are now 
-				   only implemented as portlets, or as just plain markup. Layouts and templates 
-				   can be deployed to the portal as a deployable unit.</li>
-			<li>8. Jetspeed Configurations and Jetspeed Component Assemblies replace Property Files. 
-				   Component (services) should be assembled, not defined in property files. 
-				   Many of the features in Jetspeed-1 were represented as read-only properties in 
-				   the Jetspeed-1 static property files. Jetspeed-2 components can be configured with JMX.</li>
-			</ul>
-			</section>
-			<section name='Turbine Gone'>
-				<p>
-				Jetspeed-1 is tightly coupled to the Turbine MVC-2 framework, and this coupling permeates 
-				many areas of the Jetspeed API.  Jetspeed-2 does not rely on Turbine as the MVC-2 controller. 
-				Instead, we follow the separation of concerns pattern, and concentrates on doing one thing and doing it well. 
-				That is, implementing a portal. Where as Jetspeed-1 coupled MVC Controller, portal engine, and portlet container 
-				all into one deeply coupled servlet, Jetspeed-2 separates these concerns clearly in its architecture. 
-				The portal engine is Jetspeed-2. It is the MVC for page aggregation, leveraging the dispatching nature 
-				of the servlet architecture, and delegating the actual rendering of portlets to portlet application frameworks.  
-				These portlet applications can in turn have their own MVC frameworks, such as Struts portlet applications, 
-				JSF portlet applications, or Turbine portlet application frameworks.				
-				</p>
-			</section>
-		    <section name='RunData No More'>
-				<p>
-				Most notably missing from Portlet API portlets is the RunData class. 
-				The Jetspeed-1 API uses the RunData class ubiquitously, serving as a wrapper for both the servlet request and response. 
-				Other dependencies on Turbine include Portlet Actions, Portlet Aggregation Engine (ECS), 
-				the Service Architecture, Configuration and Turbine Modules. None of these exist in the newer version.
-				</p>					
-				<table>
-					<tr>
-					<th>Jetspeed-1</th>
-					<th>Jetspeed-2</th>
-					</tr>	
-					<tr>
-						<td>Run Data</td>
-						<td>Portlet API: Portlet Request and Portlet Response</td>						
-					</tr>
-					<tr>
-						<td>Portlet Aggregation Engine (ECS)</td>
-						<td>Jetspeed-2 Multi-threaded Portlet Container Engine</td>						
-					</tr>
-					<tr>
-						<td>Turbine Service Architecture</td>
-						<td>Jetspeed-2 Components</td>						
-					</tr>
-					<tr>
-						<td>Property Configuration Files</td>
-						<td>Spring Configurations, JMX</td>						
-					</tr>
-					<tr>
-						<td>Turbine Modules (Actions)</td>
-						<td>Portlet API Actions </td>						
-					</tr>
-					
-				</table>
-			</section>
-			<section name='Pluto is the Portlet Container'>
-				<p>The Jetspeed-2 portal does not implement the Portlet container. 
-					<a href='http://portals.apache.org/pluto'>Pluto</a> implements the JSR 168 interface 
-					contract for portlets running inside our portal.
-					The Pluto container handles all communication with portlets for the portal. 														
-				</p>					
-			</section>
-		    <section name='Aggregating, Isnt It?'>
-				<p>The aggregation engine and the Jetspeed-1 Portlet API are both coupled to a deprecated Jakarta package ECS 
-					(Element Construction Set). ECS generates HTML with Java code, storing the content in temporary 
-					Java objects before sending the HTML out to the servlet output stream. This wasteful use of Java objects 
-					leads to fragmentation on memory, accelerated garbage collection, and paging in high volume sites. 
-					The servlet API clearly provides a content stream for streaming out portlet content.  Jetspeed-2 models 
-					its aggregation engine upon the Portlet APIs streams and readers, analogous to the stream-based Servlet 
-					API for rendering content.</p>
-			</section>
-		    <section name='State and Life Cycle'>
-				<p>The Portlet API clearly defines the lifecycle of a portlet, the event sequences for actions, 
-				   and how the container can cache content from a portlet. The Portlet Lifecycle was not clearly 
-				   defined in Jetspeed-1. The portlet API clearly states that only one instance of a portlet will 
-				   reside in memory inside a container. The state of the portlet is directly related to the servlet state 
-				   for the current user session. While this may seem obvious, portlet state and lifetime was not clearly 
-				   defined in Jetspeed-1.					
-				</p>
-			</section>
-			<section name='Actions'>
-				<p>In version 1, actions were coupled to Turbine and not properly integrated into the Portlet class. 
-					In fact, actions were separate objects from portlets. In the Portlet API, actions are methods on the portlet. 
-					Action event handling and sequencing is clearly defined in the specification.</p>
-			</section>
-		    <section name='Standard Deployment'>
-				<p>Jetspeed-1 does not have a standardized method of deploying portlets and their supporting files, 
-					commonly referred to as portlet applications. In order to import an application, one must package 
-					registry files, class and jar files, PSML and templates so that they match the Jetspeed web application format.</p>
-				<p>In Jetspeed-2, the Portlet API defines a standard deployment descriptor for deploying Portal Applications into Jetspeed. 
-					Portal applications must be deployed to the portal. Analogous to the servlets packaged in a web-application (WAR)
-					 deployment model, portals support portlets packaged in a portal-application deployment model. 
-					The Portal Application archive follows the same format as the WAR format defined in the Servlet specification 
-					with an additional Portlet deployment descriptor file. The clear advantage in Jetspeed-2 is the ability to deploy 
-					live portlet applications to the server in a standardized format.</p>
-			</section>
-		    <section name='Resources and Deployment'>
-				<p>Jetspeed-1 resources such as portal templates, images, skins, controllers, controls, are all merged into the single 
-				   Jetspeed web application with no deployment model. For example, to override the default skin or top banner, the 
-				   resource files are copied into the portal directory, property files updated to point to the new resources, and the 
-				   server must be restarted. This made for the process of tailoring Jetspeed-1 portals to real production portals 
-				   a process of property and file merging. In fact Jetspeed-1 now has a Maven plug-in to manage production portals 
-				   separately from the core Jetspeed-1 portal. The need for this kind of tool covers up the fact that Jetspeed-1 
-					is missing a good deployment model for portal resources, requiring difficult portal maintenance procedures.</p>
-				<p>For a Jetspeed-2 production portal, portal resources are packaged in a Jetspeed-specific archive format. 
-					Thus portal resources (top banners, skins, images, style sheets) can all be deployed to dynamically tailor 
-					the portal at runtime.</p>
-			</section>
-		    <section name='the Standard'>
-				<p>JSR168 is the Portlet specification enables interoperability between Portlets and Portals. 
-					The specification defines a set of APIs that addresses standardization of portlet aggregation, 
-					personalization, presentation and security.  The goals of JSR168 are to: </p>
-				<ul>
-					<li>Define common Portal metaphor </li>
-					<li>Define a standard Portlet Java API </li>
-					<li>Ensure interoperability and portability</li>
-					<li>Enable multiple markups support </li>
-					<li>Ensure compatibility with other technologies </li>					
-				</ul>
-				<p>The Jetspeed-2 Portlet Server supports the JSR 168 standard. 
-				   This is an important initiative, introducing true portlet portability.</p>
-			</section>
-	</body>
-</document>
-
+<?xml version="1.0"?>
+<!--
+	Copyright 2004 The Apache Software Foundation
+	
+	Licensed 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.
+-->
+<document>
+	<properties>
+		<title>For Jetspeed-1 Users</title>
+		<subtitle>For Jetspeed-1 Users</subtitle>
+		<authors>
+			<person name="David Le Strat" email="dlestrat@apache.org" />
+		</authors>
+	</properties>
+	<body>
+		<section name="For Jetspeed-1 Users">
+	    <p>Jetspeed-2 is a new project, written from groundup and does not have any dependencies on Jetspeed-1.		   
+		   Jetspeed-2 is based on industry standards, designed for high-volume enterprise portals applications.
+		   The foremost difference is Jetspeeds Component Oriented Architecture, all assembled together with Spring.
+		   Components replace Turbine services with a standardized component model. 
+		   Deployment of new portlet applications, which was completely missing in Jetspeed-1, 
+		   is implemented to the Portlet API specification. Turbines file-based configuration 
+		   for properties are replaced managed components. Jetspeed-2 is fully decoupled from 
+		   the legacy projects that were intertwined in the Jetspeed-1 architecture.
+		   </p>
+		</section>
+		<section name="Whats New in Jetspeed-2">
+			<ul>
+			<li>1.	Fully Compliant with Java Portlet API Standard</li>
+			<li>2.	Separation of Portlet Applications From Portal</li>
+			<li>3.	Live Deployment Model for Portlet Applications and Portal Layouts</li>
+			<li>4.	Spring Component Based Architecture</li>
+			<li>5.	Multi-threaded Portlet Aggregation Engine</li>
+			<li>6.	Scalable Architecture</li>
+			<li>7.	Pipeline-based Request Processing</li>
+			<li>8.	JAAS Security</li>
+			<li>9.	Bridges Integration with Struts, JSF, PHP, Perl, Velocity</li>
+			<li>19.	CMS-based Site Navigations</li>	
+		</ul>				
+		</section>
+		<section name="Whats the same in Jetspeed-2">		
+			<p>Not much.</p>
+			<p>
+			In fact Jetspeed-2 does not re-use any of the code in Jetspeed-1. 
+			Some concepts are continued in Jetspeed-2, but with new design and implementations. 
+			The table below shows some of the concepts continued in Jetspeed-2 from Jetspeed-1. 
+			Note that even though the concepts are continued, they are have changed, 
+			in some cases significantly:
+				</p>
+			<ul>
+			<li>1.	PSML  -  Portlet Structured Markup Language. 
+				    Defines the layout of portlets on a page. 
+				    While the purpose is still the same, the XML format has changed. 
+				    Porting is possible, requires a migration tool. 
+				    PSML now fits into an overall Jetspeed Navigation Site as a page-type resource.
+				    No PSML porting tool is currently available. However, an XSLT transform could be a good choice.
+			</li>	
+			<li>2.	Portal Wide Security Policy and Constraints  -  Jetspeed-2 has two kinds of security 
+				    mechanisms: JAAS-based security policies, and declarative security constraints 
+				    much like Jetspeed-1 constraints. Where as Jetspeed-1 constraints were limited
+				    to PSML, Jetspeed-2 declarative security constraints are also applied to folders
+				    and links.</li>
+			<li>3.	Portlets  -  Portlets now must adhere to the new Portlet API. 
+				    No porting tool is currently available. 
+				    The Jetspeed-1 Portlet API will not be continued in Jetspeed-2.
+				    </li>
+			<li>4.  Turbine Services are out (Fulcrum). Jetspeed-2 is based on Spring components.</li>	
+			<li>5.  Registries  -  The Jetspeed-1 Registries are discontinued in Jetspeed-2. 
+				    All portlets are now stored in a Registry database in Jetspeed-2. 
+				    No porting tool is available. 
+				    Recommend converting your portlets to JSR-168 portlets, 
+				   packaging all portlets in a portlet application, 
+				   and deploying as standard WAR file. 
+				   Other registries are all deprecated.</li>
+			<li>6. JSP and Velocity Templates  -  Templates can be re-used to some extend. 
+				   Any references to Rundata or any other Turbine or Jetspeed-1 tools or 
+				   tags must be converted.</li>				
+			<li>7. Controls and Controllers  -  These concepts have changed, and are now called 
+				   decorators and layouts. The Turbine module concept, which backed controls 
+				   and controllers, is no longer supported. Layouts and decorators are now 
+				   only implemented as portlets, or as just plain markup. Layouts and templates 
+				   can be deployed to the portal as a deployable unit.</li>
+			<li>8. Jetspeed Configurations and Jetspeed Component Assemblies replace Property Files. 
+				   Component (services) should be assembled, not defined in property files. 
+				   Many of the features in Jetspeed-1 were represented as read-only properties in 
+				   the Jetspeed-1 static property files. Jetspeed-2 components can be configured with JMX.</li>
+			</ul>
+			</section>
+			<section name='Turbine Gone'>
+				<p>
+				Jetspeed-1 is tightly coupled to the Turbine MVC-2 framework, and this coupling permeates 
+				many areas of the Jetspeed API.  Jetspeed-2 does not rely on Turbine as the MVC-2 controller. 
+				Instead, we follow the separation of concerns pattern, and concentrates on doing one thing and doing it well. 
+				That is, implementing a portal. Where as Jetspeed-1 coupled MVC Controller, portal engine, and portlet container 
+				all into one deeply coupled servlet, Jetspeed-2 separates these concerns clearly in its architecture. 
+				The portal engine is Jetspeed-2. It is the MVC for page aggregation, leveraging the dispatching nature 
+				of the servlet architecture, and delegating the actual rendering of portlets to portlet application frameworks.  
+				These portlet applications can in turn have their own MVC frameworks, such as Struts portlet applications, 
+				JSF portlet applications, or Turbine portlet application frameworks.				
+				</p>
+			</section>
+		    <section name='RunData No More'>
+				<p>
+				Most notably missing from Portlet API portlets is the RunData class. 
+				The Jetspeed-1 API uses the RunData class ubiquitously, serving as a wrapper for both the servlet request and response. 
+				Other dependencies on Turbine include Portlet Actions, Portlet Aggregation Engine (ECS), 
+				the Service Architecture, Configuration and Turbine Modules. None of these exist in the newer version.
+				</p>					
+				<table>
+					<tr>
+					<th>Jetspeed-1</th>
+					<th>Jetspeed-2</th>
+					</tr>	
+					<tr>
+						<td>Run Data</td>
+						<td>Portlet API: Portlet Request and Portlet Response</td>						
+					</tr>
+					<tr>
+						<td>Portlet Aggregation Engine (ECS)</td>
+						<td>Jetspeed-2 Multi-threaded Portlet Container Engine</td>						
+					</tr>
+					<tr>
+						<td>Turbine Service Architecture</td>
+						<td>Jetspeed-2 Components</td>						
+					</tr>
+					<tr>
+						<td>Property Configuration Files</td>
+						<td>Spring Configurations, JMX</td>						
+					</tr>
+					<tr>
+						<td>Turbine Modules (Actions)</td>
+						<td>Portlet API Actions </td>						
+					</tr>
+					
+				</table>
+			</section>
+			<section name='Pluto is the Portlet Container'>
+				<p>The Jetspeed-2 portal does not implement the Portlet container. 
+					<a href='http://portals.apache.org/pluto'>Pluto</a> implements the JSR 168 interface 
+					contract for portlets running inside our portal.
+					The Pluto container handles all communication with portlets for the portal. 														
+				</p>					
+			</section>
+		    <section name='Aggregating, Isnt It?'>
+				<p>The aggregation engine and the Jetspeed-1 Portlet API are both coupled to a deprecated Jakarta package ECS 
+					(Element Construction Set). ECS generates HTML with Java code, storing the content in temporary 
+					Java objects before sending the HTML out to the servlet output stream. This wasteful use of Java objects 
+					leads to fragmentation on memory, accelerated garbage collection, and paging in high volume sites. 
+					The servlet API clearly provides a content stream for streaming out portlet content.  Jetspeed-2 models 
+					its aggregation engine upon the Portlet APIs streams and readers, analogous to the stream-based Servlet 
+					API for rendering content.</p>
+			</section>
+		    <section name='State and Life Cycle'>
+				<p>The Portlet API clearly defines the lifecycle of a portlet, the event sequences for actions, 
+				   and how the container can cache content from a portlet. The Portlet Lifecycle was not clearly 
+				   defined in Jetspeed-1. The portlet API clearly states that only one instance of a portlet will 
+				   reside in memory inside a container. The state of the portlet is directly related to the servlet state 
+				   for the current user session. While this may seem obvious, portlet state and lifetime was not clearly 
+				   defined in Jetspeed-1.					
+				</p>
+			</section>
+			<section name='Actions'>
+				<p>In version 1, actions were coupled to Turbine and not properly integrated into the Portlet class. 
+					In fact, actions were separate objects from portlets. In the Portlet API, actions are methods on the portlet. 
+					Action event handling and sequencing is clearly defined in the specification.</p>
+			</section>
+		    <section name='Standard Deployment'>
+				<p>Jetspeed-1 does not have a standardized method of deploying portlets and their supporting files, 
+					commonly referred to as portlet applications. In order to import an application, one must package 
+					registry files, class and jar files, PSML and templates so that they match the Jetspeed web application format.</p>
+				<p>In Jetspeed-2, the Portlet API defines a standard deployment descriptor for deploying Portal Applications into Jetspeed. 
+					Portal applications must be deployed to the portal. Analogous to the servlets packaged in a web-application (WAR)
+					 deployment model, portals support portlets packaged in a portal-application deployment model. 
+					The Portal Application archive follows the same format as the WAR format defined in the Servlet specification 
+					with an additional Portlet deployment descriptor file. The clear advantage in Jetspeed-2 is the ability to deploy 
+					live portlet applications to the server in a standardized format.</p>
+			</section>
+		    <section name='Resources and Deployment'>
+				<p>Jetspeed-1 resources such as portal templates, images, skins, controllers, controls, are all merged into the single 
+				   Jetspeed web application with no deployment model. For example, to override the default skin or top banner, the 
+				   resource files are copied into the portal directory, property files updated to point to the new resources, and the 
+				   server must be restarted. This made for the process of tailoring Jetspeed-1 portals to real production portals 
+				   a process of property and file merging. In fact Jetspeed-1 now has a Maven plug-in to manage production portals 
+				   separately from the core Jetspeed-1 portal. The need for this kind of tool covers up the fact that Jetspeed-1 
+					is missing a good deployment model for portal resources, requiring difficult portal maintenance procedures.</p>
+				<p>For a Jetspeed-2 production portal, portal resources are packaged in a Jetspeed-specific archive format. 
+					Thus portal resources (top banners, skins, images, style sheets) can all be deployed to dynamically tailor 
+					the portal at runtime.</p>
+			</section>
+		    <section name='the Standard'>
+				<p>JSR168 is the Portlet specification enables interoperability between Portlets and Portals. 
+					The specification defines a set of APIs that addresses standardization of portlet aggregation, 
+					personalization, presentation and security.  The goals of JSR168 are to: </p>
+				<ul>
+					<li>Define common Portal metaphor </li>
+					<li>Define a standard Portlet Java API </li>
+					<li>Ensure interoperability and portability</li>
+					<li>Enable multiple markups support </li>
+					<li>Ensure compatibility with other technologies </li>					
+				</ul>
+				<p>The Jetspeed-2 Portlet Server supports the JSR 168 standard. 
+				   This is an important initiative, introducing true portlet portability.</p>
+			</section>
+	</body>
+</document>
+

Propchange: portals/jetspeed-2/trunk/xdocs/j1-users.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/trunk/xdocs/jetspeed-eclipse.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/xdocs/jetspeed-eclipse.xml?view=diff&rev=514329&r1=514328&r2=514329
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/jetspeed-eclipse.xml (original)
+++ portals/jetspeed-2/trunk/xdocs/jetspeed-eclipse.xml Sat Mar  3 18:13:22 2007
@@ -1,63 +1,63 @@
-<?xml version="1.0"?>
-<!--
-	Copyright 2004 The Apache Software Foundation
-	
-	Licensed 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.
--->
-<document>
-	<properties>
-		<title>
-			Developing Jetspeed with Eclipse
-		</title>
-		<subtitle>How-to for Building and Debugging Jetspeed with Eclipse</subtitle>
-		<authors>
-			<person name="David Sean Taylor" email="taylor@apache.org" />
-		</authors>
-	</properties>
-	<body>
-		<section name="Developing with Eclipse">
-			<subsection name="The Eclipse Classpath">
-            <p>
-                Compiling, debugging, external dependencies, source code completion, searching, auto imports, all rely on a properly configured classpath. 
-                When you first create a project, a .classpath file is created in the projects root directory. 
-                With the Jetspeed source, we provide you with a ready-to-use Eclipse .classpath file.
-                We have already configured the relative source directories for you.
-                Eclipse provides a .classpath GUI editor from the Project->Properties menu option. 
-            </p>
-			</subsection>
-			<subsection name="JAR files and the Maven repository">
-				<p>
-                  Jetspeed requires quite a few JAR files to be able to compile.
-                  The .classpath file that comes with Jetspeed is setup to get its JAR files out of a local Maven repository.
-                  You can see all the JAR file dependencies from Eclipse. Go to Project->Properties->Java Build Path->Libraries.
-                  Notice all the JAR files are configured as VARIABLE library entries.
-                  Take one example: 
-					<source>
-                    MAVEN_REPO/commons-lang/jars/commons-lang-2.0.jar                            
-					</source>                    
-                  The Variable is portion is MAVEN_REPO.
-                  The Extension portion is /commons-lang/jars/commons-lang-2.0.jar
-                  Eclipse locates the JAR dependency from a Variable location root.
-                  In order for this classpath to work correctly, the variable root is dependent on a Maven-1 local repository file structure.
-				</p>
-				<p>
-                    To configure the MAVEN_REPO variable, go to Window->Preferences->Java->Build Path->Classpath Variables,
-                    click on New, and define a new variable named MAVEN_REPO, pointing it out the root of your local Maven-1 repository,
-                    usually someplace like your $$HOME/.maven/repository
-				</p>
-			</subsection>
-		</section>
-		<section name="Debugging with Eclipse">
-        </section>
-	</body>
-</document>
+<?xml version="1.0"?>
+<!--
+	Copyright 2004 The Apache Software Foundation
+	
+	Licensed 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.
+-->
+<document>
+	<properties>
+		<title>
+			Developing Jetspeed with Eclipse
+		</title>
+		<subtitle>How-to for Building and Debugging Jetspeed with Eclipse</subtitle>
+		<authors>
+			<person name="David Sean Taylor" email="taylor@apache.org" />
+		</authors>
+	</properties>
+	<body>
+		<section name="Developing with Eclipse">
+			<subsection name="The Eclipse Classpath">
+            <p>
+                Compiling, debugging, external dependencies, source code completion, searching, auto imports, all rely on a properly configured classpath. 
+                When you first create a project, a .classpath file is created in the projects root directory. 
+                With the Jetspeed source, we provide you with a ready-to-use Eclipse .classpath file.
+                We have already configured the relative source directories for you.
+                Eclipse provides a .classpath GUI editor from the Project->Properties menu option. 
+            </p>
+			</subsection>
+			<subsection name="JAR files and the Maven repository">
+				<p>
+                  Jetspeed requires quite a few JAR files to be able to compile.
+                  The .classpath file that comes with Jetspeed is setup to get its JAR files out of a local Maven repository.
+                  You can see all the JAR file dependencies from Eclipse. Go to Project->Properties->Java Build Path->Libraries.
+                  Notice all the JAR files are configured as VARIABLE library entries.
+                  Take one example: 
+					<source>
+                    MAVEN_REPO/commons-lang/jars/commons-lang-2.0.jar                            
+					</source>                    
+                  The Variable is portion is MAVEN_REPO.
+                  The Extension portion is /commons-lang/jars/commons-lang-2.0.jar
+                  Eclipse locates the JAR dependency from a Variable location root.
+                  In order for this classpath to work correctly, the variable root is dependent on a Maven-1 local repository file structure.
+				</p>
+				<p>
+                    To configure the MAVEN_REPO variable, go to Window->Preferences->Java->Build Path->Classpath Variables,
+                    click on New, and define a new variable named MAVEN_REPO, pointing it out the root of your local Maven-1 repository,
+                    usually someplace like your $$HOME/.maven/repository
+				</p>
+			</subsection>
+		</section>
+		<section name="Debugging with Eclipse">
+        </section>
+	</body>
+</document>

Propchange: portals/jetspeed-2/trunk/xdocs/jetspeed-eclipse.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/trunk/xdocs/portlets-community.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/xdocs/portlets-community.xml?view=diff&rev=514329&r1=514328&r2=514329
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/portlets-community.xml (original)
+++ portals/jetspeed-2/trunk/xdocs/portlets-community.xml Sat Mar  3 18:13:22 2007
@@ -1,55 +1,55 @@
-<?xml version="1.0"?>
-<!--
-	Copyright 2004 The Apache Software Foundation
-	
-	Licensed 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.
--->
-<document>
-	<properties>
-		<title>Portlets Community</title>
-		<subtitle>Portlets Community</subtitle>
-		<authors>
-			<person name="David Le Strat" email="dlestrat@apache.org" />
-		</authors>
-	</properties>
-	<body>
-		<section name="Portlets Community">
-		<table>
-          <tr>
-            <th>Project</th>
-            <th>Description</th>
-          </tr>
-          <tr>
-            <td><a href="https://gems.dev.java.net/"><img src="images/portlets/gems.gif" border="0" /></a></td>
-            <td><a href="https://gems.dev.java.net/">Gems</a> provides a collection of JSR-168 portlets.  The list of available portlets include:
-            <ul>
-            <li>E-Mail Portlet</li>
-			<li>Calendar Portlet</li>
-			<li>Blog Portlet</li>
-			<li>RSS Feed Portlet</li>
-			<li>Calculator Portlet</li>
-			<li>Image Viewer Portlet</li>
-			<li>Horoscope Portlet</li>
-            </ul></td>
-          </tr>
-          <tr>
-            <td><a href="http://sourceforge.jp/projects/pal/"><img src="http://pal.sourceforge.jp/images/pal-logo.png" border="0" /></a></td>
-            <td>
-              <a href="http://sourceforge.jp/projects/pal/">PAL</a> provides a useful JSR-168 portlets, such as File Manager, Blog, Yahoo! Japan Search portlets.
-            </td>
-          </tr>
-        </table>
-		</section>
-	</body>
-</document>
-
+<?xml version="1.0"?>
+<!--
+	Copyright 2004 The Apache Software Foundation
+	
+	Licensed 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.
+-->
+<document>
+	<properties>
+		<title>Portlets Community</title>
+		<subtitle>Portlets Community</subtitle>
+		<authors>
+			<person name="David Le Strat" email="dlestrat@apache.org" />
+		</authors>
+	</properties>
+	<body>
+		<section name="Portlets Community">
+		<table>
+          <tr>
+            <th>Project</th>
+            <th>Description</th>
+          </tr>
+          <tr>
+            <td><a href="https://gems.dev.java.net/"><img src="images/portlets/gems.gif" border="0" /></a></td>
+            <td><a href="https://gems.dev.java.net/">Gems</a> provides a collection of JSR-168 portlets.  The list of available portlets include:
+            <ul>
+            <li>E-Mail Portlet</li>
+			<li>Calendar Portlet</li>
+			<li>Blog Portlet</li>
+			<li>RSS Feed Portlet</li>
+			<li>Calculator Portlet</li>
+			<li>Image Viewer Portlet</li>
+			<li>Horoscope Portlet</li>
+            </ul></td>
+          </tr>
+          <tr>
+            <td><a href="http://sourceforge.jp/projects/pal/"><img src="http://pal.sourceforge.jp/images/pal-logo.png" border="0" /></a></td>
+            <td>
+              <a href="http://sourceforge.jp/projects/pal/">PAL</a> provides a useful JSR-168 portlets, such as File Manager, Blog, Yahoo! Japan Search portlets.
+            </td>
+          </tr>
+        </table>
+		</section>
+	</body>
+</document>
+

Propchange: portals/jetspeed-2/trunk/xdocs/portlets-community.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/xdocs/release-notes.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/trunk/xdocs/style/maven-j2.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/xdocs/style/maven-j2.css?view=diff&rev=514329&r1=514328&r2=514329
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/style/maven-j2.css (original)
+++ portals/jetspeed-2/trunk/xdocs/style/maven-j2.css Sat Mar  3 18:13:22 2007
@@ -1,212 +1,212 @@
-/*
----------------------- 
-Theme Style
-----------------------
-*/
-body {
-	background-color: #fff;
-	font-family: Verdana, Helvetica, Arial, sans-serif;
-	margin-left: auto;
-	margin-right: auto;
-	background-repeat: repeat-y;
-	font-size: 13px;
-	padding: 0px;
-}
-
-td,select,input,li {
-	font-family: Verdana, Helvetica, Arial, sans-serif;
-	font-size: 12px;
-	color: #333333;
-}
-
-code {
-	font-size: 12px;
-}
-
-a {
-	text-decoration: none;
-}
-
-a:link {
-	color: #47a;
-}
-
-a:visited {
-	color: #666666;
-}
-
-a:active,a:hover {
-	color: #990000;
-}
-
-#legend li.externalLink {
-	background: url(../images/external.png) left top no-repeat;
-	padding-left: 18px;
-}
-
-a.externalLink,a.externalLink:link,a.externalLink:visited,a.externalLink:active,a.externalLink:hover
-	{
-	background: url(../images/external.png) right center no-repeat;
-	padding-right: 18px;
-}
-
-#legend li.newWindow {
-	background: url(../images/newwindow.png) left top no-repeat;
-	padding-left: 18px;
-}
-
-a.newWindow,a.newWindow:link,a.newWindow:visited,a.newWindow:active,a.newWindow:hover
-	{
-	background: url(../images/newwindow.png) right center no-repeat;
-	padding-right: 18px;
-}
-
-h2 {
-	font-size: 17px;
-	color: #333333;
-}
-
-h3 {
-	padding: 4px 4px 4px 24px;
-	color: #666;
-	background-color: #ccc;
-	font-weight: bold;
-	font-size: 14px;
-	background-image: url(../images/h3.jpg);
-	background-repeat: no-repeat;
-	background-position: left bottom;
-}
-
-p {
-	line-height: 1.3em;
-	font-size: 12px;
-	color: #000;
-}
-
-#breadcrumbs {
-	height: 6px;
-	background-image: url(../images/breadcrumbs.jpg);
-	padding: 5px 10px 14px 20px;
-}
-
-* html #breadcrumbs {
-	padding-bottom: 8px;
-}
-
-#leftColumn {
-	margin: 10px 0 10px 0;
-	border-top-color: #ccc;
-	border-top-style: solid;
-	border-top-width: 1px;
-	border-right-color: #ccc;
-	border-right-style: solid;
-	border-right-width: 1px;
-	border-bottom-color: #ccc;
-	border-bottom-style: solid;
-	border-bottom-width: 1px;
-	padding-right: 5px;
-	padding-left: 5px;
-}
-
-#navcolumn h5 {
-	font-size: smaller;
-	border-bottom: 1px solid #aaaaaa;
-	padding-top: 2px;
-	padding-left: 9px;
-	color: #49635a;
-	background-image: url(../images/h5.jpg);
-	background-repeat: no-repeat;
-	background-position: left bottom;
-}
-
-table.bodyTable th {
-	color: white;
-	background-color: #bbb;
-	text-align: left;
-	font-weight: bold;
-}
-
-table.bodyTable th,table.bodyTable td {
-	font-size: 11px;
-}
-
-table.bodyTable tr.a {
-	background-color: #ddd;
-}
-
-table.bodyTable tr.b {
-	background-color: #eee;
-}
-
-.source {
-	border: 1px solid #999;
-	overflow: auto
-}
-
-dt {
-	padding: 4px 4px 4px 24px;
-	color: #333333;
-	background-color: #ccc;
-	font-weight: bold;
-	font-size: 14px;
-	background-image: url(../images/h3.jpg);
-	background-repeat: no-repeat;
-	background-position: left bottom;
-}
-
-.subsectionTitle {
-	font-size: 13px;
-	font-weight: bold;
-	color: #666;
-}
-
-table {
-	font-size: 10px;
-}
-
-.xright a:link,.xright a:visited,.xright a:active {
-	color: #666;
-}
-
-.xright a:hover {
-	color: #003300;
-}
-
-#banner {
-	height: 93px;
-	background: url(../images/banner.jpg);
-}
-
-#navcolumn ul {
-	margin: 5px 0 15px -0em;
-}
-
-#navcolumn ul a {
-	color: #333333;
-}
-
-#navcolumn ul a:hover {
-	color: red;
-}
-
-#intro {
-	border: solid #ccc 1px;
-	margin: 6px 0px 0px 0px;
-	padding: 10px 40px 10px 40px;
-}
-
-.subsection {
-	margin-left: 3px;
-	color: #333333;
-}
-
-.subsection p {
-	font-size: 12px;
-}
-
-#footer {
-	padding: 10px;
-	margin: 20px 0px 20px 0px;
-	border-top: solid #ccc 1px;
-	color: #333333;
+/*
+---------------------- 
+Theme Style
+----------------------
+*/
+body {
+	background-color: #fff;
+	font-family: Verdana, Helvetica, Arial, sans-serif;
+	margin-left: auto;
+	margin-right: auto;
+	background-repeat: repeat-y;
+	font-size: 13px;
+	padding: 0px;
+}
+
+td,select,input,li {
+	font-family: Verdana, Helvetica, Arial, sans-serif;
+	font-size: 12px;
+	color: #333333;
+}
+
+code {
+	font-size: 12px;
+}
+
+a {
+	text-decoration: none;
+}
+
+a:link {
+	color: #47a;
+}
+
+a:visited {
+	color: #666666;
+}
+
+a:active,a:hover {
+	color: #990000;
+}
+
+#legend li.externalLink {
+	background: url(../images/external.png) left top no-repeat;
+	padding-left: 18px;
+}
+
+a.externalLink,a.externalLink:link,a.externalLink:visited,a.externalLink:active,a.externalLink:hover
+	{
+	background: url(../images/external.png) right center no-repeat;
+	padding-right: 18px;
+}
+
+#legend li.newWindow {
+	background: url(../images/newwindow.png) left top no-repeat;
+	padding-left: 18px;
+}
+
+a.newWindow,a.newWindow:link,a.newWindow:visited,a.newWindow:active,a.newWindow:hover
+	{
+	background: url(../images/newwindow.png) right center no-repeat;
+	padding-right: 18px;
+}
+
+h2 {
+	font-size: 17px;
+	color: #333333;
+}
+
+h3 {
+	padding: 4px 4px 4px 24px;
+	color: #666;
+	background-color: #ccc;
+	font-weight: bold;
+	font-size: 14px;
+	background-image: url(../images/h3.jpg);
+	background-repeat: no-repeat;
+	background-position: left bottom;
+}
+
+p {
+	line-height: 1.3em;
+	font-size: 12px;
+	color: #000;
+}
+
+#breadcrumbs {
+	height: 6px;
+	background-image: url(../images/breadcrumbs.jpg);
+	padding: 5px 10px 14px 20px;
+}
+
+* html #breadcrumbs {
+	padding-bottom: 8px;
+}
+
+#leftColumn {
+	margin: 10px 0 10px 0;
+	border-top-color: #ccc;
+	border-top-style: solid;
+	border-top-width: 1px;
+	border-right-color: #ccc;
+	border-right-style: solid;
+	border-right-width: 1px;
+	border-bottom-color: #ccc;
+	border-bottom-style: solid;
+	border-bottom-width: 1px;
+	padding-right: 5px;
+	padding-left: 5px;
+}
+
+#navcolumn h5 {
+	font-size: smaller;
+	border-bottom: 1px solid #aaaaaa;
+	padding-top: 2px;
+	padding-left: 9px;
+	color: #49635a;
+	background-image: url(../images/h5.jpg);
+	background-repeat: no-repeat;
+	background-position: left bottom;
+}
+
+table.bodyTable th {
+	color: white;
+	background-color: #bbb;
+	text-align: left;
+	font-weight: bold;
+}
+
+table.bodyTable th,table.bodyTable td {
+	font-size: 11px;
+}
+
+table.bodyTable tr.a {
+	background-color: #ddd;
+}
+
+table.bodyTable tr.b {
+	background-color: #eee;
+}
+
+.source {
+	border: 1px solid #999;
+	overflow: auto
+}
+
+dt {
+	padding: 4px 4px 4px 24px;
+	color: #333333;
+	background-color: #ccc;
+	font-weight: bold;
+	font-size: 14px;
+	background-image: url(../images/h3.jpg);
+	background-repeat: no-repeat;
+	background-position: left bottom;
+}
+
+.subsectionTitle {
+	font-size: 13px;
+	font-weight: bold;
+	color: #666;
+}
+
+table {
+	font-size: 10px;
+}
+
+.xright a:link,.xright a:visited,.xright a:active {
+	color: #666;
+}
+
+.xright a:hover {
+	color: #003300;
+}
+
+#banner {
+	height: 93px;
+	background: url(../images/banner.jpg);
+}
+
+#navcolumn ul {
+	margin: 5px 0 15px -0em;
+}
+
+#navcolumn ul a {
+	color: #333333;
+}
+
+#navcolumn ul a:hover {
+	color: red;
+}
+
+#intro {
+	border: solid #ccc 1px;
+	margin: 6px 0px 0px 0px;
+	padding: 10px 40px 10px 40px;
+}
+
+.subsection {
+	margin-left: 3px;
+	color: #333333;
+}
+
+.subsection p {
+	font-size: 12px;
+}
+
+#footer {
+	padding: 10px;
+	margin: 20px 0px 20px 0px;
+	border-top: solid #ccc 1px;
+	color: #333333;
 }

Propchange: portals/jetspeed-2/trunk/xdocs/style/maven-j2.css
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/trunk/xdocs/style/project.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/xdocs/style/project.css?view=diff&rev=514329&r1=514328&r2=514329
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/style/project.css (original)
+++ portals/jetspeed-2/trunk/xdocs/style/project.css Sat Mar  3 18:13:22 2007
@@ -1,44 +1,44 @@
-/*
----------------------- 
-Project Style
-----------------------
-*/
-
-#downloadbox {
-	float: right;
-	margin: 0 10px 20px 20px;
-	padding: 5px;
-	border: 1px solid #999;
-	background-color: #eee;
-}
-
-#downloadbox {
-	float: right;
-	margin: 0 10px 20px 20px;
-	padding: 5px;
-	border: 1px solid #999;
-	background-color: #eee;
-}
-
-#downloadbox h5 {
-	color: #000;
-	margin: 0;
-	border-bottom: 1px solid #aaaaaa;
-	font-size: smaller;
-	padding: 0;
-}
-
-#downloadbox p {
-	margin-top: 1em;
-	margin-bottom: 0;
-}
-
-#downloadbox ul {
-	margin-top: 0;
-	margin-bottom: 1em;
-	list-style-type: disc;
-}
-
-#downloadbox li {
-	font-size: smaller;
+/*
+---------------------- 
+Project Style
+----------------------
+*/
+
+#downloadbox {
+	float: right;
+	margin: 0 10px 20px 20px;
+	padding: 5px;
+	border: 1px solid #999;
+	background-color: #eee;
+}
+
+#downloadbox {
+	float: right;
+	margin: 0 10px 20px 20px;
+	padding: 5px;
+	border: 1px solid #999;
+	background-color: #eee;
+}
+
+#downloadbox h5 {
+	color: #000;
+	margin: 0;
+	border-bottom: 1px solid #aaaaaa;
+	font-size: smaller;
+	padding: 0;
+}
+
+#downloadbox p {
+	margin-top: 1em;
+	margin-bottom: 0;
+}
+
+#downloadbox ul {
+	margin-top: 0;
+	margin-bottom: 1em;
+	list-style-type: disc;
+}
+
+#downloadbox li {
+	font-size: smaller;
 }

Propchange: portals/jetspeed-2/trunk/xdocs/style/project.css
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/trunk/xdocs/supporting-projects.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/xdocs/supporting-projects.xml?view=diff&rev=514329&r1=514328&r2=514329
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/supporting-projects.xml (original)
+++ portals/jetspeed-2/trunk/xdocs/supporting-projects.xml Sat Mar  3 18:13:22 2007
@@ -1,62 +1,62 @@
-<?xml version="1.0"?>
-<!--
-	Copyright 2004 The Apache Software Foundation
-	
-	Licensed 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.
--->
-<document>
-	<properties>
-		<title>Supporting Projects</title>
-		<subtitle>Supporting Projects</subtitle>
-		<authors>
-			<person name="David Le Strat" email="dlestrat@apache.org" />
-		</authors>
-	</properties>
-	<body>
-		<section name="Supporting Projects">
-		<table>
-          <tr>
-            <th>Project</th>
-            <th>Description</th>
-          </tr>
-          <tr>
-            <td><a href="http://db.apache.org/derby/"><img src="images/supporters/derby.gif" border="0" /></a></td>
-            <td><a href="http://db.apache.org/derby/">Derby</a> provides Jetspeed-2 default embedded database engine.</td>
-          </tr>
-          <tr>
-            <td><a href="http://directory.apache.org/subprojects/apacheds/index.html"><img src="images/supporters/directory.gif" border="0" /></a></td>
-            <td>Apache <a href="http://directory.apache.org/subprojects/apacheds/index.html">Directory Server</a> provides Jetspeed-2 default embedded LDAP engine.</td>
-          </tr>
-          <tr>
-            <td><a href="http://lucene.apache.org/"><img src="images/supporters/lucene.gif" border="0" /></a></td>
-            <td><a href="http://lucene.apache.org/">Lucene</a> provides Jetspeed-2 embedded search engine.</td>
-          </tr>
-          <tr>
-            <td><a href="http://db.apache.org/ojb/"><img src="images/supporters/ojb.gif" border="0" /></a></td>
-            <td><a href="http://db.apache.org/ojb/">OJB</a> provides Jetspeed-2 default persistence layer.  Jetspeed-2 uses
-            OJB's PersistenceBroker API.</td>
-          </tr>
-          <tr>
-            <td><a href="http://portals.apache.org/pluto/"><img src="images/supporters/pluto.gif" border="0" /></a></td>
-            <td><a href="http://portals.apache.org/pluto/">Pluto</a> provides Jetspeed-2 portlet container. 
-            Pluto is the Reference Implementation of the Java Portlet Specfication. </td>
-          </tr>
-          <tr>
-            <td><a href="http://www.springframework.org"><img src="images/supporters/springframework.gif" border="0" /></a></td>
-            <td>The <a href="http://www.springframework.org">Spring Framework</a> provides Jetspeed-2 default component framework.</td>
-          </tr>
-		</table>
-		</section>
-	</body>
-</document>
-
+<?xml version="1.0"?>
+<!--
+	Copyright 2004 The Apache Software Foundation
+	
+	Licensed 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.
+-->
+<document>
+	<properties>
+		<title>Supporting Projects</title>
+		<subtitle>Supporting Projects</subtitle>
+		<authors>
+			<person name="David Le Strat" email="dlestrat@apache.org" />
+		</authors>
+	</properties>
+	<body>
+		<section name="Supporting Projects">
+		<table>
+          <tr>
+            <th>Project</th>
+            <th>Description</th>
+          </tr>
+          <tr>
+            <td><a href="http://db.apache.org/derby/"><img src="images/supporters/derby.gif" border="0" /></a></td>
+            <td><a href="http://db.apache.org/derby/">Derby</a> provides Jetspeed-2 default embedded database engine.</td>
+          </tr>
+          <tr>
+            <td><a href="http://directory.apache.org/subprojects/apacheds/index.html"><img src="images/supporters/directory.gif" border="0" /></a></td>
+            <td>Apache <a href="http://directory.apache.org/subprojects/apacheds/index.html">Directory Server</a> provides Jetspeed-2 default embedded LDAP engine.</td>
+          </tr>
+          <tr>
+            <td><a href="http://lucene.apache.org/"><img src="images/supporters/lucene.gif" border="0" /></a></td>
+            <td><a href="http://lucene.apache.org/">Lucene</a> provides Jetspeed-2 embedded search engine.</td>
+          </tr>
+          <tr>
+            <td><a href="http://db.apache.org/ojb/"><img src="images/supporters/ojb.gif" border="0" /></a></td>
+            <td><a href="http://db.apache.org/ojb/">OJB</a> provides Jetspeed-2 default persistence layer.  Jetspeed-2 uses
+            OJB's PersistenceBroker API.</td>
+          </tr>
+          <tr>
+            <td><a href="http://portals.apache.org/pluto/"><img src="images/supporters/pluto.gif" border="0" /></a></td>
+            <td><a href="http://portals.apache.org/pluto/">Pluto</a> provides Jetspeed-2 portlet container. 
+            Pluto is the Reference Implementation of the Java Portlet Specfication. </td>
+          </tr>
+          <tr>
+            <td><a href="http://www.springframework.org"><img src="images/supporters/springframework.gif" border="0" /></a></td>
+            <td>The <a href="http://www.springframework.org">Spring Framework</a> provides Jetspeed-2 default component framework.</td>
+          </tr>
+		</table>
+		</section>
+	</body>
+</document>
+

Propchange: portals/jetspeed-2/trunk/xdocs/supporting-projects.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/xdocs/who-uses-j2.xml
------------------------------------------------------------------------------
    svn:eol-style = native



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message