portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dlest...@apache.org
Subject svn commit: r348039 [3/4] - in /portals/jetspeed-2/trunk/xdocs: ./ guides/ images/ style/
Date Tue, 22 Nov 2005 00:11:50 GMT
Added: portals/jetspeed-2/trunk/xdocs/guides/guide-portlet-bridges.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/xdocs/guides/guide-portlet-bridges.xml?rev=348039&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/guides/guide-portlet-bridges.xml (added)
+++ portals/jetspeed-2/trunk/xdocs/guides/guide-portlet-bridges.xml Mon Nov 21 16:10:44 2005
@@ -0,0 +1,59 @@
+<?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>Jetspeed Portlet Bridges</title>
+    <subtitle>Documentation for Apache Portals Portlet Bridges</subtitle>
+    <authors>
+      <person name="David Le Strat" email="dlestrat@apache.org"/>
+    </authors>
+  </properties>
+  <body>
+<section name="Struts Portlet Bridge">
+<p>
+Jetspeed 2 provides a Portlet bridge for Struts.  Please visit the <a href="multiproject/portals-bridges-struts/index.html">Apache Portals Struts Portlet Bridge</a>
+sub project documentation.
+</p>
+<p>
+Jetspeed 2 also contains multiple Struts portlet demo applications:
+<ul>
+	<li>The <a href="multiproject/struts-demo/index.html">Struts Mailer Demo</a> application</li>
+	<li>The <a href="multiproject/jpetstore/index.html">iBATIS JPetstore Demo Portlet</a> application</li>
+</ul>
+</p>
+</section>
+<section name="JSF Portlet Bridge">
+<p>
+Jetspeed 2 provides a Portlets bridge for JSF.  Please visit the <a href="multiproject/portals-bridges-jsf/index.html">Apache Portals JSF Portlet Bridge</a>
+sub project documentation.
+</p>
+<p>
+Jetspeed 2 also contains multiple JSF portlet demo applications based on MyFaces JSF implementation:
+<ul>
+	<li>The <a href="multiproject/jsf-demo/index.html">JSF Portlet Demo</a> application using Apache Portals JSF Portlet Bridge</li>
+    <li>The <a href="multiproject/jsf-demo-myfaces/index.html">JSF Portlet Demo</a> application using MyFaces built-in Portlet Bridge</li>
+	<li>The <a href="multiproject/security/index.html">Role Management (Work In Progress)</a> application</li>
+</ul>
+</p>
+<p>
+Please find the bridge documentation in the <a href="multiproject/security/index.html">JSF Portlet Bridge</a> subproject.
+</p>
+</section>
+
+</body>
+</document>
+

Added: portals/jetspeed-2/trunk/xdocs/guides/guide-profiler.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/xdocs/guides/guide-profiler.xml?rev=348039&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/guides/guide-profiler.xml (added)
+++ portals/jetspeed-2/trunk/xdocs/guides/guide-profiler.xml Mon Nov 21 16:10:44 2005
@@ -0,0 +1,196 @@
+<?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>Profiler</title>
+    <subtitle>Documentation for Jetspeed-2 Profiler</subtitle>
+    <authors>
+      <person name="David Sean Taylor" email="taylor@apache.org"/>
+    </authors>
+  </properties>
+  <body>
+<section name="Profiler Overview">
+<p>
+The Jetspeed Profiler is a portal resource location rule-based engine.
+As of Jetspeed version 2.0, the profiler locates the following kinds of portal resources:
+<ul>
+    <li>PSML pages</li>
+    <li>Folders</li>
+    <li>Menus</li>
+</ul>
+When a request is received by the portal, the profiler will map the request to a resource
+based on a normalized set of runtime parameters and state such as request parameters, HTTP headers,
+and session attributes. The Profiler is invoked during the Jetspeed request processing pipeline in 
+the profiler valve. This valve requires that the request context is already populated with 
+the portal request and response, capabilities, language and user information. 
+The runtime parameters make up the profile criterion which the profiler uses to locate 
+portal resources.  
+</p>
+<p>
+The profiler works hand in hand with the Site and Page Manager components.
+The profiler takes runtime information as input, generalized that information
+into     
+</p>
+</section>
+<section name="Profiling Rules">
+<p>
+ 
+A ProfilingRule defines a list of criteria used when evaluating a request
+to determine the location of a specific resource. Profiling rules are 
+used by the profiler to generically locate portal resources
+based on the decoupled criteria for known portlet request data.
+A rule consists of an ordered list of criteria which should be applied
+in a given order. Following this rule's order, the profiling engine applies
+each criteria of the rulusing a less-specific algorithm until the least 
+specific resource criterion is considered. When all criteria are exhausted, 
+the rule will fail and a fallback resource will be required.    
+</p>
+<subsection name='Rule Criterion'>
+<p>
+RuleCriteria are templates for locating profile properties. 
+The default implementation has a profiling policy defined in this proposal based on resource-specific URLs, Mime-Types and language preferences. More complex implementations will need to use other inputs in mapping to resources such as Cookies, IP Address Ranges, Statistical Resource Usage Analysis, Business Rules inside of servlets or EJBs,...
+    
+</p>
+</subsection>
+<subsection name='Rule Criterion Resolvers'>
+<p>
+
+<table>
+    <tr>
+    <th>Resolver</th>
+    <th>Description</th>
+    <th>Example</th>
+    </tr>
+    <tr>
+        <td>request</td>
+        <td>resolve by matching to a request parameter name</td>
+        <td></td>
+    </tr>
+    <tr>
+        <td>session</td>
+        <td>resolve by matching to a session attribute name</td>
+        <td></td>        
+    </tr>
+    <tr>
+        <td>request.session</td>
+        <td>resolve by matching to a request attribute name first, then matching to a session attribute name</td>
+        <td></td>        
+    </tr>
+    <tr>
+        <td>hard.coded</td>
+        <td>resolve with a hard.coded value</td>
+        <td></td>        
+    </tr>
+    <tr>
+        <td>group.role.user</td>
+        <td>fallback controller: search for resource under folders of the current users group, then role, then users own folder</td>
+        <td></td>        
+    </tr>
+    <tr>
+        <td>user</td>
+        <td>match resources in the current user directory</td>
+        <td></td>        
+    </tr>
+    <tr>
+        <td>group</td>
+        <td></td>
+        <td></td>        
+    </tr>
+    <tr>
+        <td>role</td>
+        <td></td>
+        <td></td>        
+    </tr>
+    <tr>
+        <td>mediatype</td>
+        <td>match media type in the request context</td>
+        <td></td>        
+    </tr>
+    <tr>
+        <td>country</td>
+        <td></td>
+        <td></td>        
+    </tr>
+    <tr>
+        <td>user.agent</td>
+        <td></td>
+        <td></td>        
+    </tr>
+    <tr>
+        <td>language</td>
+        <td></td>
+        <td></td>        
+    </tr>
+    <tr>
+        <td>roles</td>
+        <td>Role Fallback</td>
+        <td></td>        
+    </tr>
+    <tr>
+        <td>path</td>
+        <td></td>
+        <td></td>        
+    </tr>
+    <tr>
+        <td>page</td>
+        <td></td>
+        <td></td>        
+    </tr>
+    <tr>
+        <td>path.session</td>
+        <td></td>
+        <td></td>        
+    </tr>
+    <tr>
+        <td>user.attribute</td>
+        <td></td>
+        <td></td>        
+    </tr>
+    <tr>
+        <td>navigation</td>
+        <td>change the current navigation path</td>
+        <td></td>        
+    </tr>
+    
+</table>        
+    
+</p>
+</subsection>
+<subsection name='Principal Rules'>
+</subsection>
+</section>
+<section name="Profile Locators">
+<p>
+Profile Locators are used to locate profiled portal resources such as
+pages, documents, and fragments. A locator contains properties describing
+the actually resource to be located. Since the locator is based on properties
+that are usually related to a user or other subject's profile, it is referred
+to as a profile locator.    
+</p>
+<subsection name='Profile Locator Paths'>
+<p>
+</p>
+</subsection>
+</section>
+<section name="Component Configuration">
+<p>
+</p>
+</section>
+
+</body>
+</document>
+

