portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r747185 [5/7] - in /portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE: components/capability/xdocs/ components/cm/xdocs/ components/deploy-tool/xdocs/ components/portal/xdocs/ components/rdbms/xdocs/ components/search/xdocs/ com...
Date Mon, 23 Feb 2009 22:55:07 GMT
Added: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/guide-profiler.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/guide-profiler.xml?rev=747185&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/guide-profiler.xml (added)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/guide-profiler.xml Mon Feb 23 22:54:40 2009
@@ -0,0 +1,565 @@
+<?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>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.
+The profiler locates the following kinds of portal resources:
+<ul>
+    <li>PSML pages</li>
+    <li>Folders</li>
+    <li>Menus</li>
+    <li>Links</li>
+</ul>
+When a request is received by the portal, the profiler will compute a normalized instruction set, known
+as a profile locator. The locator is then added to the request context, from which subsequent components on the
+Jetspeed pipeline, most notably the Page Manager and Portal Site components, can take the profile locator 
+and use it to find a requested resource. For example, the Page Manager uses the locator to find a page or folder. 
+The Portal Site component  uses the locator build the options on a menu. 
+</p>
+<p>    
+The profile locator is the output from the profiler. The input is a normalized set of runtime parameters and state.
+The profiler input is defined in profiling rules, and can be made of any Java class available on the pipeline. 
+Jetspeed comes with quite a few predefined rules for taking criteria from request parameters, HTTP headers,
+security information, language and session attributes. The profiler is invoked during the Jetspeed request 
+processing pipeline in the profiler valve. 
+<img src="devguide/images/profiler-pipeline.jpg" border="1"/>   
+</p>
+<p>  
+All of these runtime parameters are called the <i>profile criterion</i>, which the profiler uses to locate 
+portal resources. 
+</p>
+</section>
+<section name="Located Portal Resources: Pages">          
+<p>
+The Profiler searches over a directory tree of PSML pages trying to locate a 
+PSML page to be displayed. By default, this directory structure is found under WEB-INF/pages. 
+The pages directory can also be stored in the database. This directory structure, comprised of
+portal resources (pages, folders, menus, links), is a <i>physical</i> representation of the portal site.
+The Jetspeed team plans to also support <i>logical</i> views of the portal site in future releases.
+</p>
+<p>
+Analogous to a file system, there is one physical root to the portal site. However, using the concept of <i>subsites</i>, 
+the Jetspeed site can support entire subsites that are not visible to other subsites, or the main site.
+There are several reserved (system) directories standardized by the profiler:
+<table>
+    <tr>
+    <th>Reserved Folder</th>
+    <th>Description</th>
+    </tr>
+    <tr>
+        <td>_user</td>
+        <td>holds all user-specific folders and pages</td>
+    </tr>
+    <tr>
+        <td>_role</td>
+        <td>holds all role-organized folders and pages</td>
+    </tr>
+    <tr>
+        <td>_group</td>
+        <td>holds all group-organized folders and pages</td>
+    </tr>    
+    <tr>
+        <td>_subsite-root</td>
+        <td>contains complete subsite trees, exactly like root tree</td>
+    </tr>    
+</table>        
+<img src="devguide/images/pages.jpg" border="1"/>           
+</p>    
+<p>By applying profiling rules, the profiler locates pages in the portal site directory.</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 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 rule using 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 Criteria'>
+<p>
+A Rule Criterion specifies one criterion in a list of profiling rule criteria.
+The rule is used to build a normalized profiling locator and then 
+locate a portal resource based on the current user request.    
+Rule Criteria are templates for locating profile properties. 
+Criteria consist of:
+<table>
+    <tr><td>Type</td>
+        <td>The type of criterion. Types are configured in the profiler spring configuraiton. 
+        Each type maps to a <i>rule criterion resolver</i>. A resolver is a Java class which maps request input
+        to a normalized location instruction. Valid resolvers are provided in the table below.        
+        </td>
+    </tr>
+    <tr>
+        <td>Fallback Order</td>
+        <td>The sequential in which to apply this criterion within the profiling rule.</td>
+    </tr>
+    <tr>
+        <td>Fallback Type</td>
+        <td>After evaluation this criterion, the rule can either continue processing the remaining 
+            criteria, or stop processing. The fallback type determines how to continue processing.
+            Valid values are:
+             <table>
+                 <tr>
+                     <td>FALLBACK_CONTINUE</td>
+                     <td>evaluate this criterion and if it fails continue to the next criterion</td>
+                 </tr>
+                 <tr>
+                     <td>FALLBACK_STOP</td>
+                     <td>evaluate this criterion and if it fails stop evaluation criteria for this rule</td>
+                 </tr>
+                 <tr>
+                     <td>FALLBACK_LOOP</td>
+                     <td>evaluate this criterion and if it fails continue evaluating</td>
+                 </tr>                 
+             </table>
+        </td>
+    </tr>  
+    <tr>
+        <td>Name</td>
+        <td>The unique name (per rule) of this criterion. Upon matches, the name is mapped to the profile locator property name.</td>
+    </tr> 
+    <tr>
+        <td>Value</td>
+        <td>The default value (not required) to use for this criterion when resolution fails.</td>
+    </tr>
+</table>    
+More complex implementations will need to use other inputs in mapping to resources such as Cookies, IP Address Ranges, Statistical Resource Usage Analysis, or Business Rules.
+</p>
+</subsection>
+<subsection name='Rule Criterion Resolvers'>
+<p>
+The table below displays all default rule criterion resolvers available with Jetspeed out of the box.
+Resolvers are Java classes, implementing the interface from the Jetspeed API <i>org.apache.jetspeed.profiler.rules.RuleCriterionResolver</i>.
+You may use this default set of resolvers to build your own profiling rules. Rules are currently stored in the 
+Jetspeed database. Portal administrators may edit the rules using an administrative portlet. In the demo system,
+login as the user "admin" to see an example of the Jetspeed Profiler Administration portlet.
+</p>
+<p>Additionally, you may add your own resolvers to Jetspeed. You will need to create a jar file
+ holding your custom resolvers, and then drop them into the Jetspeed webapp's class path. Resolvers
+ will need to be given a unique name. This is done by modifying the profiler.xml in the Spring assembly.
+ See the section below on configuration to see where to add a resolver to the Spring configuration.        
+<table>
+    <tr>
+    <th>Resolver</th>
+    <th>Description</th>
+    </tr>
+    <tr>
+        <td>request</td>
+        <td>resolve by matching a request parameter by name, returning the request parameter value for a locator property taking the name of the criterion</td>
+    </tr>
+    <tr>
+        <td>session</td>
+        <td>resolve by matching a session attribute by name, returning the session attribute value for a locator property taking the name of the criterion</td>
+    </tr>    
+    <tr>
+        <td>request.session</td>
+        <td>resolve by first matching a request parameter by name. If not matched, try matching a session attribute name, returning the request parameter or session attribute value for a locator property taking the name of the criterion</td>
+    </tr>
+    <tr>
+        <td>path</td>
+        <td>resolve by matching the PSML page <i>path</i> value of the current request. The path is typically the path and name of a page, such as <i>default-page</i> for a locator property named <quote>path</quote></td>
+    </tr>
+    <tr>
+        <td>path.session</td>
+        <td>resolve by matching the PSML page <i>path</i> value of the current request. The path is typically the path and name of a page, such as <i>default-page</i>. If fails to find a valid path in the request, will then look in the session for the page value. The locator property will be named <quote>path</quote></td>
+    </tr>    
+    <tr>
+        <td>hard.coded</td>
+        <td>resolve to a hard.coded default value, for example, set a locator property named page to <quote>/my-account.psml</quote></td>
+    </tr>
+    <tr>
+        <td>user</td>
+        <td>resolve by matching the name of the current authenticated user. The username is mapped to a locator property named <quote>user</quote></td>
+    </tr>
+    <tr>
+        <td>role</td>
+        <td>resolve by matching all of the security roles of the current authenticated user (in the JAAS Subject of the request context) and putting them in a comma-separated list. The locator property should be named <quote>role</quote>. The role criterion is often used in combination with path criteria, to create a role-fallback rule that searches over all security roles for a given user.</td>
+    </tr>
+    <tr>
+        <td>group</td>
+        <td>resolve by matching all of the groups of the current authenticated user  (in the JAAS Subject of the request context)  and putting them in a comma-separated list. The locator property should be named <quote>group</quote>. The group criteion is often used in combination with path criteria, to create a group-fallback rule that searches over all security groups for a given user.</td>
+    </tr>    
+    <tr>
+        <td>rolecombo</td>
+        <td>resolve by matching all of the security roles of the current authenticated user (in the JAAS Subject of the request context) and putting them in a dash-separated string, for example: (role1-role2-role3). The locator property should be named <quote>role</quote>. The role criterion is often used in combination with path criteria, to create a role-fallback rule that searches over all security roles for a given user.</td>
+    </tr>
+    <tr>
+        <td>mediatype</td>
+        <td>resolve by matching the media type (HTML,XHTML,WML...) from the request context. Sets a locator property named <quote>mediatype</quote></td>
+    </tr>
+    <tr>
+        <td>language</td>
+        <td>resolve by matching the browser's language from the request context locale (originating from the HTML headers). Sets a locator property named <quote>language</quote></td>
+    </tr>        
+    <tr>
+        <td>country</td>
+        <td>resolve by matching the browser's country code from the request context locale (originating from the HTML headers). Sets a locator property named <quote>country</quote></td>
+    </tr>
+    <tr>
+        <td>group.role.user</td>
+        <td>resolve by first matching on a request parameter named <quote>group</quote>. If that fails, resolve on a request parameter named <quote>role</quote>. If that fails, resolve by matching the name of the current authenticated user. The username is mapped to a locator property named <quote>user</quote></td>
+    </tr>    
+    <tr>
+        <td>user.attribute</td>
+        <td>resolve by matching a Portlet API User Attribute by name, returning the user attribute value for a locator property taking the name of the criterion</td>
+    </tr>        
+    <tr>
+        <td>user.agent</td>
+        <td>resolve by matching the browser's (client) user agent from the request context device capabilities (originating from the HTML headers)</td>
+    </tr>
+    <tr>
+        <td>hostname</td>
+        <td>resolve by matching the host name from the server name in the request, returning the host name</td>
+    </tr>       
+    <tr>
+        <td>domain</td>
+        <td>resolve by matching the domain from the server name in the request, returning the domain</td>
+    </tr>       
+    <tr>
+        <td>navigation</td>
+        <td>A directive to changes the current navigation path during a profile location resolution performed by the page manager. The value can be the location of a folder, for example <quote>/pages/freecontent</quote></td>
+    </tr>       
+</table>     
+<i>Note that all criteria will fall back to the default value when no match is made. Locator property expects a criterion named <quote>navigation</quote></i> 
+</p>      
+</subsection>
+<subsection name='Default Rules'>    
+<p>
+Several rules are provided by default with the Jetspeed system.   
+The rules in the table below display the criterion in a most-specific to least-specific ordering.
+</p>    
+<table>
+    <tr>
+    <th>Rule</th>
+    <th>Description</th>
+    </tr>
+    <tr>
+        <td>j1</td>
+        <td>
+            <p>Implements the Jetspeed-1 hard-coded profiler fallback algorithm, resolving in a most-specific to least-specific algorithm:</p>
+            <table>
+                <tr>
+                    <th>criterion</th>
+                    <th>name</th>
+                    <th>value</th>
+                    <th>fallback</th>
+                </tr>                    
+                <tr>
+                    <td>country</td>
+                    <td>country</td>
+                    <td></td>
+                    <td>continue</td>
+                </tr>
+                <tr>
+                    <td>language</td>
+                    <td>language</td>
+                    <td></td>
+                    <td>continue</td>
+                </tr>
+                <tr>
+                    <td>mediatype</td>
+                    <td>mediatype</td>
+                    <td></td>
+                    <td>continue</td>
+                </tr>
+                <tr>
+                    <td>group.role.user</td>
+                    <td>user|group|role</td>
+                    <td></td>
+                    <td>stop</td>
+                </tr>
+                <tr>
+                    <td>path.session</td>
+                    <td>page</td>
+                    <td>default-page</td>
+                    <td>stop</td>
+                </tr>                
+            </table>            
+        </td>
+        </tr>
+        <tr>
+        <td>role-fallback</td>
+        <td>
+            <p>A role based fallback algorithm, trying to find the most-specific resource by searching over all security roles for the current authenticated user.</p>
+            <table>
+                <tr>
+                    <th>criterion</th>
+                    <th>name</th>
+                    <th>value</th>
+                    <th>fallback</th>
+                </tr>                    
+                <tr>
+                    <td>path.session</td>
+                    <td>page</td>
+                    <td>default-page</td>
+                    <td>stop</td>
+                </tr>                                
+                <tr>
+                    <td>role</td>
+                    <td>role</td>
+                    <td></td>
+                    <td>continue</td>
+                </tr>
+            </table>            
+        </td>
+        </tr>
+        <tr>            
+        <td>group-fallback</td>
+        <td>
+            <p>A group based fallback algorithm, trying to find the most-specific resource by searching over all security groups for the current authenticated user.</p>
+            <table>
+                <tr>
+                    <th>criterion</th>
+                    <th>name</th>
+                    <th>value</th>
+                    <th>fallback</th>
+                </tr>                    
+                <tr>
+                    <td>path.session</td>
+                    <td>page</td>
+                    <td>default-page</td>
+                    <td>stop</td>
+                </tr>                                
+                <tr>
+                    <td>group</td>
+                    <td>group</td>
+                    <td></td>
+                    <td>continue</td>
+                </tr>
+            </table>            
+        </td>
+       </tr>
+        <tr>            
+        <td>j2</td>
+        <td>
+            <p>The default profiling rule for users and mediatype minus language and country.</p>
+            <table>
+                <tr>
+                    <th>criterion</th>
+                    <th>name</th>
+                    <th>value</th>
+                    <th>fallback</th>
+                </tr>                    
+                <tr>
+                    <td>mediatype</td>
+                    <td>mediatype</td>
+                    <td></td>
+                    <td>continue</td>
+                </tr>
+                <tr>
+                    <td>group.role.user</td>
+                    <td>user|group|role</td>
+                    <td></td>
+                    <td>stop</td>
+                </tr>
+                <tr>
+                    <td>path.session</td>
+                    <td>page</td>
+                    <td>default-page</td>
+                    <td>stop</td>
+                </tr>                
+            </table>            
+        </td>
+       </tr>
+        <tr>            
+        <td>security</td>
+        <td>
+            <p>The security profiling rule needed to force credential change requirements.</p>
+            <table>
+                <tr>
+                    <th>criterion</th>
+                    <th>name</th>
+                    <th>value</th>
+                    <th>fallback</th>
+                </tr>                    
+                <tr>
+                    <td>hard.coded</td>
+                    <td>page</td>
+                    <td>/my-account.psml</td>
+                    <td>stop</td>
+                </tr>
+            </table>            
+        </td>
+       </tr>
+        <tr>            
+        <td>path</td>
+        <td>
+            <p>Only criterion applied is the path portion of the portal URL.</p>
+            <table>
+                <tr>
+                    <th>criterion</th>
+                    <th>name</th>
+                    <th>value</th>
+                    <th>fallback</th>
+                </tr>                    
+                <tr>
+                    <td>path</td>
+                    <td>page</td>
+                    <td>/</td>
+                    <td>stop</td>
+                </tr>
+            </table>            
+        </td>
+       </tr>    
+        <tr>            
+        <td>user-role-fallback</td>
+        <td>
+            <p>Rule will first look for the resource in the user's home folder. If not found there, a role based fallback algorithm is applied, trying to find the most-specific resource by searching over all security roles for the current authenticated user.</p>
+            <table>
+                <tr>
+                    <th>criterion</th>
+                    <th>name</th>
+                    <th>value</th>
+                    <th>fallback</th>
+                </tr>                    
+                <tr>
+                    <td>path.session</td>
+                    <td>page</td>
+                    <td>default-page</td>
+                    <td>continue</td>
+                </tr>                                
+                <tr>
+                    <td>role</td>
+                    <td>role</td>
+                    <td></td>
+                    <td>continue</td>
+                </tr>
+                <tr>
+                    <td>navigation</td>
+                    <td>navigation</td>
+                    <td>/</td>
+                    <td>loop</td>
+                </tr>
+                <tr>
+                    <td>user</td>
+                    <td>user</td>
+                    <td></td>
+                    <td>continue</td>
+                </tr>                
+                
+            </table>            
+        </td>
+       </tr>
+        <tr>            
+        <td>user-rolecombo-fallback</td>
+        <td>
+            <p>Rule will first look for the resource in the user's home folder. If not found there, a role based fallback algorithm is applied, trying to find the most-specific resource by searching over all security roles for the current authenticated user. Creates a locater property named <quote>role</quote> that is the concatenation of all roles into one string, such as <i>role1-role2-role3</i>. This combined string is used as the role name in the locator.</p>
+            <table>
+                <tr>
+                    <th>criterion</th>
+                    <th>name</th>
+                    <th>value</th>
+                    <th>fallback</th>
+                </tr>                    
+                <tr>
+                    <td>path.session</td>
+                    <td>page</td>
+                    <td>default-page</td>
+                    <td>continue</td>
+                </tr>                                
+                <tr>
+                    <td>rolecombo</td>
+                    <td>role</td>
+                    <td></td>
+                    <td>continue</td>
+                </tr>
+                <tr>
+                    <td>navigation</td>
+                    <td>navigation</td>
+                    <td>/</td>
+                    <td>loop</td>
+                </tr>
+                <tr>
+                    <td>user</td>
+                    <td>user</td>
+                    <td></td>
+                    <td>continue</td>
+                </tr>                
+                
+            </table>            
+        </td>
+       </tr>
+        <tr>            
+        <td>subsite-role-fallback-home</td>
+        <td>
+            <p>A rule based on role fallback algorithm with specified subsite and home page</p>
+            <table>
+                <tr>
+                    <th>criterion</th>
+                    <th>name</th>
+                    <th>value</th>
+                    <th>fallback</th>
+                </tr>                    
+                <tr>
+                    <td>path</td>
+                    <td>path</td>
+                    <td>subsite-default-page</td>
+                    <td>stop</td>
+                </tr>                                
+                <tr>
+                    <td>role</td>
+                    <td>role</td>
+                    <td></td>
+                    <td>continue</td>
+                </tr>
+                <tr>
+                    <td>navigation</td>
+                    <td>navigation</td>
+                    <td>subsite-root</td>
+                    <td>loop</td>
+                </tr>
+            </table>            
+        </td>
+       </tr>
+    
+    </table>    
+</subsection>    
+</section>    
+<section name="Profile Locators">
+<p>
+Profile Locators are used to locate profiled portal resources such as
+pages, folders, menus and links. A locator contains a collection of properties 
+(name value pairs) describing the actual resource to be located. 
+</p>
+<img src="devguide/images/parameter-resolution.jpg" border="1"/>           
+<p>
+The profiler takes runtime information as input, generalized into 
+generalized profile locators that are passed on to the page manager to locate a  page or menu. 
+The profile locators are normalized and not coupled to the profiler or page manager implementation.
+</p>       
+<img src="devguide/images/parameter-resolution-2.jpg" border="1"/>               
+</section>
+
+
+</body>
+</document>
+

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/guide-profiler.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/guide-profiler.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/guide-profiling-ip.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/guide-profiling-ip.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/guide-psml-dtd.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/guide-psml-dtd.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/guide-psml.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/guide-psml.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/guide-security.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/guide-security.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/guide-simple-jsf-portlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/guide-simple-jsf-portlet.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/guide-simple-portlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/guide-simple-portlet.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/guide-simple-velocity-portlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/guide-simple-velocity-portlet.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/hierarchy.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/hierarchy.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/high-level-services.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/high-level-services.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/aggregatestatistics-c.gif
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/aggregatestatistics-c.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/app-server-mgr-c.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/app-server-mgr-c.gif?rev=747185&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/app-server-mgr-c.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/arch-overview.gif
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/arch-overview.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/atn-arch-c.gif
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/atn-arch-c.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/atn-provider-c.gif
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/atn-provider-c.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/atn-spi-arch-c.gif
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/atn-spi-arch-c.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/atz-provider-c.gif
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/atz-provider-c.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/batchedstatistics-c.gif
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/batchedstatistics-c.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/capabilities-c.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/capabilities-c.gif?rev=747185&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/capabilities-c.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/capabilities-db.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/capabilities-db.gif?rev=747185&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/capabilities-db.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/components.jpg
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.1

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/components.jpg
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/components.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/connection-repository-c.gif
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/connection-repository-c.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/create-patch.gif
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/create-patch.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/credential-handler-c.gif
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/credential-handler-c.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/default-login-module-c.gif
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/default-login-module-c.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/deployment-event-listener-c.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/deployment-event-listener-c.gif?rev=747185&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/deployment-event-listener-c.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/deployment-mgr-assembly.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/deployment-mgr-assembly.gif?rev=747185&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/deployment-mgr-assembly.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/deployment-mgr-c.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/deployment-mgr-c.gif?rev=747185&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/deployment-mgr-c.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/group-security-handler-c.gif
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/group-security-handler-c.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/j2-overview.gif
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/j2-overview.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/jetspeedservlet-c.gif
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/jetspeedservlet-c.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/layouts-overview.png
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.1

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/layouts-overview.png
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/layouts-overview.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/logrecord-c.gif
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/logrecord-c.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/pages.jpg
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/pages.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/parameter-resolution-2.jpg
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/parameter-resolution-2.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/parameter-resolution.jpg
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/parameter-resolution.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/permission-mgr-c.gif
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/permission-mgr-c.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/permissions-principals-om-c.gif
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/permissions-principals-om-c.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/permissions-principals-schema.gif
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/permissions-principals-schema.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/persistence-broker-dao-c.gif
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/persistence-broker-dao-c.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/pipeline-assembly.gif
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/pipeline-assembly.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/pipeline-c.gif
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/pipeline-c.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/portalstatistics-c.gif
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/portalstatistics-c.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/principals-credentials-schema.gif
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/principals-credentials-schema.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/profiler-pipeline.jpg
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/profiler-pipeline.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/rdbms-policy-c.gif
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/rdbms-policy-c.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/rdbms-policy-overview-c.gif
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/rdbms-policy-overview-c.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/role-security-handler-c.gif
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/role-security-handler-c.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/searchengine-c.gif
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/searchengine-c.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/searchhandlers-c.gif
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/searchhandlers-c.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/security-mapping-c.gif
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/security-mapping-c.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/security-provider-c.gif
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/security-provider-c.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/spring-component-manager-c.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/spring-component-manager-c.gif?rev=747185&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/spring-component-manager-c.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/statistics-db.gif
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/statistics-db.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/valve-c.gif
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/images/valve-c.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/index.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/jetspeed-eclipse.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/jetspeed-eclipse.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/login-module.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/login-module.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/m1-build/getting-started-binary.xml (from r740206, portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/getting-started-binary.xml)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/m1-build/getting-started-binary.xml?p2=portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/m1-build/getting-started-binary.xml&p1=portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/getting-started-binary.xml&r1=740206&r2=747185&rev=747185&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/getting-started-binary.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/m1-build/getting-started-binary.xml Mon Feb 23 22:54:40 2009
@@ -30,8 +30,9 @@
 		</authors>
 	</properties>
 	<body>
