You are viewing a plain text version of this content. The canonical link for it is here.
Posted to general@portals.apache.org by ta...@apache.org on 2009/05/15 08:50:05 UTC

svn commit: r775034 [1/3] - in /portals/site/jetspeed/jetspeed-2.2: jetspeed-guide-dev/ jetspeed-guide-dev/src/site/ jetspeed-guide-dev/src/site/xdoc/ jetspeed-guide-users/ jetspeed-guide-users/src/site/ jetspeed-tutorial/ jetspeed-tutorial/src/ jetspe...

Author: taylor
Date: Fri May 15 06:50:03 2009
New Revision: 775034

URL: http://svn.apache.org/viewvc?rev=775034&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-389
https://issues.apache.org/jira/browse/JS2-989
Lots of reworking and reorganizing of Jetspeed-2.1.x and 2.2.x document branches
Moving docs out of both 2.1.3 and 2.2
New skin
Organized site into a more hierarchical structure:
  site/
    jetspeed/
       jetspeed-2.1
       jetspeed-2.2
 
tutorial contribution from Niels van Kampenout

also had to convert line feeds

Added:
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/   (with props)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/pom.xml   (with props)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/downloads/
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/downloads/tutorial-resources.zip   (with props)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/01/
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/01/run-it-small.png   (with props)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/01/run-it.png   (with props)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/02/
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/02/jetexpress-portal-small.png   (with props)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/02/jetexpress-portal.png   (with props)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/02/jetspeed-page-decorator.png   (with props)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/02/jetspeed-portlet.png   (with props)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/03/
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/03/bonjourmonde-portlet.png   (with props)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/03/eclipse-classpath.png   (with props)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/03/import-project.png   (with props)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/03/import-project2.png   (with props)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/03/jsp-portlet.png   (with props)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/03/menu-tutorial.png   (with props)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/03/new-portlet.png   (with props)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/03/override-impl.png   (with props)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/site.xml   (with props)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/xdoc/
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/xdoc/01/
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/xdoc/01/build-it.xml   (with props)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/xdoc/01/configure-maven.xml   (with props)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/xdoc/01/genapp.xml   (with props)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/xdoc/01/project-structure.xml   (with props)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/xdoc/01/run-it.xml   (with props)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/xdoc/02/
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/xdoc/02/customizing-overview.xml   (with props)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/xdoc/02/default-page.xml   (with props)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/xdoc/02/deploy-custom.xml   (with props)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/xdoc/02/desktop-theme.xml   (with props)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/xdoc/02/page-decoration.xml   (with props)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/xdoc/02/portlet-decoration.xml   (with props)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/xdoc/03/
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/xdoc/03/eclipse.xml   (with props)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/xdoc/03/hello.xml   (with props)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/xdoc/03/overview.xml   (with props)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/xdoc/03/taglib.xml   (with props)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/xdoc/03/tutorial-psml.xml   (with props)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/xdoc/04/
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/xdoc/04/jetspeed-service.xml   (with props)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/xdoc/before-you-start.xml   (with props)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/xdoc/index.xml   (with props)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/xdoc/reference/
    portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/xdoc/reference/build-commands.xml   (with props)
Modified:
    portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/   (props changed)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/pom.xml
    portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/site.xml
    portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/dao.xml
    portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/dev-rdbms.xml
    portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/dev-search.xml
    portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/dev-statistics.xml
    portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/index.xml
    portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/patches.xml
    portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-users/   (props changed)
    portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-users/pom.xml
    portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-users/src/site/site.xml
    portals/site/jetspeed/jetspeed-2.2/src/site/site.xml
    portals/site/jetspeed/jetspeed-2.2/src/site/xdoc/index.xml

Propchange: portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri May 15 06:50:03 2009
@@ -0,0 +1 @@
+target

Modified: portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/pom.xml
URL: http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/pom.xml?rev=775034&r1=775033&r2=775034&view=diff
==============================================================================
--- portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/pom.xml (original)
+++ portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/pom.xml Fri May 15 06:50:03 2009
@@ -27,18 +27,26 @@
 
   <artifactId>jetspeed-guide-dev</artifactId>
   <name>Jetspeed Developers Guide</name>
-  <description>Jetspeed Developers Guide</description>
-  <!-- FIXME: this causes an NPE in maven dearest
+  <description>Jetspeed 2.2 Developers Guide</description>
+  <packaging>pom</packaging>  
   <parent>
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <artifactId>jetspeed-docs</artifactId>
-    <version>2.2</version>
+	  <artifactId>jetspeed-site-docs</artifactId>
+      <groupId>org.apache.portals.site</groupId>
+      <version>2.2</version>
   </parent>
-  <packaging>pom</packaging>
-  -->
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.2</version>
   
+ <!-- this is for a bug Maven, see http://jira.codehaus.org/browse/MSHARED-18 
+      should be removed once Maven incorporates this bug in an official release-->   
+ <build>
+   <plugins>
+     <plugin>
+       <groupId>org.apache.maven.plugins</groupId>
+       <artifactId>maven-site-plugin</artifactId>
+       <version>2.0</version>
+     </plugin>
+   </plugins>
+ </build>
+   
   <reporting>
     <plugins>
       <plugin>

Modified: portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/site.xml
URL: http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/site.xml?rev=775034&r1=775033&r2=775034&view=diff
==============================================================================
--- portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/site.xml (original)
+++ portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/site.xml Fri May 15 06:50:03 2009
@@ -35,22 +35,17 @@
       <item name="Build Guide" href="../buildguide/index.html"/>
       <item name="Deployers Guide" href="../deployguide/index.html"/>
       <item name="Users Guide" href="../usersguide/index.html" />
-
-      <item name="Applications" href="http://portals.apache.org/applications/" />
-      <item name="Portals" href="http://portals.apache.org/" />
-      <item name="Jetspeed-2.1.3" href="http://portals.apache.org/jetspeed-2.1.3/" />
-      <!-- TODO: During build, pdf docs need to be generated. 
-      <item name="PDF Documentation" href="/jetspeed2.pdf" img="images/pdf.gif" />
-      -->      
     </links>
 
-    <menu name="Getting Involved">
+    <menu name="Developers Guide">
+    	<item name="Developing Jetspeed" href='index.html'/>    	
     	<item name="Sending Patches" href='patches.html'/>
+    	<item name="Coding Standards" href="http://portals.apache.org/development/code-standards.html"/>
     </menu>
 
     <menu name="Building Jetspeed">
         <item name="Build Guide" href="../buildguide/index.html" />
-        <item name="Conditional Spring" href='spring-config.xml' />
+        <item name="Conditional Spring" href='spring-config.html' />
     </menu>
     
     <menu name="Jetspeed Components">

Modified: portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/dao.xml
URL: http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/dao.xml?rev=775034&r1=775033&r2=775034&view=diff
==============================================================================
--- portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/dao.xml (original)
+++ portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/dao.xml Fri May 15 06:50:03 2009
@@ -1,74 +1,74 @@
-<?xml version="1.0" ?>
-<!--
+<?xml version="1.0" ?>
+<!--
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
     this work for additional information regarding copyright ownership.
     The ASF licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<document>