Added: portals/jetspeed-2/trunk/xdocs/guides/guide-properties.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/xdocs/guides/guide-properties.xml?rev=348039&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/guides/guide-properties.xml (added)
+++ portals/jetspeed-2/trunk/xdocs/guides/guide-properties.xml Mon Nov 21 16:10:44 2005
@@ -0,0 +1,399 @@
+<?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>Getting Started with Jetspeed 2 using a Binary Release</title>
+    <subtitle>Getting ready to build your own portal</subtitle>
+    <authors>
+      <person name="David Sean Taylor" email="taylor@apache.org" />
+      <person name="Ate Douma" email="ate@apache.org" />
+      <person name="David Le Strat" email="dlestrat@apache.org" />
+      <person name="Ron Wheeler" email="rwheeler@artifact-software.com"/>
+     </authors>
+  </properties>
+  <body>
+	<section name="Basic Configuration Parameters">
+
+			      <subsection name="Required Portal Configuration Properties">
+        <table>
+          <tr>
+            <th>Property</th>
+            <th>Description</th>
+            <th nowrap="nowrap">Default value</th>
+          </tr>
+          <tr>
+            <td>
+              <code>org.apache.jetspeed.portal.home</code>
+            </td>
+            <td>
+              The folder where the maven-plugin will (re)create or update your custom portal maven project configuration
+              (with goal <code>j2:portal.conf.project</code>).  This will be where you will be performing all of your future
+			  custom portal development.
+              <br />
+              Example: <code>/home/myportal/</code>
+            </td>
+            <td>
+              <i>no default</i>
+            </td>
+          </tr>
+          <tr>
+            <td>
+              <code>org.apache.jetspeed.portal.groupId</code>
+            </td>
+            <td>
+              The (maven) short name of your portal project group.
+              <br />
+              This value is used for the maven repository folder in which the project artifacts (like the portal war
+              file) is stored.
+              <br />
+              Example: <code>myprojects</code>
+            </td>
+            <td>
+              <i>no default</i>
+            </td>
+          </tr>
+          <tr>
+            <td>
+              <code>org.apache.jetspeed.portal.artifactId</code>
+            </td>
+            <td>
+              The (maven) short name of your portal project.
+              <br />
+              This value is used for the portal war file and the (portal) web application context name.
+              <br />
+              Example: <code>myportal</code>
+            </td>
+            <td>
+              <i>no default</i>
+            </td>
+          </tr>
+          <tr>
+            <td>
+              <code>org.apache.jetspeed.portal.name</code>
+            </td>
+            <td>
+              The (maven) full name of your portal project.
+              <br />
+              This value is used by maven for generating JavaDoc titles.
+              <br />
+              Example: <code>My Test Portal</code>
+            </td>
+            <td>
+              <i>no default</i>
+            </td>
+          </tr>
+          <tr>
+            <td>
+              <code>org.apache.jetspeed.portal.currentVersion</code>
+            </td>
+            <td>
+              The current version of your portal project.
+              <br />
+              This value is used by maven as name postfix for the generated artifacts.
+              <br />
+              Example: <code>1.0</code>
+            </td>
+            <td>
+              <i>no default</i>
+            </td>
+          </tr>
+        </table>
+      </subsection>
+      <subsection name="Optional Portal Configuration Properties">
+        <p>
+          The following properties all specify a subfolder of the <code>${org.apache.jetspeed.portal.home}</code>
+          location as defined above.
+        </p>
+        <table>
+          <tr>
+            <th>Property</th>
+            <th>Description</th>
+            <th nowrap="nowrap">Default value</th>
+          </tr>
+          <tr>
+            <td>
+              <code>org.apache.jetspeed.portal.conf.dir</code>
+            </td>
+            <td>
+              The folder where the maven-plugin will generate and copy application server specific configuration files
+              as a tomcat application context descriptor.
+              <br />
+              This folder and its contents is created or updated by plugin goal <code>j2:portal.conf.tomcat</code>.
+            </td>
+            <td>
+              <i>target/portal-conf</i>
+            </td>
+          </tr>
+          <tr>
+            <td>
+              <code>org.apache.jetspeed.portal.sql.dir</code>
+            </td>
+            <td>
+              The folder where the maven-plugin will generate and copy portal and database server specific sql DDL and
+              DML scripts.
+              <br />
+              This folder and its contents is always (re)created by plugin goal <code>j2:portal.conf.sql</code>.
+            </td>
+            <td>
+              <i>target/portal-sql</i>
+            </td>
+          </tr>
+          <tr>
+            <td>
+              <code>org.apache.jetspeed.portal.db.dir</code>
+            </td>
+            <td>
+              The folder where the maven-plugin will create its build-in HSQLDB database(s).
+              <br />
+              This folder and its contents is created or updated by plugin goal <code>j2:start.production.server</code>
+              or <code>j2:start.test.server</code>.
+            </td>
+            <td>
+              <i>target/portal-db</i>
+            </td>
+          </tr>
+          <tr>
+            <td>
+              <code>org.apache.jetspeed.portal.webapp.dir</code>
+            </td>
+            <td>
+              The folder where the maven-plugin will copy the standard jetspeed web application resources.
+              <br />
+              This folder and its contents is created or updated by plugin goal <code>j2:portal.copy.webapp</code>.
+            </td>
+            <td>
+              <i>target/${org.apache.jetspeed.portal.artifactId}</i>
+            </td>
+          </tr>
+          <tr>
+            <td>
+              <code>org.apache.jetspeed.portal.target.dir</code>
+            </td>
+            <td>
+              The folder where the maven-plugin will generate and copy runtime portal configuration files.
+              <br />
+              These configuration files contain values derived from build/plugin properties for the portal and OJB.
+              <br />
+              This folder and its contents is created or updated by plugin goal <code>j2:portal.conf.jetspeed</code>
+              and goal <code>j2:portal.conf.ojb</code>.
+            </td>
+            <td>
+              <i>target/${org.apache.jetspeed.portal.artifactId}</i>
+            </td>
+          </tr>
+        </table>
+      </subsection>
+      <subsection name="Required Application Server Properties">
+        <p>
+          <i>
+            Note: The maven-plugin currently only supports the Tomcat Server 5.0.x or 5.5.x
+          </i>
+        </p>
+        <table>
+          <tr>
+            <th>Property</th>
+            <th>Description</th>
+            <th nowrap="nowrap">Default value</th>
+          </tr>
+          <tr>
+            <td>
+              <code>org.apache.jetspeed.server.home</code>
+            </td>
+            <td>
+              The root folder of your Tomcat server installation.
+              <br />
+              Example: <code>${CATALINA_HOME}/</code>.
+            </td>
+            <td>
+              <i>no default</i>
+            </td>
+          </tr>
+          <tr>
+            <td>
+              <code>org.apache.jetspeed.server.shared</code>
+            </td>
+            <td>
+              The location of the shared jars in your Tomcat installation.
+              <br />
+              Example: <code>${org.apache.jetspeed.server.home}/shared/lib/</code>
+            </td>
+            <td>
+              <i>no default</i>
+            </td>
+          </tr>
+          <tr>
+            <td>
+              <code>org.apache.jetspeed.deploy.war.dir</code>
+            </td>
+            <td>
+              The location of web applications in your Tomcat installation.
+              <br />
+              Example: <code>${org.apache.jetspeed.server.home}/webapps/</code>
+            </td>
+            <td>
+              <i>no default</i>
+            </td>
+          </tr>
+          <tr>
+            <td>
+              <code>org.apache.jetspeed.services.autodeployment.user</code>
+            </td>
+            <td>
+              A Tomcat user with the manager role.
+              <br />
+              Used to access the Tomcat Manager application from within the portal, explained below.
+            </td>
+            <td>
+              <i>no default</i>
+            </td>
+          </tr>
+          <tr>
+            <td>
+              <code>org.apache.jetspeed.services.autodeployment.password</code>
+            </td>
+            <td>
+              The password of the Tomcat user above.
+              <br />
+              Used to access the Tomcat Manager application from within the portal, explained below.
+            </td>
+            <td>
+              <i>no default</i>
+            </td>
+          </tr>
+          <tr>
+            <td>
+              <code>org.apache.jetspeed.catalina.version.major</code>
+            </td>
+            <td>
+              The major version of the Tomcat server you are using: 5 or 5.5
+              <br />
+              Example: <code>5.5</code>
+            </td>
+            <td>
+              <i>no default</i>
+            </td>
+          </tr>
+        </table>
+      </subsection>
+      <subsection name="Optional Database Server Properties">
+        <p>
+          Jetspeed-2 and its maven-plugin uses, as well as provides, by default a HSQLDB database.
+        </p>
+        <p>
+          If you want to use a different database you will need to override the following properties:
+        </p>
+        <table>
+          <tr>
+            <th>Property</th>
+            <th>Description</th>
+            <th nowrap="nowrap">Default value</th>
+          </tr>
+          <tr>
+            <td>
+              <code>org.apache.jetspeed.production.database.default.name</code>
+            </td>
+            <td>
+              The type of database you are using. Used for sql script generation with Torque.
+              <br />
+              Currently supported databases (with corresponding Torque target database name):
+              <ul>
+                <li>hsql (hypersonic)</li>
+                <li>oracle (oracle)</li>
+                <li>mysql (mysql)</li>
+                <li>postgres (postresql)</li>
+                <li>mssql (mssql)</li>
+              </ul>
+            </td>
+            <td>hsql</td>
+          </tr>
+          <tr>
+            <td>
+              <code>org.apache.jetspeed.production.database.url</code>
+            </td>
+            <td>The jdbc connection url</td>
+            <td>jdbc:hsqldb:hsql://127.0.0.1:9001</td>
+          </tr>
+          <tr>
+            <td>
+              <code>org.apache.jetspeed.production.database.user</code>
+            </td>
+            <td>The database user name to connect with.</td>
+            <td>sa</td>
+          </tr>
+          <tr>
+            <td>
+              <code>org.apache.jetspeed.production.database.password</code>
+            </td>
+            <td>The database user its password to connect with.</td>
+            <td>
+              <i>empty</i>
+            </td>
+          </tr>
+          <tr>
+            <td>
+              <code>org.apache.jetspeed.production.database.driver</code>
+            </td>
+            <td>The jdbc driver class name</td>
+            <td>org.hsqldb.jdbcDriver</td>
+          </tr>
+          <tr>
+            <td>
+              <code>org.apache.jetspeed.production.jdbc.drivers.path</code>
+            </td>
+            <td>
+              A Java classpath style path to the jdbc driver classes or jar(s) needed for connecting to the database.
+              <br />
+              Example: <code>/lib/ojdbc14.jar;/lib/nls_charset12.jar</code>
+            </td>
+            <td>
+              <i>empty</i>
+            </td>
+          </tr>
+        </table>
+      </subsection>
+      <subsection name="Example: A minimal custom portal configuration">
+        <p>
+          Make sure you have define at least the required properties as described above in your
+          <code>${USER_HOME}/build.properties</code>. A minimal custom portal configuration using the default HSQLDB
+          database can be something like:
+          <source>
+            <![CDATA[
+# required portal configuration properties          
+org.apache.jetspeed.portal.home           = /home/myportal/
+org.apache.jetspeed.portal.groupId        = myprojects
+org.apache.jetspeed.portal.artifactId     = myportal
+org.apache.jetspeed.portal.name           = My Test Portal
+org.apache.jetspeed.portal.currentVersion = 1.0
+
+# required application server properties
+org.apache.jetspeed.server.home                      = ${CATALINA_HOME}/
+org.apache.jetspeed.server.shared                    = ${org.apache.jetspeed.server.home}/shared/lib/
+org.apache.jetspeed.deploy.war.dir                   = ${org.apache.jetspeed.server.home}/webapps/
+org.apache.jetspeed.services.autodeployment.user     = j2deployer
+org.apache.jetspeed.services.autodeployment.password = xxxxx
+org.apache.jetspeed.catalina.version.major           = 5.5]]>
+          </source>
+          <i>
+            Note: If you're going to build the default Jetspeed 2 portal directly from the source only the
+            <code>org.apache.jetspeed.portal.home</code> property is required from the set of required portal
+            configuration properties.
+          </i>  
+        </p>
+      </subsection>
+    </section>
+  </body>
+</document>