-		<section name="1. Some Basic Information (deprecated)">
+		<section name="1. Building a Custom Portal with the Maven-1 Plugin">
 			<subsection name="Basic Assumptions">
+			<p><i>Note the Maven-1 plugin will be <b>deprecated</b> in Jetspeed version 2.2</i></p>
 				<ul>
 					<li>
 						Unless otherwise specified, you should be

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/m1-build/getting-started-binary.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/m1-build/getting-started-binary.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/m1-build/getting-started-source.xml (from r740206, portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/getting-started-source.xml)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/m1-build/getting-started-source.xml?p2=portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/m1-build/getting-started-source.xml&p1=portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/getting-started-source.xml&r1=740206&r2=747185&rev=747185&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/getting-started-source.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/m1-build/getting-started-source.xml Mon Feb 23 22:54:40 2009
@@ -30,7 +30,8 @@
 		</authors>
 	</properties>
 	<body>
-		<section name="1. Naming Conventions and Basic Assumptions (deprecated)">
+		<section name="1. Building Jetspeed with Maven-1">
+			<p><i>Note the Maven-1 build will be <b>deprecated</b> in Jetspeed version 2.2</i></p>		
 			<subsection name="Source Basic Assumptions">
 				<ul>
 					<li>

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/m1-build/getting-started-source.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/m1-build/getting-started-source.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/m1-build/guide-properties.xml (from r740206, portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/guides/guide-properties.xml)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/m1-build/guide-properties.xml?p2=portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/m1-build/guide-properties.xml&p1=portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/guides/guide-properties.xml&r1=740206&r2=747185&rev=747185&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/guides/guide-properties.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/m1-build/guide-properties.xml Mon Feb 23 22:54:40 2009
@@ -27,7 +27,7 @@
      </authors>
   </properties>
   <body>