-    <properties>
-        <title>Jetspeed-2 RDBMS</title>
-        <authors>
-            <person name="David Le Strat" email="dlestrat@apache.org" />
-        </authors>
-    </properties>
-    <body>
-        <section name="Data Access Overview">
-            <p>
-            Jetspeed-2 RDBMS component provide some of level of abstraction from the underlying persistence mechanism.    
-            </p>
-            <subsection name="Data Access Using Object Relational Mapping">
-            <p>
-            Jetspeed-2 uses object relational mapping as the underlying technology for persistence.  By default, 
-            <a href="http://db.apache.org/ojb/">Apache OJB</a> is used as an ORM engine.  In order to minimize Jetspeed-2
-            OJB dependencies, the <code>InitablePersistenceBrokerDaoSupport</code> provides a layer of abstraction that minimizes
-            the dependencies on a specific ORM engine.  The class diagram below illustration the Jetspeed-2 implementation classes
-            that leverage <code>InitablePersistenceBrokerDaoSupport</code>:<br/>
-            <img src="images/persistence-broker-dao-c.gif" border="0"/>
-            </p>
-            <p>
-            The <code>InitablePersistenceBrokerDaoSupport</code> extends <code>org.springframework.orm.ojb.support.PersistenceBrokerDaoSupport</code>.
-            </p>
-            </subsection>
-            <subsection name="Spring ORM Support">
-            <p>
-            Spring's adds significant support when using the O/R mapping layer of your choice to create data access applications.  The 
-            <code>InitablePersistenceBrokerDaoSupport</code> extends spring layer of abstraction for persistence support, specifically the
-            OJB <a href="http://static.springframework.org/spring/docs/1.2.x/reference/orm.html#orm-ojb"><code>PersistenceBroker</code> API support</a>.
-            </p>
-            <p>
-            Using such a layer of abstraction has many advantages.  Some of the advantages outlined in Spring's documentation are:
-            <ul>
-            <li>Ease of testing. Spring's inversion of control approach makes it easy to swap the implementations and config locations of persistence manager instances,
-            JDBC DataSources, transaction managers, and mapper object implementations (if needed). This makes it much easier to isolate and test each piece of
-            persistence-related code in isolation.</li>
-            <li>Common data access exceptions. Spring can wrap exceptions from you O/R mapping tool of choice, converting them from proprietary (potentially checked) exceptions
-            to a common runtime DataAccessException hierarchy. This allows you to handle most persistence exceptions, which are non-recoverable, only in the appropriate layers,
-            without annoying boilerplate catches/throws, and exception declarations. You can still trap and handle exceptions anywhere you need to. Remember that JDBC exceptions
-            (including DB specific dialects) are also converted to the same hierarchy, meaning that you can perform some operations with JDBC within a consistent programming model.</li>
-            <li>General resource management. Spring application contexts can handle the location and configuration of persistence managers instances, JDBC DataSources, 
-            and other related resources. This makes these values easy to manage and change. Spring offers efficient, easy and safe handling of persistence resources.</li>
-			<li>Integrated transaction management. Spring allows you to wrap your O/R mapping code with either a declarative, AOP style method interceptor,
-			or an explicit 'template' wrapper class at the Java code level. In either case, transaction semantics are handled for you, and proper transaction handling (rollback, etc)
-			in case of exceptions is taken care of. As discussed below, you also get the benefit of being able to use and swap various transaction managers, without your ORM specific code being affected:
-			for example, between local transactions and JTA, with the same full services (such as declarative transactions) available in both scenarios. As an additional benefit,
-			JDBC-related code can fully integrate transactionally with the code you use to do O/R mapping. This is useful for data access that's not suitable for O/R mapping,
-			such as batch processing or streaming of BLOBs, which still needs to share common transactions with O/R mapping operations.</li>
-			<li>To avoid vendor lock-in, and allow mix-and-match implementation strategies.</li>
-			</ul>
-			</p>
-            </subsection>
-        </section>
-    </body>
-</document>
-
+    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 RDBMS</title>
+        <authors>
+            <person name="David Le Strat" email="dlestrat@apache.org" />
+        </authors>
+    </properties>
+    <body>
+        <section name="Data Access Overview">
+            <p>
+            Jetspeed-2 RDBMS component provide some of level of abstraction from the underlying persistence mechanism.    
+            </p>
+            <subsection name="Data Access Using Object Relational Mapping">
+            <p>
+            Jetspeed-2 uses object relational mapping as the underlying technology for persistence.  By default, 
+            <a href="http://db.apache.org/ojb/">Apache OJB</a> is used as an ORM engine.  In order to minimize Jetspeed-2
+            OJB dependencies, the <code>InitablePersistenceBrokerDaoSupport</code> provides a layer of abstraction that minimizes
+            the dependencies on a specific ORM engine.  The class diagram below illustration the Jetspeed-2 implementation classes
+            that leverage <code>InitablePersistenceBrokerDaoSupport</code>:<br/>
+            <img src="images/persistence-broker-dao-c.gif" border="0"/>
+            </p>
+            <p>
+            The <code>InitablePersistenceBrokerDaoSupport</code> extends <code>org.springframework.orm.ojb.support.PersistenceBrokerDaoSupport</code>.
+            </p>
+            </subsection>
+            <subsection name="Spring ORM Support">
+            <p>
+            Spring's adds significant support when using the O/R mapping layer of your choice to create data access applications.  The 
+            <code>InitablePersistenceBrokerDaoSupport</code> extends spring layer of abstraction for persistence support, specifically the
+            OJB <a href="http://static.springframework.org/spring/docs/1.2.x/reference/orm.html#orm-ojb"><code>PersistenceBroker</code> API support</a>.
+            </p>
+            <p>
+            Using such a layer of abstraction has many advantages.  Some of the advantages outlined in Spring's documentation are:
+            <ul>
+            <li>Ease of testing. Spring's inversion of control approach makes it easy to swap the implementations and config locations of persistence manager instances,
+            JDBC DataSources, transaction managers, and mapper object implementations (if needed). This makes it much easier to isolate and test each piece of
+            persistence-related code in isolation.</li>
+            <li>Common data access exceptions. Spring can wrap exceptions from you O/R mapping tool of choice, converting them from proprietary (potentially checked) exceptions
+            to a common runtime DataAccessException hierarchy. This allows you to handle most persistence exceptions, which are non-recoverable, only in the appropriate layers,
+            without annoying boilerplate catches/throws, and exception declarations. You can still trap and handle exceptions anywhere you need to. Remember that JDBC exceptions
+            (including DB specific dialects) are also converted to the same hierarchy, meaning that you can perform some operations with JDBC within a consistent programming model.</li>
+            <li>General resource management. Spring application contexts can handle the location and configuration of persistence managers instances, JDBC DataSources, 
+            and other related resources. This makes these values easy to manage and change. Spring offers efficient, easy and safe handling of persistence resources.</li>
+			<li>Integrated transaction management. Spring allows you to wrap your O/R mapping code with either a declarative, AOP style method interceptor,
+			or an explicit 'template' wrapper class at the Java code level. In either case, transaction semantics are handled for you, and proper transaction handling (rollback, etc)
+			in case of exceptions is taken care of. As discussed below, you also get the benefit of being able to use and swap various transaction managers, without your ORM specific code being affected:
+			for example, between local transactions and JTA, with the same full services (such as declarative transactions) available in both scenarios. As an additional benefit,
+			JDBC-related code can fully integrate transactionally with the code you use to do O/R mapping. This is useful for data access that's not suitable for O/R mapping,
+			such as batch processing or streaming of BLOBs, which still needs to share common transactions with O/R mapping operations.</li>
+			<li>To avoid vendor lock-in, and allow mix-and-match implementation strategies.</li>
+			</ul>
+			</p>
+            </subsection>
+        </section>
+    </body>
+</document>
+

Modified: portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/dev-rdbms.xml
URL: http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/dev-rdbms.xml?rev=775034&r1=775033&r2=775034&view=diff
==============================================================================
--- portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/dev-rdbms.xml (original)
+++ portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/dev-rdbms.xml Fri May 15 06:50:03 2009
@@ -1,101 +1,101 @@
-<?xml version="1.0" ?>
-<!--
+<?xml version="1.0" ?>
+<!--
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
     this work for additional information regarding copyright ownership.
     The ASF licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<document>