Added: portals/jetspeed-2/trunk/xdocs/guides/guide-psml.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/xdocs/guides/guide-psml.xml?rev=348039&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/guides/guide-psml.xml (added)
+++ portals/jetspeed-2/trunk/xdocs/guides/guide-psml.xml Mon Nov 21 16:10:44 2005
@@ -0,0 +1,279 @@
+<?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>PSML</title>
+    <subtitle>Documentation for Designers working with PSML</subtitle>
+    <authors>
+      <person name="David Sean Taylor" email="taylor@apache.org"/>
+    </authors>
+  </properties>
+  <body>
+<section name="PSML">
+<ul>
+     <li><a href="#Page">Page</a></li>          
+     <li><a href="#Defaults">Defaults</a></li>     
+    <li><a href="#Title_and_Metadata">Title and Metadata</a></li>
+    <li><a href="#Layout_Fragments">Layout Fragments</a></li>    
+    <li><a href="#Portlet_Fragments">Portlet Fragments</a></li>    
+    <li><a href="#Preferences">Portlet Preferences</a></li>
+    <li><a href="#PSML_Security_Constraints">Security Constraints</a></li>        
+</ul>
+    
+<p>
+PSML is an acronym for Portal Structure Markup Language. It was created to allow content structure and abstraction within Jetspeed.
+PSML defines how portlets are aggregated, layed out, and decorated on a portal page. Note that page layout is not a part of the Java
+Portlet Standard API. Thus PSML is a Jetspeed-specific implementation. Also note that PSML in Jetspeed-2 is different from PSML in 
+Jetspeed-1. This document can be used as a reference guide to the elements of a PSML resource.
+</p>
+<p>
+Here is an example PSML file:    
+</p>
+<source><![CDATA[
+<page>
+  <defaults
+     skin="orange"
+     layout-decorator="tigris"
+     portlet-decorator="tigris"
+  />
+  <title>Welcome to Jetspeed 2</title>
+  <metadata name="title" xml:lang="fr">
+        Ma Premiere Page de PSML
+  </metadata>
+  <metadata name="title" xml:lang="ja">
+        Jetspeed 2 へようこそ
+  </metadata>
+
+  <fragment id="dp-1" type="layout" name="jetspeed::VelocityTwoColumns">
+    <fragment id="dp-3" type="portlet" name="pam::LocaleSelector">
+      <property layout="TwoColumns" name="row" value="0" />
+      <property layout="TwoColumns" name="column" value="0" />
+    </fragment>                                
+    <fragment id="dp-12" type="portlet" name="security::LoginPortlet">
+      <property layout="TwoColumns" name="row" value="0" />
+      <property layout="TwoColumns" name="column" value="1" />
+    </fragment>                                
+    <fragment id="dp-7" type="portlet" name="demo::PickANumberPortlet" >
+      <property layout="TwoColumns" name="row" value="1" />
+      <property layout="TwoColumns" name="column" value="0" />
+    </fragment>        
+    <fragment id="dp-16" type="portlet" name="demo::RoleSecurityTest">
+      <property layout="TwoColumns" name="row" value="1" />
+      <property layout="TwoColumns" name="column" value="1" />
+    </fragment>
+    <fragment id="dp-9" type="portlet" name="demo::IFramePortlet">
+      <property layout="TwoColumns" name="row" value="2" />
+      <property layout="TwoColumns" name="column" value="0" />
+    </fragment>
+    <fragment id="dp-17" type="portlet" name="demo::UserInfoTest">
+      <property layout="TwoColumns" name="row" value="2" />
+      <property layout="TwoColumns" name="column" value="1" />
+    </fragment>
+    <fragment id="dp-18" type="portlet" name="demo::BookmarkPortlet">
+      <property layout="TwoColumns" name="row" value="3" />
+      <property layout="TwoColumns" name="column" value="1" />
+    </fragment>
+  </fragment>
+
+  <security-constraints>
+    <security-constraints-ref>public-view</security-constraints-ref>
+  </security-constraints>
+</page>
+]]></source>
+</section>
+<section name='Page'>
+<p>
+The Page element is a simple container to hold all other PSML elements.
+There are two valid attributes for the Page element:
+</p>
+<table>
+    <tr>
+    <th>id</th>
+    <th>hidden</th>
+    </tr>
+    <tr>
+    <td></td>
+    <td></td>
+    </tr>
+    <tr>
+    <td></td>
+    <td></td>
+    </tr>
+</table>
+<p>Example:</p>  
+<source><![CDATA[
+<page id='mypage' hidden='false'>
+...
+</page>  
+]]></source>
+</section>
+<section name='Defaults'>
+<p>
+The Defaults element defines the default layout decorator and default portlet decorator.
+The default layout decorator is applied to all layout fragments which do NOT have a decorator attribute.
+The default portlet decorator is applied to all portlet fragments which do NOT have a decorator attribute.
+There are three valid attributes on the defaults element:
+</p>
+<table>
+    <tr>
+    <th>skin</th>
+    <th>layout-decorator</th>
+    <th>portlet-decorator</th>    
+    </tr>
+    <tr>
+    <td></td>
+    <td></td>
+    <td></td>    
+    </tr>
+    <tr>
+    <td></td>
+    <td></td>
+    <td></td>    
+    </tr>
+</table>
+<p>Example:</p>  
+<source><![CDATA[
+]]></source>
+</section>
+
+<section name='Title and Metadata'>
+<p>
+</p>
+<table>
+    <tr>
+    <th></th>
+    <th></th>
+    <th></th>    
+    </tr>
+    <tr>
+    <td></td>
+    <td></td>
+    <td></td>    
+    </tr>
+    <tr>
+    <td></td>
+    <td></td>
+    <td></td>    
+    </tr>
+</table>
+<p>Example:</p>  
+<source><![CDATA[
+]]></source>
+</section>
+
+<section name='Layout Fragments'>
+<p>
+</p>
+<table>
+    <tr>
+    <th></th>
+    <th></th>
+    <th></th>    
+    </tr>
+    <tr>
+    <td></td>
+    <td></td>
+    <td></td>    
+    </tr>
+    <tr>
+    <td></td>
+    <td></td>
+    <td></td>    
+    </tr>
+</table>
+<p>Example:</p>  
+<source><![CDATA[
+]]></source>
+</section>
+
+<section name='Portlet Fragments'>
+<p>
+</p>
+<table>
+    <tr>
+    <th></th>
+    <th></th>
+    <th></th>    
+    </tr>
+    <tr>
+    <td></td>
+    <td></td>
+    <td></td>    
+    </tr>
+    <tr>
+    <td></td>
+    <td></td>
+    <td></td>    
+    </tr>
+</table>
+<p>Example:</p>  
+<source><![CDATA[
+
+]]></source>
+</section>
+
+<section name='Preferences'>
+<p>
+    The &lt;preference&gt; elements allows for the defining of portlet preferences.  
+	This provides an eaiser avenue for the setting of default portlet prefences for a portlet
+    instance on a page without having to duplicate a portlet definition within
+    the portlet application's portlet.xml.
+	<br/><br/>
+	A fragment can contain 0..n &lt;preference&gt; elements.
+	<br/><br/>
+	Preference precedence: User Defined > Fragment Defined > portlet.xml Defined.
+</p>
+<table>
+    <tr>
+    <th>Attribute: name</th>
+    <th>Attribute: readOnly</th>
+    <th>Element: value</th>    
+    </tr>
+    <tr>
+    <td>The name of the preference.</td>
+    <td>Whether or not the user can change the value of this preference.</td>
+    <td>There can be 1..n <i>&lt;value&gt;</i> elements assigned to a single preference.</td>    
+    </tr>
+    <tr>
+    <td></td>
+    <td></td>
+    <td></td>    
+    </tr>
+</table>
+<p>Example:</p>  
+<source><![CDATA[
+
+    <fragment id="uhtemp-1012" type="portlet" name="demo::BookmarkPortlet">
+      <property layout="TwoColumns" name="row" value="2" />
+      <property layout="TwoColumns" name="column" value="1" />
+      <preference name="Google" readOnly="false">
+        <value>http://www.google.com</value>
+      </preference>
+    </fragment>
+
+]]></source>
+</section>
+
+<section name="PSML Security Constraints">
+<p>
+<a href='bronco.html'>Link to Security Constraints Docs</a>
+</p>
+</section>
+
+</body>
+</document>
+