-	<section name="Basic Configuration Parameters">
+	<section name="Maven-1 Build Configuration Parameters">
 
 			      <subsection name="Required Portal Configuration Properties">
         <table>

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/m1-build/guide-properties.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/m1-build/guide-properties.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/m2-build/j2-maven-plugin.xml (from r740206, portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/j2-maven-plugin.xml)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/m2-build/j2-maven-plugin.xml?p2=portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/m2-build/j2-maven-plugin.xml&p1=portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/j2-maven-plugin.xml&r1=740206&r2=747185&rev=747185&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/j2-maven-plugin.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/m2-build/j2-maven-plugin.xml Mon Feb 23 22:54:40 2009
@@ -25,7 +25,7 @@
     </authors>
   </properties>
   <body>
-    <section name="Plugin Overview">
+    <section name="Maven-2 Plugin Overview">
       <p>
         Adding functionality to Maven is done through the Maven plugin mechanism. Maven comes shipped with numerous
         plugins and provides an extensible framework for writing custom plugins.

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/m2-build/j2-maven-plugin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/m2-build/j2-maven-plugin.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/m2-build/maven-2-build.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/m2-build/maven-2-custom.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/navigation.xml (from r740206, portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/security/xdocs/navigation.xml)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/navigation.xml?p2=portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/navigation.xml&p1=portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/security/xdocs/navigation.xml&r1=740206&r2=747185&rev=747185&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/security/xdocs/navigation.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/navigation.xml Mon Feb 23 22:54:40 2009
@@ -18,31 +18,89 @@
 <project>
     <body>
         <links>