-    <properties>
-        <title>Jetspeed-2 RDBMS</title>
-        <authors>
-            <person name="David Le Strat" email="dlestrat@apache.org" />
-        </authors>
-    </properties>
-    <body>
-        <section name="RDBMS Overview">
-            <p>
-            Jetspeed-2 RDBMS component provide a layer of abstraction from the persistence mechanism used by Jetspeed-2.
-            It provides facilities for datasource configuration as well as data access. 
-            </p>
-            <subsection name="Datasource Configuration">
-            <p>
-            Jetspeed-2 uses <a href="http://db.apache.org/ojb/">OJB</a> <code>PersistenceBroker</code> API as its default
-            persistence mechanism.  The <code>ConnectionRepositoryEntry</code> component configures OJB for Jetspeed-2 as well
-            as the properties available under <code>/etc/db-ojb</code> in the Jetspeed-2 source repository or <code>WEB-INF/classes</code>
-            in a deployed instance of Jetspeed-2.
-            </p>
-            <p>
-            The <code>datasource.xml</code> spring assembly configuration file configures <code>ConnectionRepositoryEntry</code> and is located
-            in <code>WEB-INF/assembly/boot</code>.
-            </p>
-            <p>
-            The <code>ConnectionRepositoryEntry</code> configures an entry in OJB's ConnectionRepository according to its properties.
-            The properties <code>driverClassName</code>, <code>url</code>, <code>username</code> and <code>password</code> are used
-			only if no <code>jndiName</code> is set, i.e. if the connection factory uses the driver to create data sources.  The platform
-			settings are derived from the configured  data source or database driver using OJB's <code>JdbcMetadataUtils</code> class.  The default
-			Jetspeed-2 <code>ConnectionRepositoryEntry</code> configuration expose a datasource.
-            <source>
-    &lt;bean id="JetspeedDS" class="org.apache.jetspeed.components.rdbms.ojb.ConnectionRepositoryEntry"&gt;
-      &lt;property name="jndiName"&gt;
-        &lt;value&gt;java:comp/env/jdbc/jetspeed&lt;/value&gt;
-      &lt;/property&gt;
-    &lt;/bean&gt;</source>
-            </p>
-            <p>
-            In order for OJB to be configured properly with Jetspeed-2, the <code>OJB.properties</code> file (located under
-            <code>/etc/db-ojb/OJB.properties</code> in the source tree and <code>WEB-INF/classes</code> in the deployed application)
-            must set:
-            <source>
-    ConnectionManagerClass=org.apache.jetspeed.components.rdbms.ojb.ConnectionManagerImpl</source>
-            instead of:
-            <source>
-    ConnectionFactoryClass=org.apache.ojb.broker.accesslayer.ConnectionFactoryManagedImpl</source>
-            </p>
-            <p>
-            A class diagram of <code>ConnectionRepositoryEntry</code> and <code>ConnectionManagerImpl</code> is
-            provided below:<br/>
-            <img src="images/connection-repository-c.gif" border="0"/>
-            </p>
-            </subsection>
-            <subsection name="OJB Datasource Configuration">
-            <p>
-            The bean name provided in <code>datasource.xml</code> must match the <code>jdbc-connection-descriptor</code>
-            <code>jcd-alias</code> property (by default <code>JetspeedDS</code>) located in OJB <code>repository_database.xml</code>
-            as illustrated below.
-            <source>
-    &lt;jdbc-connection-descriptor
-        jcd-alias="JetspeedDS"
-        default-connection="true"
-        batch-mode="false"&gt;</source>
-            </p>
-            </subsection>
-            <subsection name="Jetspeed-2 Datasource Configuration in Tomcat">
-            <p>
-            Jetspeed-2 configure the following datasource in Tomcat.  In the source tree, the Tomcat datasource configuration
-            is located under <code>/etc/conf/tomcat</code>.  When deployed Jetspeed-2 in a Tomcat instance, the Jetspeed-2
-            datasource configuration are deployed under <code>${tomcat_home}/conf/Catalina/localhost/jetspeed.xml</code>. If a different
-            portal name is being used for Jetspeed-2, the configuration file will be named accordingly.
-            <source>
-    &lt;Resource name="jdbc/jetspeed" auth="Container"
-                 factory="org.apache.commons.dbcp.BasicDataSourceFactory"
-                 type="javax.sql.DataSource" username="" password=""
-                 driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
-                 url="jdbc:derby:/tmp/productiondb;create=true"
-                 maxActive="100" maxIdle="30" maxWait="10000"/&gt;</source>
-            </p>
-            </subsection>
-        </section>
-    </body>
-</document>
-
+    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 RDBMS</title>
+        <authors>
+            <person name="David Le Strat" email="dlestrat@apache.org" />
+        </authors>
+    </properties>
+    <body>
+        <section name="RDBMS Overview">
+            <p>
+            Jetspeed-2 RDBMS component provide a layer of abstraction from the persistence mechanism used by Jetspeed-2.
+            It provides facilities for datasource configuration as well as data access. 
+            </p>
+            <subsection name="Datasource Configuration">
+            <p>
+            Jetspeed-2 uses <a href="http://db.apache.org/ojb/">OJB</a> <code>PersistenceBroker</code> API as its default
+            persistence mechanism.  The <code>ConnectionRepositoryEntry</code> component configures OJB for Jetspeed-2 as well
+            as the properties available under <code>/etc/db-ojb</code> in the Jetspeed-2 source repository or <code>WEB-INF/classes</code>
+            in a deployed instance of Jetspeed-2.
+            </p>
+            <p>
+            The <code>datasource.xml</code> spring assembly configuration file configures <code>ConnectionRepositoryEntry</code> and is located
+            in <code>WEB-INF/assembly/boot</code>.
+            </p>
+            <p>
+            The <code>ConnectionRepositoryEntry</code> configures an entry in OJB's ConnectionRepository according to its properties.
+            The properties <code>driverClassName</code>, <code>url</code>, <code>username</code> and <code>password</code> are used
+			only if no <code>jndiName</code> is set, i.e. if the connection factory uses the driver to create data sources.  The platform
+			settings are derived from the configured  data source or database driver using OJB's <code>JdbcMetadataUtils</code> class.  The default
+			Jetspeed-2 <code>ConnectionRepositoryEntry</code> configuration expose a datasource.
+            <source>
+    &lt;bean id="JetspeedDS" class="org.apache.jetspeed.components.rdbms.ojb.ConnectionRepositoryEntry"&gt;
+      &lt;property name="jndiName"&gt;
+        &lt;value&gt;java:comp/env/jdbc/jetspeed&lt;/value&gt;
+      &lt;/property&gt;
+    &lt;/bean&gt;</source>
+            </p>
+            <p>
+            In order for OJB to be configured properly with Jetspeed-2, the <code>OJB.properties</code> file (located under
+            <code>/etc/db-ojb/OJB.properties</code> in the source tree and <code>WEB-INF/classes</code> in the deployed application)
+            must set:
+            <source>
+    ConnectionManagerClass=org.apache.jetspeed.components.rdbms.ojb.ConnectionManagerImpl</source>
+            instead of:
+            <source>
+    ConnectionFactoryClass=org.apache.ojb.broker.accesslayer.ConnectionFactoryManagedImpl</source>
+            </p>
+            <p>
+            A class diagram of <code>ConnectionRepositoryEntry</code> and <code>ConnectionManagerImpl</code> is
+            provided below:<br/>
+            <img src="images/connection-repository-c.gif" border="0"/>
+            </p>
+            </subsection>
+            <subsection name="OJB Datasource Configuration">
+            <p>
+            The bean name provided in <code>datasource.xml</code> must match the <code>jdbc-connection-descriptor</code>
+            <code>jcd-alias</code> property (by default <code>JetspeedDS</code>) located in OJB <code>repository_database.xml</code>
+            as illustrated below.
+            <source>
+    &lt;jdbc-connection-descriptor
+        jcd-alias="JetspeedDS"
+        default-connection="true"
+        batch-mode="false"&gt;</source>
+            </p>
+            </subsection>
+            <subsection name="Jetspeed-2 Datasource Configuration in Tomcat">
+            <p>
+            Jetspeed-2 configure the following datasource in Tomcat.  In the source tree, the Tomcat datasource configuration
+            is located under <code>/etc/conf/tomcat</code>.  When deployed Jetspeed-2 in a Tomcat instance, the Jetspeed-2
+            datasource configuration are deployed under <code>${tomcat_home}/conf/Catalina/localhost/jetspeed.xml</code>. If a different
+            portal name is being used for Jetspeed-2, the configuration file will be named accordingly.
+            <source>
+    &lt;Resource name="jdbc/jetspeed" auth="Container"
+                 factory="org.apache.commons.dbcp.BasicDataSourceFactory"
+                 type="javax.sql.DataSource" username="" password=""
+                 driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
+                 url="jdbc:derby:/tmp/productiondb;create=true"
+                 maxActive="100" maxIdle="30" maxWait="10000"/&gt;</source>
+            </p>
+            </subsection>
+        </section>
+    </body>
+</document>
+

Modified: portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/dev-search.xml
URL: http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/dev-search.xml?rev=775034&r1=775033&r2=775034&view=diff
==============================================================================
--- portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/dev-search.xml (original)
+++ portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/dev-search.xml Fri May 15 06:50:03 2009
@@ -1,84 +1,84 @@
-<?xml version="1.0" ?>
-<!--
+<?xml version="1.0" ?>
+<!--
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
     this work for additional information regarding copyright ownership.
     The ASF licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<document>