Added: portals/jetspeed-2/trunk/xdocs/guides/guide-security-declarative-psml.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/xdocs/guides/guide-security-declarative-psml.xml?rev=348039&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/guides/guide-security-declarative-psml.xml (added)
+++ portals/jetspeed-2/trunk/xdocs/guides/guide-security-declarative-psml.xml Mon Nov 21 16:10:44 2005
@@ -0,0 +1,317 @@
+<?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 Declarative Security through PSML</title>
+    <subtitle>Guide to Declarative Security through PSML</subtitle>
+    <authors>
+      <person name="David Sean Taylor" email="taylor@apache.org"/>
+    </authors>
+  </properties>
+  <body>
+<section name="Security Constraints">
+<p>
+<ul>
+	<li><a href="#The Security Constraint">Security Constraint</a></li>	      
+	<li><a href="#Declarative and Global Constraints">Declarative and Global Constraints</a></li>	 
+    <li><a href="#Folder Constraints">Folder Constraints</a></li>
+    <li><a href="#Page Constraints">Page Constraints</a></li>    
+    <li><a href="#Spring Configuration">Spring Configuration</a></li>    
+    <li><a href="#Subsite Security">Subsite Security</a></li>        
+</ul>
+</p>
+<p>
+Security Constraints are applied to pages and folders.  Security Constraints either grant or deny 
+access to pages and folders.  Constraints can be defined in one of three places:
+<ul>
+    <li>1. <b>Global:</b> As declarations in the <b><i>page.security</i></b> file found in the root of the PSML tree.</li>
+    <li>2. <b>Folder:</b> In the <b><i>folder.metadata</i></b> file optionally located in every directory</li>    
+    <li>3. <b>Page:</b> In PSML files to constraint access to specific pages</li>
+</ul>
+</p>
+<subsection name='Grants'>
+<p>
+Grants are associated with permissions, authorizing, or granting, a principal list 
+access to a page or folder.    
+A granting security constraint is the association of a list of one 
+or more security principals combined with one or permissions. Grant constraints grant access to a page or folder
+for the associated list of permissions. 
+</p>
+</subsection>
+<subsection name='Denies'>
+<p>
+A deny security constraint is declared 
+with one or more security principals; with no associated permissions. Deny constraints prohibit access
+to the page or folder for the given list of principals. Note that deny constraints
+must be listed before grant constraints.
+</p>
+</subsection>
+<subsection name='Declarative and Referential Constraints'>
+<p>
+When working with pages and folder resource constraints, a constraint can be either 
+a <b><i>declarative constraint</i></b> or a <b><i>referential</i></b> constraint.
+Declarative constraints are declared and put to use right in place for the particular
+page or folder resource. Where as referential constraints refer to a constraint declared
+in a centralized security constraint resource: the <b><i>page.security</i></b> file. Each
+site or subsite can have one <b><i>page.security</i></b> resource for declaring constraints
+to be referenced in any page or folder.
+</p>
+</subsection>
+</section>
+<section name='The Security Constraint'>
+<p>
+A security constraint is an XML element found in a PSML file, a folder metadata file, or inthe global security declarations.
+A security constraint has one attribute: the name. A security constraint has the following elements:
+</p>
+<ul>
+    <li>roles - a comma-separated list of one or more role principals or * for all roles</li>
+    <li>groups - a comma-separated list of one or more group principals or * for all groups</li>
+    <li>users - a comma-separated list of one or more user principals or * for all users</li>
+    <li>owner - a single user principal</li>
+    <li>permissions - a comma-separated list of one or permissions (view,edit,help)</li>
+</ul>    
+<p>
+The first four elements (roles, groups, users, owner) all define the principals who will either have a permission granted or denied.
+</p>
+<subsection name='Permissions'>
+<p>
+Permissions are the portal modes that are granted by the security constraint. Note that permissions are only granted, not denied.
+The <b><i>view</i></b> permission is similiar to the <b><i>read</i></b> permission found in operating systems.
+The <b><i>edit</i></b> permission is similiar to the <b><i>write</i></b> permission found in operating systems.
+The <b><i>help</i></b> permission is similiar to the <b><i>info</i></b> permission found in some portals.
+</p>
+</subsection>
+
+<subsection name='Roles'>
+<p>
+Constraints can be granted to one or more role principals for a set of permissions on a given resource.
+Roles are derived from the authorized users list of role principals, i.e. the roles that the user is a member of.
+If the authorized user is a member of any of the listed roles, the permission to the resource will be granted.
+</p>
+<source><![CDATA[
+    <security-constraint>
+      <roles>adminstrator, manager</roles>    
+      <permissions>view, edit</permissions>
+    </security-constraint>
+]]></source>
+Constraints can also deny role principals access to the entire resource.
+If the authorized user is a member of any of the listed roles, all access to the resource is denied.
+<source><![CDATA[
+    <security-constraint>
+      <roles>adminstrator, manager</roles>    
+    </security-constraint>
+]]></source>
+</subsection>
+<subsection name='Groups'>
+    <p>
+Constraints can be granted to one or more group principals for a set of permissions on a given resource.
+Groups are derived from the authorized users list of group principals, i.e. the groups that the user is a member of.
+If the authorized user is a member of any of the listed groups, the permission to the resource will be granted.
+<source><![CDATA[
+    <security-constraint>
+      <groups>accounting, development</groups>    
+      <permissions>view</permissions>
+    </security-constraint>
+]]></source>
+Constraints can also deny group principals access to the entire resource.
+If the authorized user is a member of any of the listed groups, all access to the resource is denied.
+<source><![CDATA[
+    <security-constraint>
+      <groups>accounting, development</groups>    
+    </security-constraint>
+]]></source>
+</p>
+</subsection>
+<subsection name='Users'>
+    <p>
+Constraints can be granted to one or more user principals for a set of permissions on a given resource:
+The current user must be one of the listed principals in the comma-separated list in order to grant permission to the resource.
+<source><![CDATA[
+    <security-constraint>
+      <users>joey, deedee, johnny</users>    
+      <permissions>view, edit, help</permissions>
+    </security-constraint>
+]]></source>
+Constraints can also deny user principals access to the entire resource.
+If the authorized user is in the list, all access to the resource is denied.
+<source><![CDATA[
+    <security-constraint>
+      <users>fred</users>    
+    </security-constraint>
+]]></source>
+</p>
+</subsection>
+<subsection name='Combinations'>
+<p>
+Note that you can grant or deny permissions to a collection of one or more principal types. For example, here we grant view and edit permissions
+to the roles (manager, developer), and to the groups (QA and Research), and to the particular user (dilbert):
+If the authorized user is a member of any of the listed roles, groups, or users, the permission to the resource will be granted.
+</p>
+<source><![CDATA[
+    <security-constraint>
+      <roles>hacker, coder, guru</roles>    
+      <groups>unix, linux, freebsd</groups>
+      <users>betty, fred, barney, wilma</users>      
+      <permissions>view, edit</permissions>
+    </security-constraint>
+]]></source>
+<p>
+Constraints can also deny combinations of principals access to the entire resource.
+If the authorized user is a member of any of the listed groups, roles or users, all access to the resource is denied.
+</p>
+<source><![CDATA[
+    <security-constraint>
+      <roles>hacker, coder, guru</roles>    
+      <groups>unix, linux, freebsd</groups>
+      <users>betty, fred, barney, wilma</users>      
+    </security-constraint>
+]]></source>
+</subsection>
+<subsection name='All *'>
+<p>
+The * can be applied to roles, groups, users or permissions to imply ALL.
+<source><![CDATA[
+    <security-constraint>
+      <users>*</users>      
+      <permissions>*</permissions>
+    </security-constraint>
+]]></source>
+</p>
+</subsection>
+<subsection name='Owner'>
+    <p>
+    TODO
+    </p>
+</subsection>
+</section>
+<section name='Declarative and Global Constraints'>
+<p>
+Declarative constraints are declared in the <b><i>page.security</i></b> file of the root of a site or subsite.
+Declarative constraints are referenced in pages and folders with the <b><i>security-constraints-ref</i></b> tag.
+Global constraints are also declarative constraints. They are also defined and found in the <b><i>page.security</i></b> file in the root PSML repository.
+The difference with global constraints is that they implicitly apply to all folders and pages within the scope of the page.security file, (i.e. the site).
+Note that there can be more than one <b><i>page.security</i></b> files in a subsite Jetspeed installation.
+</p>
+<source><![CDATA[
+  <security-constraints-def name="admin">
+    <security-constraint>
+      <roles>admin</roles>
+      <permissions>view, edit</permissions>
+    </security-constraint>
+  </security-constraints-def>
+  <global-security-constraints-ref>admin</global-security-constraints-ref>
+]]></source>
+<subsection name='Default Constraints'>
+<p>
+    Several security constraint declarations are made in the default deployment of Jetspeed:
+<table>
+    <tr>
+        <th>name</th>
+        <th>grants</th>
+        <th>permissions</th>        
+        <th>global</th>
+    </tr>
+    <tr>
+        <td>admin</td>
+        <td>roles: admin</td>
+        <td>view, edit</td>        
+        <td>yes</td>
+    </tr>
+    <tr>
+        <td>manager</td>
+        <td>roles: manager</td>
+        <td>view</td>        
+        <td>no</td>
+    </tr>
+    <tr>
+        <td>users</td>
+        <td>roles: user, manager</td>
+        <td>view</td>        
+        <td>no</td>        
+    </tr>
+    <tr>
+        <td>public-view</td>
+        <td>users: *</td>
+        <td>view</td>        
+        <td>no</td>        
+    </tr>
+    <tr>
+        <td>public-edit</td>
+        <td>users: *</td>
+        <td>view, edit</td>        
+        <td>no</td>        
+    </tr>    
+</table>    
+</p>    
+</subsection>
+</section>
+<section name='Folder Constraints'>
+<p>
+Folder Security constraints are placed in a <b><il>security-constraints list</il></b> in the <b><i>folder.metadata</i></b> file optionally found in each folder in the site.
+Note that the absence of a <b><i>folder.metadata</i></b> or security constraints within that file means that the folder will
+inherit the constraints of the parent folder, all the way up to the root folder of the site or subsite. Folder constraints do
+not inherit across subsites. Folder security constraints are made up of declarative security constraints and referential security
+constraints. Here is an example of both, the first being a referential constraint, the second a declarative constraint:
+<source><![CDATA[
+  <security-constraints>
+    <security-constraints-ref>public-view</security-constraints-ref>
+    <security-constraint>
+      <groups>engineering</groups>
+      <permissions>view</permissions>
+    </security-constraint>    
+  </security-constraints>
+]]></source>
+</p>
+<p>
+Note that all security constraints must be placed within a <b><i>security-constraints</i></b> collection.
+</p>
+</section>
+<section name='Page Constraints'>
+<p>
+Page Security constraints are placed <b><il>security-constraints list</il></b> 
+in <b><i>PSML</i></b> files and are optional.
+Note that the absence of a  security constraints list within that file means that the folder will
+inherit the constraints of the folder in which it resides.  Page security constraints are made up of 
+declarative security constraints and referential security
+constraints. Here is an example of both, the first being a referential constraint, the second a declarative constraint:
+</p>
+<source><![CDATA[
+  <security-constraints>
+    <security-constraints-ref>global-view</security-constraints-ref>
+    <security-constraint>
+      <groups>accounting</groups>
+      <permissions>view, edit</permissions>
+    </security-constraint>    
+  </security-constraints>
+]]></source>
+<p>
+Note that all security constraints must be placed within a <b><i>security-constraints</i></b> collection.
+</p>
+</section>
+<section name="Spring Configuration">
+<p>
+TODO: page-manager.xml enabling
+</p>
+</section>
+<section name="Subsite Security">
+<p>
+subsite security
+</p>
+</section>
+</body>
+</document>
+