-        	<item name="Components Guide" href="../../guides/guide-components.html" />
-        	<item name="Jetspeed-2" href="../../index.html" />
-            <!-- Cannot access ${pom.id}... Hard coding pdf name. -->
-            <item name="PDF Documentation" href="/jetspeed-security.pdf" img="../../images/pdf.gif" />
+        <links>
+        	<item name="Main Docs" href="index.html" />
+        	<item name="Admin Guide" href="adminguide/index.html" />        	
+        	<item name="Deployment Guide" href="deployguide/index.html" />
+        	<item name="Users Guide" href="usersguide/index.html" />
+            <item name="PDF Documentation" href="/jetspeed2.pdf" img="images/pdf.gif" />        
+        </links>
         </links>
-        <menu name="Jetspeed-2 Security Documentation">
-            <item name="Overview" href="index.html" />
-            <item name="Architecture Overview" href="arch.html" />
-            <item name="Authentication" href="atn.html">
-                <item name="Login Module" href="login-module.html" />
-                <item name="Authentication SPI" href="atn-spi.html" />
-                <item name="Credentials Management" href="credentials.html" />
+        
+        <menu name="Getting Involved">
+        	<item name="Sending Patches" href='devguide/patches.html'/>
+        </menu>
+        
+        <menu name="Building with Maven-2">
+            <item name="Custom Build" href="devguide/m2-build/maven-2-custom.html" />
+            <item name="Building from Source" href="devguide/m2-build/maven-2-build.html" />
+            <item name="Maven-2 Plugin" href="devguide/m2-build/j2-maven-plugin.html" />
+		</menu>
+        <menu name="Building with Maven-1 (deprecated)">
+            <item name="Custom Build" href="devguide/m1-build/getting-started-binary.html" />
+            <item name="Building from Source" href="devguide/m1-build/getting-started-source.html" />
+            <item name="Configuration Properties" href="devguide/m1-build/guide-properties.html" />
+		</menu>
+		
+        <menu name="Security Architecture">
+            <item name="Security Concepts" href="devguide/dev-security.xml" />
+            <item name="Overview" href="devguide/guide-security.xml" />
+            <item name="Architecture Overview" href="devguidea/arch.html" />
+            <item name="Authentication" href="devguide/atn.html">
+                <item name="Login Module" href="devguide/login-module.html" />
+                <item name="Authentication SPI" href="devguide/atn-spi.html" />
+                <item name="Credentials Management" href="devguide/credentials.html" />
             </item>