-    <properties>
-        <title>Jetspeed-2 Search</title>
-        <authors>
-            <person name="David Le Strat" email="dlestrat@apache.org" />
-        </authors>
-    </properties>
-    <body>
-        <section name="Search Overview">
-            <p>
-            Jetspeed-2 provides an integration with the popular <a href="http://lucene.apache.org/">Apache Lucene</a>, 
-            a high-performance, full-featured text search engine library written entirely in Java; a technology suitable
-            for nearly any application that requires full-text search, especially cross-platform.. 
-            </p>
-            <subsection name="SearchEngine Overview">
-            <p>
-            Jetspeed-2 provides a <code>SearchEngine</code> component configured as a spring component.  The <code>SearchEngine</code>
-            component is configured in <code>WEB-INF/assembly/search.xml</code>.  The default implementation based on the embedded Lucene
-            search engine must specify the location of the search index file, the name of the analyzer class (if null the default analyzer
-            <code>StandardAnalyzer</code> is used), whether to optimize after update and the <code>HandlerFactory</code>:
-            <source>
-    &lt;bean id="org.apache.jetspeed.search.SearchEngine"
-  	  class="org.apache.jetspeed.search.lucene.SearchEngineImpl"&gt;
-  	  &lt;constructor-arg index="0"&gt;&lt;value&gt;${applicationRoot}/WEB-INF/search_index&lt;/value&gt;&lt;/constructor-arg&gt;
-  	  &lt;constructor-arg index="1"&gt;&lt;null /&gt;&lt;/constructor-arg&gt;
-  	  &lt;constructor-arg type="boolean"&gt;&lt;valu&gt;true&lt;/value&gt;&lt;/constructor-arg&gt;
-  	  &lt;constructor-arg&gt;&lt;ref bean="org.apache.jetspeed.search.HandlerFactory"/&gt;&lt;/constructor-arg&gt;
-    &lt;/bean&gt;</source>
-    		</p>
-    		<p>
-    		The <code>HandlerFactory</code> provides the <code>SearchEngine</code> with a list of <code>ObjectHandler</code>
-    		that will handle the various document types supported by Jetspeed-2 for search.  By default, Jetspeed-2 supports
-    		portlet instances and portlet definitions as searchable entities.  When portlets are registered to the portal,
-    		<code>searchEngine.add(pa)</code> and <code>searchEngine.add(pa.getPortletDefinitions())</code> are invoked.  This
-    		action updates the Jetspeed-2 search index.  For more information on how portlets are registered to the search engine,
-    		see <code>org.apache.jetspeed.tools.pamanager.PortletApplicationManager</code>.
-            <br/>
-            <img src="images/searchengine-c.gif" border="0"/>
-            </p>
-            </subsection>
-            <subsection name="Document Handlers Overview">
-            <p>
-            Document Handlers are responsible for the parsing of a specific document type in order to index the relevant document fields.
-            </p>
-            <p>
-            Jetspeed-2 provides 2 document handlers implementations responsible for parsing parsing the documents supported by Jetspeed-2
-            as <code>org.apache.jetspeed.search.ParsedObject</code>.  The <code>ParsedObject</code> specify the list of fields
-            and documents supported by Jetspeed-2 that can then be added to <code>org.apache.lucene.document.Document</code> and
-            written to the index through <code>indexWriter.addDocument(doc)</code> operation of the 
-            <a href="http://lucene.apache.org/java/docs/api/index.html"><code>IndexWriter</code></a>.
-            </p>
-            <p>
-            By default, Jetspeed-2 can index portlet applications and portlet definitions respectively through the
-            <code>PortletApplicationHandler</code> and <code>PortletDefinitionHandler</code>.
-            <br/>
-            <img src="images/searchhandlers-c.gif" border="0"/>
-            </p>
-            </subsection>
-            <subsection name="An Extensible Framework">
-            <p>
-            As most components in Jetspeed-2, the search engine can easily be extended to support addional document types.
-            </p>
-            </subsection>
-        </section>
-    </body>
-</document>
-
+    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 Search</title>
+        <authors>
+            <person name="David Le Strat" email="dlestrat@apache.org" />
+        </authors>
+    </properties>
+    <body>
+        <section name="Search Overview">
+            <p>
+            Jetspeed-2 provides an integration with the popular <a href="http://lucene.apache.org/">Apache Lucene</a>, 
+            a high-performance, full-featured text search engine library written entirely in Java; a technology suitable
+            for nearly any application that requires full-text search, especially cross-platform.. 
+            </p>
+            <subsection name="SearchEngine Overview">
+            <p>
+            Jetspeed-2 provides a <code>SearchEngine</code> component configured as a spring component.  The <code>SearchEngine</code>
+            component is configured in <code>WEB-INF/assembly/search.xml</code>.  The default implementation based on the embedded Lucene
+            search engine must specify the location of the search index file, the name of the analyzer class (if null the default analyzer
+            <code>StandardAnalyzer</code> is used), whether to optimize after update and the <code>HandlerFactory</code>:
+            <source>
+    &lt;bean id="org.apache.jetspeed.search.SearchEngine"
+  	  class="org.apache.jetspeed.search.lucene.SearchEngineImpl"&gt;
+  	  &lt;constructor-arg index="0"&gt;&lt;value&gt;${applicationRoot}/WEB-INF/search_index&lt;/value&gt;&lt;/constructor-arg&gt;
+  	  &lt;constructor-arg index="1"&gt;&lt;null /&gt;&lt;/constructor-arg&gt;
+  	  &lt;constructor-arg type="boolean"&gt;&lt;valu&gt;true&lt;/value&gt;&lt;/constructor-arg&gt;
+  	  &lt;constructor-arg&gt;&lt;ref bean="org.apache.jetspeed.search.HandlerFactory"/&gt;&lt;/constructor-arg&gt;
+    &lt;/bean&gt;</source>
+    		</p>
+    		<p>
+    		The <code>HandlerFactory</code> provides the <code>SearchEngine</code> with a list of <code>ObjectHandler</code>
+    		that will handle the various document types supported by Jetspeed-2 for search.  By default, Jetspeed-2 supports
+    		portlet instances and portlet definitions as searchable entities.  When portlets are registered to the portal,
+    		<code>searchEngine.add(pa)</code> and <code>searchEngine.add(pa.getPortletDefinitions())</code> are invoked.  This
+    		action updates the Jetspeed-2 search index.  For more information on how portlets are registered to the search engine,
+    		see <code>org.apache.jetspeed.tools.pamanager.PortletApplicationManager</code>.
+            <br/>
+            <img src="images/searchengine-c.gif" border="0"/>
+            </p>
+            </subsection>
+            <subsection name="Document Handlers Overview">
+            <p>
+            Document Handlers are responsible for the parsing of a specific document type in order to index the relevant document fields.
+            </p>
+            <p>
+            Jetspeed-2 provides 2 document handlers implementations responsible for parsing parsing the documents supported by Jetspeed-2
+            as <code>org.apache.jetspeed.search.ParsedObject</code>.  The <code>ParsedObject</code> specify the list of fields
+            and documents supported by Jetspeed-2 that can then be added to <code>org.apache.lucene.document.Document</code> and
+            written to the index through <code>indexWriter.addDocument(doc)</code> operation of the 
+            <a href="http://lucene.apache.org/java/docs/api/index.html"><code>IndexWriter</code></a>.
+            </p>
+            <p>
+            By default, Jetspeed-2 can index portlet applications and portlet definitions respectively through the
+            <code>PortletApplicationHandler</code> and <code>PortletDefinitionHandler</code>.
+            <br/>
+            <img src="images/searchhandlers-c.gif" border="0"/>
+            </p>
+            </subsection>
+            <subsection name="An Extensible Framework">
+            <p>
+            As most components in Jetspeed-2, the search engine can easily be extended to support addional document types.
+            </p>
+            </subsection>
+        </section>
+    </body>
+</document>
+

Modified: portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/dev-statistics.xml
URL: http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/dev-statistics.xml?rev=775034&r1=775033&r2=775034&view=diff
==============================================================================
--- portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/dev-statistics.xml (original)
+++ portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/dev-statistics.xml Fri May 15 06:50:03 2009
@@ -1,179 +1,179 @@
-<?xml version="1.0" ?>
-<!--
+<?xml version="1.0" ?>
+<!--
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
     this work for additional information regarding copyright ownership.
     The ASF licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<document>