Added: portals/jetspeed-2/trunk/xdocs/guides/guide-security.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/xdocs/guides/guide-security.xml?rev=348039&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/guides/guide-security.xml (added)
+++ portals/jetspeed-2/trunk/xdocs/guides/guide-security.xml Mon Nov 21 16:10:44 2005
@@ -0,0 +1,57 @@
+<?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 Security</title>
+		<subtitle>Security Configuration Overview</subtitle>
+		<authors>
+			<person name="David Le Strat" email="dlestrat@apache.org" />
+		</authors>
+	</properties>
+	<body>
+		<section name="Configuring Jetspeed-2 Security">
+			<p>
+				An overview of Jetspeed-2 security architecture is
+				available
+				<a href="../multiproject/jetspeed-security/arch.html">
+					here
+				</a>
+				.
+			</p>
+			<subsection name="Guide to Authentication Configuration">
+				<p>
+					Jetspeed-2 provides a
+					<a
+						href="../multiproject/jetspeed-security/login-module.html">
+						LoginModule implementation
+					</a>
+					that leverage the security SPI model to interact
+					with multiple authentication mechanisms.
+				</p>
+				<p>
+					Jetspeed authentication configuration is managed by the <i>security-spi-atn.xml</i> located in 
+					the <a href="guide-portal-assembly.html">portal application assembly directory</a>.  Jetspeed-2
+					supports authentication against:
+					<ul>
+						<li>A <a href="../multiproject/jetspeed-security/config.html#security-spi-atn_xml">relational database</a> (default authentication implementation).</li>
+						<li>A <a href="../multiproject/jetspeed-security/ldap.html">LDAP authentication</a> implementation.</li>
+				    </ul>
+				</p>
+			</subsection>
+		</section>
+	</body>
+</document>
\ No newline at end of file