-            <item name="Authorization" href="atz.html">
-                <item name="JAAS Authorization" href="atz-jaas.html" />
-                <item name="PermissionManager Overview" href="permission.html" />
-                <item name="Authorization/Security Mapping SPI" href="atz-spi.html" />
-                <item name="Hierarchy Management" href="hierarchy.html" />
+            <item name="Authorization" href="devguide/atz.html">
+                <item name="JAAS Authorization" href="devguide/atz-jaas.html" />
+                <item name="PermissionManager Overview" href="devguide/permission.html" />
+                <item name="Authorization/Security Mapping SPI" href="devguide/atz-spi.html" />
+                <item name="Hierarchy Management" href="devguide/hierarchy.html" />
             </item>
-            <item name="High Level Security Services" href="high-level-services.html" />
-            <item name="Security Services Configuration" href="config.html" />
-            <item name="LDAP Configuration" href="ldap.html" />            
-        </menu>
-        <menu name="Misc.">
-            <item name="Tasks" href="tasks.html" />
+            <item name="High Level Security Services" href="devguide/high-level-services.html" />
+            <item name="Security Services Configuration" href="deployguide/security-config.html" />
+            <item name="LDAP Configuration" href="deployguide/ldap.html" />            
         </menu>
+
+		
+        <menu name="Jetspeed Components">
+            <item name="Components" href="devguide/dev-cm.html" />
+            <item name="Capabilities" href="devguide/dev-capaabilities.html" />
+            <item name="Deployment" href="devguide/dev-deploy.html" />
+            <item name="Search" href="devguide/dev-search.html" />
+            <item name="Statistics" href="devguide/dev-statistics.html" />
+	        <item name="Localization" href="devguide/guide-l10n.html" />
+            <item name="Pipeline" href="devguide/pipeline.html" />
+            <item name="Profiler" href="devguide/guide-profiler.html" />
+            <item name="Profiler IP" href="devguide/guide-profiler-ip.html" />
+            <item name="PSML" href="devguide/guide-psml.html" />
+            <item name="PSML DTD" href="devguide/guide-psml-dtd.html" />	
+		</menu>
+
+        <menu name="Database">
+            <item name="Database Guide" href="devguide/dev-database.html" />
+            <item name="Data Access" href="devguide/dao.html" />
+            <item name="RDBMS" href="devguide/dev-rdbms.html" />
+		</menu>
+		
+		<menu name="APIs">
+            <item name="Jetspeed Java API" href="jetspeed-api/apidocs/index.html" />
+            <item name="Jetspeed AJAX API" href="devguide/guide-ajax-api.html" />		
+		</menu>
+		
+        <menu name="Portlet Programming">
+            <item name="Eclipse" href="devguide/jetspeed-eclipse.html" />
+            <item name="Portlet Bridges" href="devguide/guide-portlet-bridges.html" />
+            <item name="Simple Portlet" href="devguide/guide-simple-portlet.html" />
+            <item name="JSF" href="devguide/guide-simple-jsf-portlet.html" />
+            <item name="Velocity" href="devguide/guide-simple-jsf-velocity.html" />
+		</menu>
+
+        <menu name="Portal Design">
+        	<item name="Intro to Portal Design" href="devguide/guide-portal-design.html"/>
+        	<item name="Layouts" href="devguide/guide-layouts.html"/>
+        	<item name="Decorators" href="devguide/guide-decorators.html"/>
+        	<item name="Jetspeed Power Tool" href="devguide/guide-jpt.html"/>        	
+		</menu>
     </body>
 </project>

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/navigation.xml
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.3

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/navigation.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/navigation.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/navigation.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Added: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/patches.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/patches.xml?rev=747185&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/patches.xml (added)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/patches.xml Mon Feb 23 22:54:40 2009
@@ -0,0 +1,44 @@
+<?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>Guide to Jetspeed-2 Development</title>
+		<subtitle>Guide to Jetspeed-2 Development</subtitle>
+		<authors>
+			<person name="David Le Strat" email="dlestrat@apache.org" />
+		</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="../getting-started-source.html">getting started with Jetspeed-2 source code</a>.
+		    </p>
+		    </subsection>
+			<subsection 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="devguide/images/create-patch.gif" border="0" />
+			</p>
+			</subsection>
+		</section>
+	</body>
+</document>
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/patches.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/patches.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/permission.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/permission.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/getting-started.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/getting-started.xml?rev=747185&r1=747184&r2=747185&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/getting-started.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/getting-started.xml Mon Feb 23 22:54:40 2009
@@ -21,59 +21,130 @@
 		<subtitle>Getting up and running quickly</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="Requirements">