-    <properties>
-        <title>Jetspeed-2 Statistics</title>
-        <authors>
-            <person name="David Le Strat" email="dlestrat@apache.org" />
-        </authors>
-    </properties>
-    <body>
-        <section name="Statistics Overview">
-        	<p>
-        	Jetspeed-2 provides components for collecting portal data for various application events.
-        	</p>
-        	<subsection name="Collecting Portal Data">
-        	<p>
-        	<code>PortalStatistics</code> provides APIs for collecting portal application events.  The following event types
-        	are supported out of the box:
-        	<ul>
-        	<li>Portlet rendering statistics.</li>
-        	<li>Page rendering statistics.</li>
-        	<li>User access statistics.</li>
-        	</ul>
-        	The <code>PortalStatistics</code> implementation logs usage data based on the 
-        	<a href="http://httpd.apache.org/docs/logs.html">Apache Common Log Format (CLF)</a>
-        	where each log entry is formatted in the form:
-        	<source>
-    %h %l %u %t \"%r\" %>s %b</source>
-    		where:
-			<ul>
-			<li><b>%h </b>- remote host</li>
-			<li><b>%l </b>- remote log name</li>
-			<li><b>%u </b>- remote user</li>
-			<li><b>%t </b>- time in common log time format</li>
-			<li><b>%r </b>- first line of HTTP request</li>
-			<li><b>%s </b>- HTTP status code</li>
-			<li><b>%b </b>- number of bytes sent (&quot;-&quot; if no bytes sent).</li>
-			</ul>
-        	<br/>
-        	<img src="images/portalstatistics-c.gif" border="0" />
-        	</p>
-        	<p>
-        	Statistics data is stored in 3 relational tables as illustrated below:
-        	<br/><br/>
-        	<img src="images/statistics-db.gif" border="0" />
-        	</p>
-        	<p>
-        	Each event type is mapped to a data holder that gets persisted in the statistics tables illustrated above.
-        	<img src="images/logrecord-c.gif" border="0" />
-        	<br/>
-        	Jetspeed-2 persists the collected data in batches through the <code>BatchedStatistics</code> component.
-        	<br/><br/>
-        	<img src="images/batchedstatistics-c.gif" border="0" />
-        	</p>
-        	</subsection>
-        	<subsection name="PortalStatistics Configuration">
-        	<p>
-        	The <code>PortalStatistics</code> component is configured in <code>WEB-INF/assembly/statistics.xml</code> and
-        	requires the following configuration parameters:
-        	<ul>
-               <li><b>logToCLF</b>: Whether to log to a Common Log Format file.</li>
-        	<li><b>logToDatabase</b>: Whether to record the statistics in the database.</li>
-               <li><b>maxRecordToFlush_Portlet</b>: The maximum number of portlet events that can be in the portlet statistics FIFO before a flush occurs.</li>
-               <li><b>maxRecordToFlush_User</b>: The maximum number of user events that can be in the user statistics FIFO before a flush occurs.</li>
-               <li><b>maxRecordToFlush_Page</b>: The maximum number of page events that can be in the page statistics FIFO before a flush occurs.</li>
-               <li><b>maxTimeMsToFlush_Portlet</b>: The maximum length of time between FIFO flushes for the portlet statistics FIFO. </li>
-               <li><b>maxTimeMsToFlush_User</b>: The maximum length of time between FIFO flushes for the user statistics FIFO. </li>
-               <li><b>maxTimeMsToFlush_Page</b>: The maximum length of time between FIFO flushes for the page statistics FIFO. </li>
-        	<li><b>jetspeedDSEntry</b>: The reference to the Jetspeed data source.</li>
-        	</ul>
-        	</p>
-        	<p>
-                The FIFO parameters may be adjusted depending on site specific needs.  For example, tuning the events and times down makes the system less likely to loose events in the
-                case of a failure, and also makes the user experience viewing the statistics more responsive to recent events. On the other hand, tuning them higher will reduce the overhead
-                to the database.  Generally newer sites with fewer users should use smaller tuning parameters and larger more mature sites should use larger ones.
-                </p>
-                <p>
-        	A sample configuration is provided below:
-        	<source>
-    &lt;bean id="PortalStatistics" 
-      class="org.apache.jetspeed.statistics.impl.PortalStatisticsImpl"
-      init-method="springInit"
-      destroy-method="springDestroy"&gt;
-      &lt;!-- logToCLF --&gt;
-      &lt;constructor-arg index='0' type="boolean"&gt;&lt;value&gt;false&lt;/value&gt;&lt;/constructor-arg&gt;
-      &lt;!-- logToDatabase --&gt;
-      &lt;constructor-arg index='1' type="boolean"&gt;&lt;value&gt;true&lt;/value&gt;&lt;/constructor-arg&gt;	
-      &lt;!-- maxRecordToFlush_Portal --&gt;
-      &lt;constructor-arg index='2'&gt;&lt;value&gt;300&lt;/value&gt;&lt;/constructor-arg&gt;
-      &lt;!-- maxRecordToFlush_User --&gt;
-      &lt;constructor-arg index='3'&gt;&lt;value&gt;50&lt;/value&gt;&lt;/constructor-arg&gt;	
-      &lt;!-- maxRecordToFlush_Page --&gt;
-      &lt;constructor-arg index='4'&gt;&lt;value&gt;100&lt;/value&gt;&lt;/constructor-arg&gt;	
-      &lt;!-- maxTimeMsToFlush_Portal --&gt;
-      &lt;constructor-arg  index='5'&gt;&lt;value&gt;300000&lt;/value&gt;&lt;/constructor-arg&gt;		
-      &lt;!-- maxTimeMsToFlush_User --&gt;
-      &lt;constructor-arg  index='6'&gt;&lt;value&gt;5000&lt;/value&gt;&lt;/constructor-arg&gt;
-      &lt;!-- maxTimeMsToFlush_Page --&gt;
-      &lt;constructor-arg  index='7&gt;&lt;value&gt;60000&lt;/value&gt;&lt;/constructor-arg&gt;
-      &lt;!-- jetspeedDSEntry --&gt;
-      &lt;constructor-arg  index='8'&gt;&lt;ref bean="JetspeedDS"/&gt;&lt;/constructor-arg&gt;
-    &lt;/bean&gt;</source>
-        	</p>
-        	</subsection>        	
-		</section>
-  <section name="Viewing Statistics">
-        	<subsection name="Where are the Event Recorded?">
-        	<p>
-        	Portal statistics events collection is injected at multiple points in the portal engine. Some examples are
-        	provided below.
-        	</p>
-        	<p>
-        	For user events, the <code>SecurityValveImpl</code> logs a user login event in <code>getSubject(RequestContext request)</code>.
-        	<source>
-    statistics.logUserLogin(request, 0);</source>
-        	</p>
-        	<p>
-        	For portlet events, the <code>RenderingJobImpl</code> invoked in <code>RenderingJob</code> <code>buildRenderingJob</code> logs
-        	a portlet access event.
-        	<source>
-    statistics.logPortletAccess(requestContext, fragment.getName(), PortalStatistics.HTTP_OK, end - start);</source>       	
-        	</p>
-    		</subsection>
-    	
-		</section>
- <section name="Data Aggregation Overview">
-            <p>
-            Jetspeed-2 provides a mechanism for aggregating portal statistics for reporting purpose.
-            </p>
-            <subsection name="Retrieving Aggregate Statistics">
-            <p>
-            The <code>PortalStatistics</code> component exposes a <code>queryStatistics</code> method that given
-            a <code>StatisticsQueryCriteria</code> will return <code>AggregateStatistics</code>.
-        	<source>
-    AggregateStatistics queryStatistics(StatisticsQueryCriteria criteria)</source>
-    		The <code>AggregateStatistics</code> can then be used for reporting purpose.
-            <br/>
-        	<img src="images/aggregatestatistics-c.gif" border="0" />
-			</p>
-			</subsection>
-			<subsection name="Using Aggregate Statistics">
-			<p>
-			As illustrated in <a href="../adminguide/statistics.html">viewing statistics</a>, Jetspeed-2 provides a default reporting portlet
-			for view statistics.  To query statistics, a <code>StatisticsQueryCriteria</code> must be set.  According to this
-			criteria the <code>PortalStatistics</code> <code>queryStatistics()</code> method will return an <code>AggregateStatistics</code>.
-			</p>
-			<source>
-        StatisticsQueryCriteria criteria = statistics.createStatisticsQueryCriteria();
-        ...
-        criteria.setUser(user);
-        criteria.setListsize("5");
-        criteria.setSorttype("count");
-        criteria.setSortorder("desc");
-        criteria.setTimePeriod(timeperiod);
-        criteria.setQueryType(queryType);
-        AggregateStatistics stats = statistics.getDefaultEmptyAggregateStatistics();
-        ...
-        statistics.forceFlush();
-        stats = statistics.queryStatistics(criteria);</source>
-			</subsection>
-		</section>				
-    </body>
-</document>
-
+    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 Statistics</title>
+        <authors>
+            <person name="David Le Strat" email="dlestrat@apache.org" />
+        </authors>
+    </properties>
+    <body>
+        <section name="Statistics Overview">
+        	<p>
+        	Jetspeed-2 provides components for collecting portal data for various application events.
+        	</p>
+        	<subsection name="Collecting Portal Data">
+        	<p>
+        	<code>PortalStatistics</code> provides APIs for collecting portal application events.  The following event types
+        	are supported out of the box:
+        	<ul>
+        	<li>Portlet rendering statistics.</li>
+        	<li>Page rendering statistics.</li>
+        	<li>User access statistics.</li>
+        	</ul>
+        	The <code>PortalStatistics</code> implementation logs usage data based on the 
+        	<a href="http://httpd.apache.org/docs/logs.html">Apache Common Log Format (CLF)</a>
+        	where each log entry is formatted in the form:
+        	<source>
+    %h %l %u %t \"%r\" %>s %b</source>
+    		where:
+			<ul>
+			<li><b>%h </b>- remote host</li>
+			<li><b>%l </b>- remote log name</li>
+			<li><b>%u </b>- remote user</li>
+			<li><b>%t </b>- time in common log time format</li>
+			<li><b>%r </b>- first line of HTTP request</li>
+			<li><b>%s </b>- HTTP status code</li>
+			<li><b>%b </b>- number of bytes sent (&quot;-&quot; if no bytes sent).</li>
+			</ul>
+        	<br/>
+        	<img src="images/portalstatistics-c.gif" border="0" />
+        	</p>
+        	<p>
+        	Statistics data is stored in 3 relational tables as illustrated below:
+        	<br/><br/>
+        	<img src="images/statistics-db.gif" border="0" />
+        	</p>
+        	<p>
+        	Each event type is mapped to a data holder that gets persisted in the statistics tables illustrated above.
+        	<img src="images/logrecord-c.gif" border="0" />
+        	<br/>
+        	Jetspeed-2 persists the collected data in batches through the <code>BatchedStatistics</code> component.
+        	<br/><br/>
+        	<img src="images/batchedstatistics-c.gif" border="0" />
+        	</p>
+        	</subsection>
+        	<subsection name="PortalStatistics Configuration">
+        	<p>
+        	The <code>PortalStatistics</code> component is configured in <code>WEB-INF/assembly/statistics.xml</code> and
+        	requires the following configuration parameters:
+        	<ul>
+               <li><b>logToCLF</b>: Whether to log to a Common Log Format file.</li>
+        	<li><b>logToDatabase</b>: Whether to record the statistics in the database.</li>
+               <li><b>maxRecordToFlush_Portlet</b>: The maximum number of portlet events that can be in the portlet statistics FIFO before a flush occurs.</li>
+               <li><b>maxRecordToFlush_User</b>: The maximum number of user events that can be in the user statistics FIFO before a flush occurs.</li>
+               <li><b>maxRecordToFlush_Page</b>: The maximum number of page events that can be in the page statistics FIFO before a flush occurs.</li>
+               <li><b>maxTimeMsToFlush_Portlet</b>: The maximum length of time between FIFO flushes for the portlet statistics FIFO. </li>
+               <li><b>maxTimeMsToFlush_User</b>: The maximum length of time between FIFO flushes for the user statistics FIFO. </li>
+               <li><b>maxTimeMsToFlush_Page</b>: The maximum length of time between FIFO flushes for the page statistics FIFO. </li>
+        	<li><b>jetspeedDSEntry</b>: The reference to the Jetspeed data source.</li>
+        	</ul>
+        	</p>
+        	<p>
+                The FIFO parameters may be adjusted depending on site specific needs.  For example, tuning the events and times down makes the system less likely to loose events in the
+                case of a failure, and also makes the user experience viewing the statistics more responsive to recent events. On the other hand, tuning them higher will reduce the overhead
+                to the database.  Generally newer sites with fewer users should use smaller tuning parameters and larger more mature sites should use larger ones.
+                </p>
+                <p>
+        	A sample configuration is provided below:
+        	<source>
+    &lt;bean id="PortalStatistics" 
+      class="org.apache.jetspeed.statistics.impl.PortalStatisticsImpl"
+      init-method="springInit"
+      destroy-method="springDestroy"&gt;
+      &lt;!-- logToCLF --&gt;
+      &lt;constructor-arg index='0' type="boolean"&gt;&lt;value&gt;false&lt;/value&gt;&lt;/constructor-arg&gt;
+      &lt;!-- logToDatabase --&gt;
+      &lt;constructor-arg index='1' type="boolean"&gt;&lt;value&gt;true&lt;/value&gt;&lt;/constructor-arg&gt;	
+      &lt;!-- maxRecordToFlush_Portal --&gt;
+      &lt;constructor-arg index='2'&gt;&lt;value&gt;300&lt;/value&gt;&lt;/constructor-arg&gt;
+      &lt;!-- maxRecordToFlush_User --&gt;
+      &lt;constructor-arg index='3'&gt;&lt;value&gt;50&lt;/value&gt;&lt;/constructor-arg&gt;	
+      &lt;!-- maxRecordToFlush_Page --&gt;
+      &lt;constructor-arg index='4'&gt;&lt;value&gt;100&lt;/value&gt;&lt;/constructor-arg&gt;	
+      &lt;!-- maxTimeMsToFlush_Portal --&gt;
+      &lt;constructor-arg  index='5'&gt;&lt;value&gt;300000&lt;/value&gt;&lt;/constructor-arg&gt;		
+      &lt;!-- maxTimeMsToFlush_User --&gt;
+      &lt;constructor-arg  index='6'&gt;&lt;value&gt;5000&lt;/value&gt;&lt;/constructor-arg&gt;
+      &lt;!-- maxTimeMsToFlush_Page --&gt;
+      &lt;constructor-arg  index='7&gt;&lt;value&gt;60000&lt;/value&gt;&lt;/constructor-arg&gt;
+      &lt;!-- jetspeedDSEntry --&gt;
+      &lt;constructor-arg  index='8'&gt;&lt;ref bean="JetspeedDS"/&gt;&lt;/constructor-arg&gt;
+    &lt;/bean&gt;</source>
+        	</p>
+        	</subsection>        	
+		</section>
+  <section name="Viewing Statistics">
+        	<subsection name="Where are the Event Recorded?">
+        	<p>
+        	Portal statistics events collection is injected at multiple points in the portal engine. Some examples are
+        	provided below.
+        	</p>
+        	<p>
+        	For user events, the <code>SecurityValveImpl</code> logs a user login event in <code>getSubject(RequestContext request)</code>.
+        	<source>
+    statistics.logUserLogin(request, 0);</source>
+        	</p>
+        	<p>
+        	For portlet events, the <code>RenderingJobImpl</code> invoked in <code>RenderingJob</code> <code>buildRenderingJob</code> logs
+        	a portlet access event.
+        	<source>
+    statistics.logPortletAccess(requestContext, fragment.getName(), PortalStatistics.HTTP_OK, end - start);</source>       	
+        	</p>
+    		</subsection>
+    	
+		</section>
+ <section name="Data Aggregation Overview">
+            <p>
+            Jetspeed-2 provides a mechanism for aggregating portal statistics for reporting purpose.
+            </p>
+            <subsection name="Retrieving Aggregate Statistics">
+            <p>
+            The <code>PortalStatistics</code> component exposes a <code>queryStatistics</code> method that given
+            a <code>StatisticsQueryCriteria</code> will return <code>AggregateStatistics</code>.
+        	<source>
+    AggregateStatistics queryStatistics(StatisticsQueryCriteria criteria)</source>
+    		The <code>AggregateStatistics</code> can then be used for reporting purpose.
+            <br/>
+        	<img src="images/aggregatestatistics-c.gif" border="0" />
+			</p>
+			</subsection>
+			<subsection name="Using Aggregate Statistics">
+			<p>
+			As illustrated in <a href="../adminguide/statistics.html">viewing statistics</a>, Jetspeed-2 provides a default reporting portlet
+			for view statistics.  To query statistics, a <code>StatisticsQueryCriteria</code> must be set.  According to this
+			criteria the <code>PortalStatistics</code> <code>queryStatistics()</code> method will return an <code>AggregateStatistics</code>.
+			</p>
+			<source>
+        StatisticsQueryCriteria criteria = statistics.createStatisticsQueryCriteria();
+        ...
+        criteria.setUser(user);
+        criteria.setListsize("5");
+        criteria.setSorttype("count");
+        criteria.setSortorder("desc");
+        criteria.setTimePeriod(timeperiod);
+        criteria.setQueryType(queryType);
+        AggregateStatistics stats = statistics.getDefaultEmptyAggregateStatistics();
+        ...
+        statistics.forceFlush();
+        stats = statistics.queryStatistics(criteria);</source>
+			</subsection>
+		</section>				
+    </body>
+</document>
+