Added: portals/jetspeed-2/trunk/xdocs/guides/guide-site.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/xdocs/guides/guide-site.xml?rev=348039&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/guides/guide-site.xml (added)
+++ portals/jetspeed-2/trunk/xdocs/guides/guide-site.xml Mon Nov 21 16:10:44 2005
@@ -0,0 +1,35 @@
+<?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>Site</title>
+    <subtitle>Documentation for Designers working with a Jetspeed-2 Site</subtitle>
+    <authors>
+      <person name="David Sean Taylor" email="taylor@apache.org"/>
+    </authors>
+  </properties>
+  <body>
+<section name="Site">
+<p>
+TODO: talk about components of a site i.e. pages, folders, fragments, decorators, layouts, folder metadata,
+links, PSML, document sets.
+</p>
+</section>
+
+</body>
+</document>
+

Added: portals/jetspeed-2/trunk/xdocs/guides/guide-sso.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/xdocs/guides/guide-sso.xml?rev=348039&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/guides/guide-sso.xml (added)
+++ portals/jetspeed-2/trunk/xdocs/guides/guide-sso.xml Mon Nov 21 16:10:44 2005
@@ -0,0 +1,34 @@
+<?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>Jetspeed Single Sign On</title>
+    <subtitle>Documentation for Jetspeed-2 SSO (Single Sign On)</subtitle>
+    <authors>
+      <person name="David Sean Taylor" email="taylor@apache.org"/>
+    </authors>
+  </properties>
+  <body>
+<section name="Single Sign On">
+<p>
+TODO: talk about SSO
+</p>
+</section>
+
+</body>
+</document>
+

Added: portals/jetspeed-2/trunk/xdocs/guides/guide-user-attributes.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/xdocs/guides/guide-user-attributes.xml?rev=348039&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/guides/guide-user-attributes.xml (added)
+++ portals/jetspeed-2/trunk/xdocs/guides/guide-user-attributes.xml Mon Nov 21 16:10:44 2005
@@ -0,0 +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>
\ No newline at end of file

Added: portals/jetspeed-2/trunk/xdocs/guides/index.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/xdocs/guides/index.xml?rev=348039&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/guides/index.xml (added)
+++ portals/jetspeed-2/trunk/xdocs/guides/index.xml Mon Nov 21 16:10:44 2005
@@ -0,0 +1,76 @@
+<?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>Documentation Guides Index</title>
+		<subtitle>Jetspeed-2 Documentation Guides</subtitle>
+		<authors>
+			<person name="David Le Strat" email="dlestrat@apache.org" />
+		</authors>
+	</properties>
+	<body>
+		<section name="Documentation Guides">
+		<subsection name="Getting Started">
+		<ul>
+			<li><a href="../getting-started.html">Getting started guide</a></li>
+			<li><a href="../getting-started-source.html">Getting started with Jetspeed-2 source guide</a></li>
+			<li><a href="../getting-started-binary.html">Getting started with Jetspeed-2 binaries guide</a></li>
+		</ul>
+		</subsection>
+		<subsection name="Guides to Portal Concepts">
+		<ul>
+			<li><a href="guide-decorators.html">Guide to decorators</a></li>
+			<li><a href="guide-layouts.html">Guide to layouts</a></li>
+		</ul>
+		</subsection>
+		<subsection name="Configuration Guides">
+		<ul>
+			<li><a href="guide-properties.html">Guide to configuration properties</a></li>
+			<li><a href="guide-database.html">Guide to database configuration</a></li>
+			<li><a href="guide-app-servers.html">Guide to application servers configuration</a></li>
+			<li><a href="guide-security.html">Guide to configuring Jetspeed-2 security</a></li>
+			<li><a href="guide-security-declarative-psml.html">Guide to portal entities declarative security through PSML</a></li>
+			<li><a href="guide-sso.html">Guide to using Jetspeed-2 single sign-on</a></li>
+			<li><a href="guide-user-attributes.html">Guide to defining user attributes (PLT.17 user information configuration)</a></li>
+			<li><a href="guide-profilers.html">Guide to using profilers</a></li>
+			
+		</ul>
+		</subsection>
+		<subsection name="Development Guides">
+		<ul>
+			<li><a href="guide-portal-design.html">Guide to portal design</a></li>
+			<li><a href="guide-psml.html">Guide to PSML</a></li>
+			<li><a href="guide-site.html">Guide to working with a Jetspeed-2 site</a></li>
+			<li><a href="guide-l10n.html">Guide to localization with Jetspeed-2</a></li>
+			<li><a href="guide-portlet-bridges.html">Guide to portlet bridges</a></li>			
+		</ul>
+		</subsection>
+		<subsection name="Guides to Jetspeed-2 Tools">
+		<ul>
+			<li><a href="guide-jpt.html">Guide to Jetspeed-2 Power Tools</a></li>
+			<li><a href="../j2-maven-plugin.html">Guide to Jetspeed-2 Maven Plugin</a></li>			
+		</ul>
+		</subsection>
+		<subsection name="Components Guides">
+		<ul>
+			<li><a href="guide-components.html">Guide to Jetspeed-2 component architecture</a></li>
+			<li><a href="guide-dir-structure.html">Guide to Jetspeed-2 directory structure</a></li>
+		</ul>
+		</subsection>		
+		</section>
+	</body>
+</document>
\ No newline at end of file