-			<p>
-				It is expected that the user is familiar with both the
-				<a href="http://maven.apache.org">Apache Maven</a>
-				project management tool and the
-				<a href="http://ant.apache.org">Apache Ant</a>
-				scripting utility.
-			</p>
-			<ul>
-				<li>
-					<a href="http://ant.apache.org/bindownload.cgi">
-						Ant 1.5
-					</a>
-					or higher
-				</li>
-				<li>
-					<a
-						href="http://maven.apache.org/start/download.html">
-						Maven 1.0.2
-					</a>
-				</li>
-				<li>Java 1.4.2_02 or higher</li>
-				<li>
-					Servlet 2.4 Engine:
+		<section name="Where do I start?">
+		<p>Where you start depends on what you plan on doing with Jetspeed. Its always best to start by reading the documentation guides. There are several guides provided:
+		</p>
 					<ul>
-						<li>Tomcat 5.5.x</li> 
+						<li>
+							<a href="usersguide/index.html">
+								Users Guide
+							</a>
+						</li>
+						<li>
+							<a href="adminguide/index.html">
+								Administration Guide
+							</a>
+						</li>
+						<li>
+							<a href="deployguide/index.html">
+								Deployment and Configuration Guide
+							</a>
+						</li>
+						<li>
+							<a href="devguide/index.html">
+								Developers Guide
+							</a>
+						</li>
+						<li>
+							<a href="deploy/index.html">
+								Deployers Guide
+							</a>
+						</li>
+					</ul>
+		<p>
+		For those of you in more of a hurry to get started,		
+				you have the choice of
+				installing Jetspeed from a binary release or doing more indepth open source development by working with the
+				source code.</p><p>If you want to modify the core functionality of
+				Jetspeed or contribute to the development of Jetspeed,
+				you need to work with the source code. If you are 
+				interested in building your first custom enterprise
+				portal, try the custom build. We recommend trying an Evaluation (demo, download) to get started. Eventually you will want to move on to Building a Custom Portal.
+				Advanced users will want to learn how to build from source.
+		</p>
+		<ul>
+		  <li><a href="#Evaluating">Evaluation</a></li>
+		  <li><a href="#Custom Build">Building a Custom Portal</a></li>
+		  <li><a href="#Building from Source">Building Jetspeed from Source</a></li>
+	   </ul>	   		  
+		</section>
+		<section name="Evaluating">
+		<p>
+		If you are evaluating Jetspeed, best to download the latest distribution or try running Jetspeed from the demo site:
+		<ul>
+		  <li><a href="download.html">Download Jetspeed</a></li>
+		  <li><a href="demo.html">Jetspeed Online Demos</a></li>
+	   </ul>		  
+		</p>
+		<p><b>Download Requirements</b> - The requirements for the downloadable distribution are: Java 1.4.2_02 or higher, enough memory to run Tomcat with several web apps (the demo comes with Tomcat embedded in the installer)</p> 
+		<p><b>Online Demo Requirements</b> - The requirements for the online demos are minimal: just a web browser</p> 
+		</section>
+		<section name="Custom Build">
+			<p>
+When starting a new Jetspeed portal project, we strongly recommend that you create a custom portal project, and do not edit the Jetspeed-2 source and resources directly. 
+A custom build allows you to create and maintain a Jetspeed Portal's lifecycle. With a custom build, you have a reproducible procedure for maintaining your portal across future versions. 
+When we say custom, we mean customizing Jetspeed for your needs. Everyone has custom requirements. Custom build procedures formalize the steps required to create a custom portal. 
+Although Jetspeed can be customized online using the portal customization features. Still, having a reproducible build is valuable as it  enables you to store artifacts in a source code repository and 
+maintain the life-cycle of this source.
+</p>
+<p> 
+Custom Jetspeed builds for version 2.1.3 can currently be built with Maven-1, Maven-2 or Ant. Building Jetspeed from the source is not necessary for most projects.
+Since Maven-1 is being deprecated out of Jetspeed in version 2.2, we recommend starting with either an <a href="#Ant Custom Build">Ant Custom Build</a> or 
+a <a href="#Maven-2 Custom Build">Maven-2 Custom Build</a>.
+</p> 
+<subsection name="Ant Custom Build">
+<p>The Ant Custom Build is a set of build targets for creating and maintaining a portal. You can easily hook the Ant build into a developer's portal running locally for development, 
+a test or staging server, or a production server. The Ant Custom Build provides you with several goals including:
+<ul>
+<li>Create an Installer</li> 
+<li>Deploy Portlet Applications</li> 
+<li>Deploy Decorations </li>
+<li>Deploy Site and Page modifications</li> 
+<li>Deploy Spring Assembly modifications </li>
+<li>Upgrade to a new version </li>
+</ul>
+</p>
+<p>
+To get started, goto the Ant Tutorial found here: <a href="tutorials/ant/index.html">Ant Tutorial for Jetspeed 2.1.3</a>
+</p>	
+</subsection>
+<subsection name="Maven-2 Custom Build">
+<p>The Maven-2 Custom Build is based on a Maven-2 plugin. To get started with the Maven-2 plugin, see the tutorial and usage guide here:
+<ul>
+<li><a href="tutorials/maven-2/index.html">Maven-2 Custom Build Tutorial</a></li>
+<li><a href="devguide/m2-build/maven-2-custom.html">Maven-2 Custom Build Guide</a></li>
+</ul>
+</p>
+<p>
+<i>There is also a deprecated Maven-1 plugin. If you really insist on using Maven-1 custom builds, see the docs here: <a href="devguide/m1-build/getting-started-binary.html">Maven-1 Custom Build Guide</a>.</i> 
+</p>	
+</subsection>
+<subsection name="Requirements for Custom Builds">
+<p>
+The general requirements for all custom builds of 2.1.3 are:
+</p>
+	<ul>
+		<li>Java 1.4.2_02 or higher</li>
+		<li>Maven-1 or Maven-2</li>
+		<li>Ant</li>
+		<li>
+			Servlet 2.4 Engine:
+				<ul>
+						<li><a href="deployguide/guide-tomcat.html">Tomcat 5.5.x</a></li> 
 						<li>Jetty</li>