Modified: portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/index.xml?rev=775034&r1=775033&r2=775034&view=diff
==============================================================================
--- portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/index.xml (original)
+++ portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/index.xml Fri May 15 06:50:03 2009
@@ -33,44 +33,26 @@
 <ul>
 <li><a href='http://www.manning.com/hepper/' target='_blank'>Portlets and Apache Portals Book</a></li>
 </ul>
-
-<h2>Custom Building with Ant and Eclipse</h2>
-<p>If you have never used Maven before, the easiest build option for you may be to build with the Ant-Eclipse Build.
-This build allows you to build a custom portal with Ant. We also provide a custom installer builder.
-For your portlet applications, we provide Eclipse WTP support. Although the actual programming tutorial is incomplete, the tutorial describing 
-building with Ant and Eclipse is completed. For version 2.1.3, this is the recommended <b>quickest</b>  build for getting custom projects up and running in no time.
+<p>The core team of Jetspeed developers work directly with the source code, building the latest versions of Jetpeed. We welcome all software developers to work
+with us. However, the full development process maybe overkill for your needs. If you simply want to create and build a customized Jetspeed portal, and make extensions to it,
+check out the <i>Custom Build</i> section below. If you want to get more involved and start contributing to Jetspeed, see the section below on <i>Building from Source</i>
 </p>