Added: portals/jetspeed-2/trunk/xdocs/how-to-help.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/xdocs/how-to-help.xml?rev=348039&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/how-to-help.xml (added)
+++ portals/jetspeed-2/trunk/xdocs/how-to-help.xml Mon Nov 21 16:10:44 2005
@@ -0,0 +1,30 @@
+<?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?">
+		</section>
+	</body>
+</document>
+

Added: portals/jetspeed-2/trunk/xdocs/images/breadcrumbs.jpg
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/xdocs/images/breadcrumbs.jpg?rev=348039&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/xdocs/images/breadcrumbs.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/xdocs/images/collapsed.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/xdocs/images/collapsed.gif?rev=348039&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/xdocs/images/collapsed.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/xdocs/images/expanded.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/xdocs/images/expanded.gif?rev=348039&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/xdocs/images/expanded.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/xdocs/images/external.png
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/xdocs/images/external.png?rev=348039&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/xdocs/images/external.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/xdocs/images/folder-open.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/xdocs/images/folder-open.gif?rev=348039&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/xdocs/images/folder-open.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/xdocs/images/h3.jpg
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/xdocs/images/h3.jpg?rev=348039&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/xdocs/images/h3.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/xdocs/images/h5.jpg
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/xdocs/images/h5.jpg?rev=348039&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/xdocs/images/h5.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/xdocs/images/newwindow.png
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/xdocs/images/newwindow.png?rev=348039&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/xdocs/images/newwindow.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: portals/jetspeed-2/trunk/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/xdocs/index.xml?rev=348039&r1=348038&r2=348039&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/index.xml (original)
+++ portals/jetspeed-2/trunk/xdocs/index.xml Mon Nov 21 16:10:44 2005
@@ -1,62 +1,173 @@
 <?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.
+	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>Jetspeed 2 Home Page</title>
-    <subtitle>Welcome to Jetspeed 2</subtitle>
-    <authors>
-      <person name="David Sean Taylor" email="taylor@apache.org"/>
-    </authors>
-  </properties>
-  <body>
-<section name="Jetspeed-2 Overview">
-      <p>
-    Jetspeed-2 is the next-generation enterprise portal at Apache.
-    Jetspeed-2 offers several architectural enhancements and improvements over Jetspeed 1.0. 
-    First, Jetspeed-2 is conformant to the <a href="http://www.jcp.org/en/jsr/detail?id=168">Java Portlet Standard</a> and will provide a standard mechanism for the deployment of portlets.  
-    Second, Jetspeed-2 has matured to a more scalable architecture featuring multi-threaded functionality.  
-    Third, Jetspeed-2 is decoupled from several legacy open source projects.  
-    Fourth, Jetspeed-2 is based on a component architecture.      
-      </p>
-</section>
-<section name="What is Jetspeed?">
-      <p>        
-Jetspeed is an Open Source implementation of an Enterprise Information Portal, using Java and XML.
-A portal makes network resources (applications, databases and so forth) available to end-users. The 
-user can access the portal via a web browser, WAP-phone, pager or any other device. Jetspeed acts 
-as the central hub where information from multiple sources are made available in an easy to use manner. 
-</p>
-      <p>
-
-The data presented via Jetspeed is independent of content type, This means that content from for example
-XML,RSS or SMTP can be integrated with Jetspeed. The actual presentation of the data is 
-handled via ates XSL and delivered to the user for example via the combination of Java Server Pages (JSPs) 
-and HTML. Jetspeed provides support for templating and content publication frameworks such as 
-<a href="http://cocoon.apache.org">Cocoon</a>, <a href="http://www.webmacro.org/">WebMacro</a> and 
-<a href="http://jakarta.apache.org/velocity/">Velocity</a>. Note that outside of regular browser Jetspeed also supports WAP devices.
-</p>
-      <p>
-Jetspeed helps you build portal applications quickly. The goal is to make Jetspeed a tool for both portal developers as well 
-as user interface designers. Currently the focus is on providing developers with a set of tools that facilitates building
-the base for the portal. With Jetspeed you can quickly build an XML
-portal and also syndicate your own content.
-
-</p>
-      
-</section>
-  </body>
+	<properties>
+		<title>Jetspeed 2 Home Page</title>
+		<subtitle>Welcome to Jetspeed 2</subtitle>
+		<authors>
+			<person name="David Sean Taylor" email="taylor@apache.org" />
+			<person name="David Le Strat" email="dlestrat@apache.org" />
+		</authors>
+	</properties>
+	<body>
+		<section name="Welcome to Jetspeed-2">
+			<div id="downloadbox">
+				<h5>Get Jetspeed 2.0</h5>
+				<p>
+					<a href="download.html">
+						<img valign="top" src="images/folder-open.gif"
+							border="0" alt="" title="download" />
+						Download
+					</a>
+					Jetspeed 2.0
+					<small>(TBD Mb)</small>
+				</p>
+				<ul>
+					<li>
+						<a href="download.html#System_Requirements">
+							System Requirements
+						</a>
+					</li>
+					<li>
+						<a
+							href="download.html#Installation_Instructions">
+							Installation Instructions
+						</a>
+					</li>
+					<li>
+						<a href="release-notes.html">Release Notes</a>
+					</li>
+					<li>
+						<a href="getting-started.html">
+							Getting Started
+						</a>
+					</li>
+					<li>
+						<a href="guides/index.html">Documentation</a>
+					</li>
+				</ul>
+			</div>
+			<p>
+				Jetspeed-2 is the next-generation enterprise portal at
+				Apache. Jetspeed-2 offers several architectural
+				enhancements and improvements over Jetspeed 1.0. First,
+				Jetspeed-2 is conformant to the
+				<a href="http://www.jcp.org/en/jsr/detail?id=168">Java Portlet Standard</a> 
+				and will provide a standard mechanism for the deployment
+				of portlets. Second, Jetspeed-2 has matured to a more
+				scalable architecture featuring multi-threaded
+				functionality. Third, Jetspeed-2 is decoupled from
+				several legacy open source projects. Fourth, Jetspeed-2
+				is based on a component architecture.
+				<br/><br/>
+			</p>
+			<subsection name="Jetspeed-2 Documentation">
+			<p>
+				Most Jetspeed-2 documentation is in the form of
+				<a href="guides/index.html">documentation guides</a>
+				.
+			</p>
+			</subsection>
+			<subsection name="Jetspeed-2 Status">
+				<p>
+					Jetspeed-2 is currently under development. The first
+					production release is expected in Q4 2005. Even
+					though it is not officially released, there are
+					several production portals using Jetspeed-2 that are
+					already on-line.
+				</p>
+			</subsection>
+			<subsection name="About Jetspeed-2">
+				<p>
+					Jetspeed is an Open Source implementation of an
+					Enterprise Information Portal, written in Java and
+					XML. Within a Jetspeed portal, individual portlets
+					can be aggregated to create a page. Each portlet is
+					an independent application with Jetspeed acting as
+					the central hub making information from multiple
+					sources available in an easy to use manner.
+				</p>
+				<p>
+					A portal based on Jetspeed can make applications,
+					database information and other data sources
+					available to end-users through a single web site.
+					Jetspeed provides a security infrastructure so that
+					the information and functions made available to each
+					user can be customized on basis of the user or a
+					role that the user has. The user can access the
+					portal via a web browser, WAP-phone, pager or any
+					other device supported by the servlet engine.
+				</p>
+				<p>
+					Content held in a wide variety of formats such as
+					XML, RSS or database tables can be integrated within
+					a Jetspeed page. The actual presentation of the data
+					is handled via XSL and delivered to the user via
+					combinations of data presentation tools such as Java
+					Server Pages (JSPs), Velocity and HTML. Jetspeed
+					provides support for templating and content
+					publication frameworks such as
+					<a href="http://cocoon.apache.org">Cocoon</a>
+					,
+					<a href="http://www.webmacro.org">WebMacro</a>
+					and
+					<a href="http://jakarta.apache.org/velocity">
+						Velocity
+					</a>
+					.
+				</p>
+				<p>
+					For more information, see:
+					<ul>
+						<li>
+							<a href="what-is-jetspeed-2.html">
+								What is Jetspeed-2
+							</a>
+							?
+						</li>
+						<li>
+							How do I
+							<a href="getting-started.html">
+								Get Started
+							</a>
+							?
+						</li>
+						<li>
+							Where is
+							<a href="guides/index.html">
+								the Documentation
+							</a>
+							?
+						</li>
+						<li>
+							How
+							<a href="how-to-help.html">Can I Help</a>
+							?
+						</li>
+						<li>
+							What do I need to know
+							<a href="j1-users.html">
+								if I used Jetspeed-1
+							</a>
+							?
+						</li>
+					</ul>
+				</p>
+			</subsection>
+		</section>
+	</body>
 </document>