-						<li>Websphere 6.0</li>
+						<li><a href="adminguide/websphere/index.html">Websphere 6.0</a></li>
 						<li>Geronimo</li>
 						<li>JBoss</li>
 						<li>Weblogic</li>
-					</ul>
-
-				</li>
-			</ul>
-		</section>
-
-		<section name='1. Get Maven Ready'>
-			<p>
-				If you have not already done so, download and install
-				<a href="http://maven.apache.org/maven-1.x">Maven</a>
-				.
-			</p>
-		</section>
-		<section name='2. What Database do you want'>
-			<p>
+				</ul>
+				Jetspeed 2 portals can be run under any
+				servlet container supporting the 2.4 specification or
+				greater. However we don't have documentation listed for all servers. Contributions welcome! 				
+		</li>
+		<li>A Database
 				Jetspeed's security model requires a database to
 				authorize users and to retain the user information.
 				Jetspeed security should work with any JDBC 2.0
@@ -88,123 +159,57 @@
 					<li>Sybase</li>
 					<li>SQL Server</li>
 				</ul>
-
+			<p>
 				Jetspeed is distributed with the Derby database
 				configured as the default.
-			</p>
+				</p>
 			<p>
 				The database configuration will be setup during the
-				installation process. If you are not going to use the
+				custom build process based on your property settings. See the appropriate build guide for details.. If you are not going to use the
 				default Derby database, you need to select another database