-<li><a href='http://portals.apache.org/tutorials/jetspeed-2-ant/' target='_blank'>Jetspeed Tutorial - Building a Custom Portal with Ant and Eclipse</a></li>
-
+<p>Best place to get started developing Jetspeed is to read our <a href='../buildguide/index.html'>Build Guide</a></p>
+<p>Starting with Jetspeed 2.2, all Jetspeed building is with Maven-2. The 2.1 branch used to support Maven-1, Maven-2, and Ant. We have consolidated all features from all 2.1.x builds into one new, Maven-2 build for version 2.2 and beyond</p>  
 <h2>Custom Building with Maven Plugins</h2>
-<p>Jetspeed 2.1 can be built with either Maven-1 or Maven-2.
-You can actually build your own portal without the Jetspeed source. 
+<p>With the Jetspeed Custom build, you can actually build your own portal without the Jetspeed source. 
 You will want to customize your Jetspeed build, overriding the skins and themes, adding your own portlet applications and perhaps overriding
-key components of the portal. To do so, we provide three custom build frameworks: one with Maven-1, the second with Maven-2, the third and newest with Ant and Eclipse.
-With the custom build, you can easily build and create your own Jetspeed powered portal without ever building Jetspeed itself.</p>
-<p>
-Many developers still prefer Maven-1. If you are new to Maven, then maybe its best to go with the new version (2).
+key components of the portal. To do so, we provide a custom build framework extending Maven-2.
 </p>
-<h3>Maven-2 Custom build</h3>
-<ul>
-<li><a href='http://portals.apache.org/tutorials/jetspeed-2/' target='_blank'>Jetspeed Tutorial - Building a Custom Portal with the Maven-2 Plugin</a></li>
-<li><a href='maven-2-custom.html' target='_blank'>Building a Custom Portal with the Maven-2 Plugin</a></li>
-</ul>
-<h3>Maven-1 Custom build (deprecated)</h3>
+<p>With the custom build, you can easily build and create your own Jetspeed powered portal without ever building Jetspeed itself.</p>
+<p>Creating a custom build of Jetspeed is probably the most common usage of Jetspeed. Documentation for using the Custom Build and Plugins can be found here:</p> 
 <ul>
-<li><a href='m1-getting-started-binary.html' target='_blank'>Building a Custom Portal with the Maven-1 Plugin</a></li>
-<li><a href='j2-maven-plugin.html' target='_blank'>Maven-1 Plugin Documentation</a></li>
+<li><a href='../buildguide/jetspeed-archetype.html'>Jetspeed Custom Build with Maven</a></li>
 </ul>
-<h3>Future Directions: Jetspeed 2.2</h3>
-<p>With the next major release version 2.2, the current Maven2 build will be deprecated, and replaced with a new Maven2 build.
-The Maven1 build will be completely dropped.
-</p>
 <h2>Building from Source</h2>
-<p>If you need to build the source, here are the guides:</p>
+<p>If you need to build the source, reference the Build Guide:</p>
 <ul>
-<li><a href='maven-2-build.html' target='_blank'>Building Jetspeed from Source with Maven-2</a></li>
-<li><a href='m1-getting-started-source.html' target='_blank'>Building Jetspeed Source with Maven-1</a></li>
-
+<li><a href='../buildguide/maven-2-build.html' target='_blank'>Building Jetspeed from Source with Maven-2</a></li>
 </ul>
 <p>
 Jetspeed is built from the command line with Maven. However, you can still develop, compile, debug, remote debug, all from within Eclipse.
@@ -97,7 +79,11 @@
 <ul>
 <li><a href='http://www.bluesunrise.com/portlet-api/index.html' target='_blank'>Portlet API Docs</a></li>
 <li><a href='../multiproject/jetspeed-api/apidocs/index.html' target='_blank'>Jetspeed API Docs</a></li>
-</ul>			
+</ul>
+<h2>Tutorials</h2>
+<p>The tutorial puts everything together: custom builds, portlet development, deployment. You can find the Jetspeed Tutorial here:</p>
+<a href='../tutorial/index.html'>Jetspeed Tutorial</a>
+		
 		</section>
 	</body>
 </document>
\ No newline at end of file

Modified: portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/patches.xml
URL: http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/patches.xml?rev=775034&r1=775033&r2=775034&view=diff
==============================================================================
--- portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/patches.xml (original)
+++ portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-dev/src/site/xdoc/patches.xml Fri May 15 06:50:03 2009
@@ -24,21 +24,13 @@
 		</authors>
 	</properties>
 	<body>
-		<section name="Guide to Jetspeed-2 Development">
-		    <subsection name="Working with Jetspeed-2 Source Code">
-		    <p>
-		    For information on how to get started with Jetspeed-2 source code, check 
-			<a href="maven-2-build.html">Building Jetspeed 2.1.x from Source with Maven-2</a>.
-		    </p>
-		    </subsection>
-			<subsection name="How to Submit Patches?">
+		<section name="How to Submit Patches">
 			<p>
 			When working with Eclipse with the <a href="http://subclipse.tigris.org/">Subclipse plugin</a>,
 			it is possible to generate a patch for the code changed as illustrated below:
 			<br/><br/>
 			<img src="images/create-patch.gif" border="0" />
 			</p>
-			</subsection>
 		</section>
 	</body>
 </document>
\ No newline at end of file

Propchange: portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-users/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri May 15 06:50:03 2009
@@ -0,0 +1 @@
+target

Modified: portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-users/pom.xml
URL: http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-users/pom.xml?rev=775034&r1=775033&r2=775034&view=diff
==============================================================================
--- portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-users/pom.xml (original)
+++ portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-users/pom.xml Fri May 15 06:50:03 2009
@@ -27,18 +27,26 @@
 
   <artifactId>jetspeed-guide-users</artifactId>
   <name>Jetspeed Users Guide</name>