Added: portals/jetspeed-2/trunk/xdocs/j1-users.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/xdocs/j1-users.xml?rev=348039&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/j1-users.xml (added)
+++ portals/jetspeed-2/trunk/xdocs/j1-users.xml Mon Nov 21 16:10:44 2005
@@ -0,0 +1,30 @@
+<?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">
+		</section>
+	</body>
+</document>
+

Modified: portals/jetspeed-2/trunk/xdocs/navigation.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/xdocs/navigation.xml?rev=348039&r1=348038&r2=348039&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/navigation.xml (original)
+++ portals/jetspeed-2/trunk/xdocs/navigation.xml Mon Nov 21 16:10:44 2005
@@ -14,51 +14,36 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<!--
-    WARNING:  This file is generated.  The source is xdocs-templates/navigation.xml 
-    
-    Note:  Changes to this file are not reflected on the generated site until the
-    allSite goal is atained, i.e. maven allSite 
--->
 <project>
-
     <body>
         <links>
-            <item name="Portals Bridges" href="http://portals.apache.org/bridges" target="_nw"/>
-            <item name="Doc for 2.0-M3" href="M3/"/>
+        	<item name="Jetspeed-1" href="http://portals.apache.org/jetspeed-1" target="_nw"/>
+        	<item name="Jetspeed-2" href="http://portals.apache.org/jetspeed-2" target="_nw"/>
+        	<item name="Bridges" href="http://portals.apache.org/bridges" target="_nw"/>
             <item name="PDF Documentation" href="/jetspeed2.pdf" img="images/pdf.gif" />
         </links>
         <menu name="Essentials">
-            <item name="Overview" href="index.html" />
-            <item name="Getting Started" href="getting-started.html" />
-            <item name="Localization" href="l10n-guide.html" />
-            <item name="User Attributes" href="user-attributes.html" />
-            <item name="Sub Projects" href="projects-overview.html" />
-            <item name="Maven Plugin" href="j2-maven-plugin.html" />
-            <item name="Documentation" href="documentation.html" />
+            <item name="Features" href="features.html" />
+        	<item name="Getting Started" href="getting-started.html" />            
         </menu>
-        <menu name='Security'>
-            <item name="Security Overview" href="multiproject/jetspeed-security/index.html" />
-            <item name="Architecture Overview" href="multiproject/jetspeed-security/arch.html" />
-            <item name="Authentication" href="multiproject/jetspeed-security/atn.html" />
-            <item name="JAAS Authorization" href="multiproject/jetspeed-security/atz.html" />
-            <item name="PSML Authorization" href="bronco.html" />
-            <item name="SPI: Providers and Handlers" href="spi.html" />
-            <item name="Security Services Configuration" href="multiproject/jetspeed-security/config.html" />
-            <item name="Single Sign on" href="sso.html" />
-        </menu>
-        <menu name='Portal Design'>
-            <item name="Portal Design Overview" href="portal-design.html" />
-            <item name="Layouts" href="layouts.html" />
-            <item name="Decorators" href="decorators.html" />
-            <item name="Jetspeed Power Tool" href="jpt.html" />
-            <item name="PSML" href="psml.html" />
-            <item name="Site" href="site.html" />
-        </menu>
-        <menu name='Components'>
-            <item name="Profiler" href="profiler.html" />
-        </menu>
-        <menu name="Support">
+    	<menu name="Download">
+    		<item name="Binaries " href="download.html" />
+    		<item name="Source" href="download.html" />
+    	</menu>
+    	<menu name="Documentation">
+    		<item name="Documentation Guides" href="guides/index.html" />
+    		<item name="Jetspeed API" href="http://portals.apache.org/jetspeed-2/multiproject/jetspeed-api/apidocs/index.html" />
+    		<item name="Jetspeed Plugin" href="j2-maven-plugin.html" />
+    	</menu>
+    	<menu name="About Jetspeed-2">
+    		<item name="FAQs" href="faq.html" />
+    		<item name="For Jetspeed-1 Users" href="j1-users.html" />
+    		<item name="Supporting Projects" href="supporting-projects.html" />
+    		<item name="Who Uses J2?" href="who-uses-j2.html" />
+    		<item name="Portlets Community" href="portlets-community.html" />
+    		<item name="How to Help?" href="how-to-help.html" />
+    	</menu>
+        <menu name="Support"> 	
             <item name="Mailing List" href="mail-lists.html" />
             <item name="Bug Database" href="issue-tracking.html" />
             <item name="Wiki" href="http://wiki.apache.org/portals/Jetspeed2" />
@@ -66,4 +51,4 @@
             <item name="Source Code Repository" href="source-code.html" />
         </menu>
     </body>
-</project>
+</project>
\ No newline at end of file

Added: portals/jetspeed-2/trunk/xdocs/portlets-community.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/xdocs/portlets-community.xml?rev=348039&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/portlets-community.xml (added)
+++ portals/jetspeed-2/trunk/xdocs/portlets-community.xml Mon Nov 21 16:10:44 2005
@@ -0,0 +1,30 @@
+<?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">
+		</section>
+	</body>
+</document>
+



---------------------------------------------------------------------
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