-				during installation.
-			</p>
-		</section>
-		<section name="3 Servlet Engines">
-			<p>
-				In theory, Jetspeed 2 portals can be run under any
-				servlet container supporting the 2.4 specification or
-				greater. Successful Jetspeed 2 portal applications have
-				been deployed using:
-				<ul>
-					<li>Tomcat 5.5.8 or higher</li>
-					<li>Jetty</li>
-					<li>Websphere</li>
-					<li>Geronimo</li>
-					<li>JBoss</li>
-				</ul>
-			</p>
-			<subsection name=" Tomcat Configuration">
-				<p>
-					Jetspeed 2 can use the Tomcat Manager application
-					for managing portlet applications with the Portlet
-					Application Lifecycle Manager Portlet (PALM). To be
-					able to do so it needs a configured Tomcat user with
-					the predefined 'manager' role in the
-					${org.apache.jetspeed.server.home}/conf/tomcat-users.xml.
-				</p>
-				<p>
-					A minimal example tomcat-users.xml can look like:
-					<source>
-						<![CDATA[
-<tomcat-users>
-  <role rolename="manager"/>
-    <user username="j2deployer" password="xxxxx" roles="manager"/>
-</tomcat-users>]]>
-					</source>
-					<i>
-						The attribute values for username and password
-						must correspond to the specified values for
-						<code>
-							${org.apache.jetspeed.services.autodeployment.user}
-						</code>
-						and
-						<code>
-							${org.apache.jetspeed.services.autodeployment.user}
-						</code>
-						as described above.
-					</i>
-				</p>
-			</subsection>
-			<subsection name="Tomcat 5.5.9 on Windows">
-				<p>
-					To have redeployment and undeployment working
-					properly when using Tomcat 5.5.9 on Windows you have
-					to set the global Context attribute "antiJARLocking"
-					to true.
-				</p>
-				<p>
-					In
-					${org.apache.jetspeed.server.home}\conf\context.xml
-					use:
-					<source>
-						<![CDATA[
-    <Context antiJARLocking="true">
-    ...
-    </Context>]]>
-					</source>
-				</p>
-			</subsection>
-			<subsection
-				name="Jetty - A Quick Test Environment or a Production Servlet Container">
-			<p>
-				Jetty can be used for a production deployment but it is
-				most commonly used to quickly test customizations
-				without interfering with the production servlet
-				container. It does not require any special
-				configuration.
-			</p>
-			</subsection>
-		</section>
-		<section
-			name='4. Installing Jetspeed from Source or Binary Distributions'>
-			<p>
-				Depending on what you want to do, you have the choice of
-				installing Jetspeed from a binary release or from the
-				sources. If you want to modify the core functionality of
-				Jetspeed or contribute to the development of Jetspeed,
-				you need to work with the sources. If you are only
-				interested in building your own custom enterprise
-				portal, you can start with a binary release of Jetspeed.
-				Most people should start with the binary distribution.
+				during your build configuration.
 			</p>
-		</section>
-		<section name='5. Jetspeed build'>
-			<p>
-				Your installation instructions will depend on whether
-				you are
-				<a href="getting-started-source.html">
-					building from source
+				
+		</li>		
+	</ul>			
+</subsection>
+</section>
+<section name='Building from Source'>
+			<p>
+	Building from Source is covered in the following Developer guides for either Maven-1 or Maven-2. For most cases, we recommend building with Maven-2, but the Maven-1 build is also fully supported.
+	If you are going to build a 2.1.3 installer, currently you must build with the Maven-1 build.
+	</p>
+	<subsection name="Building from Source with Maven-1">
+	<ul>
+	<li>
+				<a href="devguide/m1-build/getting-started-source.html">
+					Building with Maven-1 from Source
 				</a>
-				or
-				<a href="getting-started-binary.html">
-					building from a binary distribution
+	</li>				
+	<li>
+				<a href="devguide/m1-build/getting-started-binary.html">
+					Maven-1 Plugin Guide 
 				</a>
-				or
-				<a href="getting-started-installer.html">
-					installing with Jetspeed-2 installer
+	</li>				
+	</ul>
+	</subsection>				
+	<subsection name="Building from Source with Maven-2">
+	<p>The best place to start using Jetspeed, as a Developer, is to go to the developers guide documentation:</p>
+	<p><a href="devguide/index.html">Jetspeed Developers Guide</a></p>
+	<p>For general build information, also see:</p>
+	<ul>
+	<li>
+				<a href="devguide/m2-build/maven-2-build.html">
+					Building with Maven-2 from Source
 				</a>
-				.
-			</p>
+	</li>				
+	<li>
+				<a href="devguide/m2-build/j2-maven-plugin.html">
+					Maven-2 Plugin Guide
+				</a>
+	</li>				
+	</ul>
+	</subsection>				
 		</section>
 	</body>
 </document>

Copied: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/guide-migration.xml (from r740206, portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/guides/guide-migration.xml)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/guide-migration.xml?p2=portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/guide-migration.xml&p1=portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/guides/guide-migration.xml&r1=740206&r2=747185&rev=747185&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/guides/guide-migration.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/guide-migration.xml Mon Feb 23 22:54:40 2009
@@ -86,7 +86,18 @@
                  <td>(not casade delete)</td>                                                            
                  <td>CASCADE DELETE</td>                                                            
                 </tr>                
-            </table>
+            </table>     
+            <p>
+            Here is an example of the SQL migration scripts for the MySQL database:
+            <source><![CDATA[            
+CREATE INDEX IX_PREFS_NODE_1 ON PREFS_NODE (PARENT_NODE_ID); 
+CREATE INDEX IX_PREFS_NODE_2 ON PREFS_NODE (FULL_PATH); 
+CREATE INDEX IX_FKPPV_1 ON PREFS_PROPERTY_VALUE (NODE_ID); 
+
+ALTER TABLE PREFS_NODE ADD CONSTRAINT FK_PREFS_NODE_1 FOREIGN KEY (PARENT_NODE_ID) REFERENCES PREFS_NODE (NODE_ID) ON DELETE CASCADE; 
+ALTER TABLE PREFS_PROPERTY_VALUE ADD CONSTRAINT FK_PREFS_PROPERTY_VALUE_1 FOREIGN KEY (NODE_ID) REFERENCES PREFS_NODE (NODE_ID) ON DELETE CASCADE;
+            ]]></source>            
+            </p>       
             </subsection>                         
 	  </section>	
 	  <section name="Data Migrating from Jetspeed 2.1 to 2.1.2">

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/guide-migration.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/guide-migration.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 



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