-  <description>Jetspeed Users Guide</description>
-  <!-- FIXME: this causes an NPE in maven dearest
+  <description>Jetspeed 2.2 Users Guide</description>
   <parent>
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <artifactId>jetspeed-docs</artifactId>
-    <version>2.2</version>
+	  <artifactId>jetspeed-site-docs</artifactId>
+      <groupId>org.apache.portals.site</groupId>
+      <version>2.2</version>
   </parent>
   <packaging>pom</packaging>
-  -->
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.2</version>
   
+ <!-- this is for a bug Maven, see http://jira.codehaus.org/browse/MSHARED-18 
+      should be removed once Maven incorporates this bug in an official release-->   
+ <build>
+   <plugins>
+     <plugin>
+       <groupId>org.apache.maven.plugins</groupId>
+       <artifactId>maven-site-plugin</artifactId>
+       <version>2.0</version>
+     </plugin>
+   </plugins>
+ </build>
+   
   <reporting>
     <plugins>
       <plugin>

Modified: portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-users/src/site/site.xml
URL: http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-users/src/site/site.xml?rev=775034&r1=775033&r2=775034&view=diff
==============================================================================
--- portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-users/src/site/site.xml (original)
+++ portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-users/src/site/site.xml Fri May 15 06:50:03 2009
@@ -35,13 +35,6 @@
       <item name="Build Guide" href="../build/guide/index.html"/>
       <item name="Deployers Guide" href="../deployguide/index.html"/>
       <item name="Developer Guide" href="../devguide/index.html"/>
-
-      <item name="Applications" href="http://portals.apache.org/applications/" />
-      <item name="Portals" href="http://portals.apache.org/" />
-      <item name="Jetspeed-2.1.3" href="http://portals.apache.org/jetspeed-2.1.3/" />
-      <!-- TODO: During build, pdf docs need to be generated. 
-      <item name="PDF Documentation" href="/jetspeed2.pdf" img="images/pdf.gif" />
-      -->      
     </links>
 
     	<menu name="Users Guide">

Propchange: portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri May 15 06:50:03 2009
@@ -0,0 +1 @@
+target

Added: portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/pom.xml
URL: http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/pom.xml?rev=775034&view=auto
==============================================================================
--- portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/pom.xml (added)
+++ portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/pom.xml Fri May 15 06:50:03 2009
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  
+  $Id$
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <prerequisites>
+    <maven>2.0.9</maven>
+  </prerequisites>
+
+  <artifactId>jetspeed-tutorial</artifactId>
+  <name>Jetspeed Tutorial</name>
+  <description>Jetspeed 2.2 Tutorial</description>
+  <packaging>pom</packaging>
+  <parent>
+	  <artifactId>jetspeed-site-docs</artifactId>
+      <groupId>org.apache.portals.site</groupId>
+      <version>2.2</version>
+  </parent>
+  
+ <!-- this is for a bug Maven, see http://jira.codehaus.org/browse/MSHARED-18 
+      should be removed once Maven incorporates this bug in an official release--> 
+ <build>
+   <plugins>
+     <plugin>
+       <groupId>org.apache.maven.plugins</groupId>
+       <artifactId>maven-site-plugin</artifactId>
+       <version>2.0</version>
+     </plugin>
+   </plugins>
+ </build>
+  
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <reportSets>
+          <reportSet>            
+            <reports>              
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+    </plugins>
+  </reporting>
+
+</project>

Propchange: portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/downloads/tutorial-resources.zip
URL: http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/downloads/tutorial-resources.zip?rev=775034&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/downloads/tutorial-resources.zip
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/01/run-it-small.png
URL: http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/01/run-it-small.png?rev=775034&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/01/run-it-small.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/01/run-it.png
URL: http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/01/run-it.png?rev=775034&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/01/run-it.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/02/jetexpress-portal-small.png
URL: http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/02/jetexpress-portal-small.png?rev=775034&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/02/jetexpress-portal-small.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/02/jetexpress-portal.png
URL: http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/02/jetexpress-portal.png?rev=775034&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/02/jetexpress-portal.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/02/jetspeed-page-decorator.png
URL: http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/02/jetspeed-page-decorator.png?rev=775034&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/02/jetspeed-page-decorator.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/02/jetspeed-portlet.png
URL: http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/02/jetspeed-portlet.png?rev=775034&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/02/jetspeed-portlet.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/03/bonjourmonde-portlet.png
URL: http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/03/bonjourmonde-portlet.png?rev=775034&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/03/bonjourmonde-portlet.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/03/eclipse-classpath.png
URL: http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/03/eclipse-classpath.png?rev=775034&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/03/eclipse-classpath.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/03/import-project.png
URL: http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/03/import-project.png?rev=775034&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/03/import-project.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/03/import-project2.png
URL: http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/03/import-project2.png?rev=775034&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/03/import-project2.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/03/jsp-portlet.png
URL: http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/03/jsp-portlet.png?rev=775034&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/03/jsp-portlet.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/03/menu-tutorial.png
URL: http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/03/menu-tutorial.png?rev=775034&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/03/menu-tutorial.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/03/new-portlet.png
URL: http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/03/new-portlet.png?rev=775034&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/03/new-portlet.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/03/override-impl.png
URL: http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/03/override-impl.png?rev=775034&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/resources/images/03/override-impl.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/site.xml
URL: http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/site.xml?rev=775034&view=auto
==============================================================================
--- portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/site.xml (added)
+++ portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/site.xml Fri May 15 06:50:03 2009
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<project name="Jetspeed Tutorial">
+  <publishDate format="d MMMM yyyy"/>
+  <bannerLeft>
+    <name>Jetspeed Tutorial</name>
+    <src>images/jetspeed-logo.gif</src>
+    <href>http://portals.apache.org/jetspeed-2/</href>
+  </bannerLeft>
+  <skin>
+    <groupId>org.apache.portals.jetspeed-2</groupId>
+    <artifactId>jetspeed-maven-skin</artifactId>
+    <version>2.2-SNAPSHOT</version>
+  </skin>
+  <body>
+
+    <links>
+      <item name="Home" href="../index.html"/>
+      <item name="Admin Guide" href="../adminguide/index.html"/>
+      <item name="Build Guide" href="../build/guide/index.html"/>
+      <item name="Deployers Guide" href="../deployguide/index.html"/>
+      <item name="Developer Guide" href="../devguide/index.html"/>
+    </links>
+
+    <menu name="Jetspeed Tutorial">
+      <item name="Welcome" href="index.html"/>
+      <item name="Before you start" href="before-you-start.html"/>
+    </menu>
+    <menu name="01. Custom Portal Generation">
+      <item name="Generating a Jetspeed Portal" href="01/genapp.html"/>
+      <item name="Project Structure" href="01/project-structure.html"/>
+      <item name="Configure Maven Build" href="01/configure-maven.html"/>
+      <item name="Build and Deploy Custom Portal" href="01/build-it.html"/>
+      <item name="Run the Custom Portal" href="01/run-it.html"/>
+    </menu>
+    <menu name="02. Customizing Your Portal Design">
+      <item name="Decorators and Themes" href="02/customizing-overview.html"/>
+      <item name="Page Decoration" href="02/page-decoration.html"/>
+      <item name="Portlet Decoration" href="02/portlet-decoration.html"/>
+      <item name="Desktop Themes" href="02/desktop-theme.html"/>
+      <item name="Changing the Default Page" href="02/default-page.html"/>
+      <item name="Deploying your Customizations" href="02/deploy-custom.html"/>
+    </menu>
+    <menu name="03. Portlet Development 101">
+      <item name="Overview" href="03/overview.html"/>
+      <item name="Eclipse" href="03/eclipse.html"/>
+      <item name="Hello World" href="03/hello.html"/>
+      <item name="Adding a Page" href="03/tutorial-psml.html"/>
+      <item name="JSP and Portlet API Taglib" href="03/taglib.html"/>
+    </menu>
+    <menu name="04. Jetspeed Services">
+      <item name="Services Tutorial Portlet" href="04/jetspeed-service.html"/>
+    </menu>
+    <menu name="Reference">
+      <item name="Build commands" href="reference/build-commands.html" />
+    </menu>
+  </body>
+</project>

Propchange: portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/site.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/site/jetspeed/jetspeed-2.2/jetspeed-tutorial/src/site/site.xml
------------------------------------------------------------------------------
    svn:keywords = Id