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 [4/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
Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/images/websphere/44-3.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/images/websphere/44-4.png
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/images/websphere/44-4.png?rev=747185&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/images/websphere/44-4.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/images/websphere/45-1.png
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/images/websphere/45-1.png?rev=747185&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/images/websphere/45-1.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

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

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/images/websphere/45-2.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/images/websphere/46-1.png
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/images/websphere/46-1.png?rev=747185&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/images/websphere/46-1.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

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

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/images/websphere/46-2.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/images/websphere/46-3.png
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/images/websphere/46-3.png?rev=747185&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/images/websphere/46-3.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/images/websphere/46-4.png
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/images/websphere/46-4.png?rev=747185&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/images/websphere/46-4.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/images/websphere/54-1.png
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/images/websphere/54-1.png?rev=747185&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/images/websphere/54-1.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

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

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/images/websphere/54-2.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/images/websphere/54-3.png
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/images/websphere/54-3.png?rev=747185&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/images/websphere/54-3.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/images/websphere/54-4.png
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/images/websphere/54-4.png?rev=747185&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/images/websphere/54-4.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/images/websphere/54-5.png
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/images/websphere/54-5.png?rev=747185&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/images/websphere/54-5.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/images/websphere/54-6.png
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/images/websphere/54-6.png?rev=747185&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/images/websphere/54-6.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/images/websphere/54-7.png
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/images/websphere/54-7.png?rev=747185&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/images/websphere/54-7.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/index.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/index.xml?rev=747185&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/index.xml (added)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/index.xml Mon Feb 23 22:54:40 2009
@@ -0,0 +1,45 @@
+<?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 Deployment Guide</title>
+		<subtitle>Guide to a Jetspeed Deployment</subtitle>
+		<authors>
+			<person name="David Sean Taylor" email="taylor@apache.org" />
+			<person name="Jody McAlister" email="jmcalister@onehippo.com" />
+		</authors>
+	</properties>
+	<body>
+		<section name="Deployment Guide">
+			<p>
+				This guide is targeted for helping administrators and developers configure and deploy Jetspeed to application servers. While the Administrative Guide documents configuring
+				Jetspeed within the portal user interface, this guide documents configuring and deploying with Spring configurations and Java properties files.  
+				<br/><br/>
+			</p>
+		<subsection name="Configuring Jetspeed 2.2 Components">
+            <p>Jetspeed provides very flexible ways for specific configuration settings.</p>
+            <p>Jetspeed components are initially loaded from <strong><code>/WEB-INF/assembly/</code></strong> folder, while the default configuration properties are loaded from <strong><code>/WEB-INF/conf/jetspeed.properties.</code></strong></p>
+            <p>The initial/default configurations can be overrided through the <strong><code>/WEB-INF/assembly/override/</code></strong> folder, while overrides/additional values can be provided through the <strong><code>/WEB-INF/conf/override.properties.</code></strong></p>
+            <p>Another new feature is conditional Spring assembly loading. Jetspeed provides an extended BeanFactory
+            which checks a loaded Spring BeanDefinition for some extra meta data (defined within the Spring configuration itself)
+            against a predefined configuration, registering a BeanDefinition within Spring can be "prevented", effectively
+            filtering out certain definitions.</p>
+        </subsection>
+       </section>		
+	</body>
+</document>
\ No newline at end of file

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

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

Added: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/jetspeed-properties.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/jetspeed-properties.xml?rev=747185&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/jetspeed-properties.xml (added)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/jetspeed-properties.xml Mon Feb 23 22:54:40 2009
@@ -0,0 +1,287 @@
+<?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>User Attributes</title>
+    <subtitle>User Information Configuration</subtitle>
+    <authors>
+      <person name="David Sean Taylor" email="taylor@apache.org"/>
+    </authors>
+  </properties>
+  <body>
+<section name="Jetspeed Properties">
+<p>
+
+</p>
+<table>
+    <tr>
+        <th>Property</th>
+        <th>Description</th>
+    </tr>
+    <tr>
+        <td></td>    
+        <td></td>
+    </tr>
+    <tr>
+        <td></td>    
+        <td></td>
+    </tr>
+</table>
+<p>
+TODO: document these
+</p>
+<source><![CDATA[
+# 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.
+
+# ------------------------------------------------------------------------
+#
+# Jetspeed Portal Engine - Properties
+#
+# $Id$
+#
+# ------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------
+# override for jetspeed.properties.  This include needs to be come before
+# any other prop definitions.
+#-------------------------------------------------------------------------
+include=override.properties
+
+portal.name = Jetspeed
+portal.version = 2.1.3
+
+# By setting this to true, the Engine will create its own
+# JNDI context.  Not needed in deployment.  We use Tomcat's JNDI
+# instead.
+portal.use.internal.jndi=false
+
+#----------------------------------------------------------------------------------
+# Portal URL NavigationalState Parameter Name (default: _ns)
+#----------------------------------------------------------------------------------
+portalurl.navigationalstate.parameter.name=_ns
+
+#----------------------------------------------------------------------------------
+# Generate all Portal URLs without schema, servername or port.
+# WARNING: Defining this to true (default = false) means requesting secure Portlet URLs
+#          won't have any effect anymore.
+#          But a proxy frontend (like Apache) can still be used for securing the whole site.
+#          See: https://issues.apache.org/jira/browse/JS2-275#action_12474326
+#----------------------------------------------------------------------------------
+portalurl.relative.only=false
+
+#----------------------------------------------------------------------------------
+# Until version 2.1, Jetspeed merged portal request parameters with portlet specific
+# parameters, effectively allowing "shared" parameters.
+# This is not compliant with the JSR-168 PLT.11, so by default this is now disabled.
+#
+# By setting merge.portal.parameters.with.portlet.parameters=true this feature can
+# be "restored".
+# In the situation of portal and portlet parameters with the same name, by default
+# the portlet parameters will be provided first in the values array, but this too
+# can be overridden by setting merge.portal.parameters.before.portlet.parameters=true
+#
+# Setting both these properties to true will deliver the "old" pre-2.1 behavior.
+# Note: for individual portlets, these global settings can be overridden by setting
+#       these properties as metadata in jetspeed-portlet.xml
+#----------------------------------------------------------------------------------
+merge.portal.parameters.with.portlet.parameters=false
+merge.portal.parameters.before.portlet.parameters=false
+# -------------------------------------------------------------------
+#  Portlet Mode Support
+# -------------------------------------------------------------------
+# standard
+supported.portletmode = view
+supported.portletmode = edit
+supported.portletmode = help
+# extended
+supported.portletmode = about
+supported.portletmode = config
+supported.portletmode = edit_defaults
+supported.portletmode = print
+supported.portletmode = secure  # currently only used for testing purposes
+# auto-switching
+# switch config mode to built-in custom config mode portlet
+supported.portletmode.autoswitch.config=false
+# switch edit_defaults mode to edit mode automatically for portlets not supporting edit_defaults mode
+supported.portletmode.autoswitch.edit_defaults=false
+# auto-switching surrogate portlet for config mode
+supported.portletmode.autoswitch.config.surrogate.portlet = j2-admin::CustomConfigModePortlet
+
+# -------------------------------------------------------------------
+#  Window State Support
+# -------------------------------------------------------------------
+# standard
+supported.windowstate = normal
+supported.windowstate = maximized
+supported.windowstate = minimized
+supported.windowstate = solo
+    
+# -------------------------------------------------------------------
+#  Security Information
+# -------------------------------------------------------------------
+
+# if no user has been setup, default.user.principal will be
+# automatically added via HttpRequestContext.setUserPrincpal()
+default.user.principal=guest
+default.admin.user=admin
+default.admin.role=admin
+default.manager.role=manager
+default.user.role=user
+default.guest.role=guest
+
+# -------------------------------------------------------------------
+#  L O G 4 J - L O G G I N G
+# -------------------------------------------------------------------
+log4j.file = /WEB-INF/conf/Log4j.properties
+
+# -------------------------------------------------------------------
+#  C O N T A I N E R
+# -------------------------------------------------------------------
+container.impl = org.apache.pluto.PortletContainerImpl
+container.wrapper = org.apache.jetspeed.container.JetspeedPortletContainerWrapper
+
+
+# -------------------------------------------------------------------
+#  P I P E L I N E
+# -------------------------------------------------------------------
+pipeline.default = jetspeed-pipeline
+
+
+# -------------------------------------------------------------------
+#  F A C T O R Y
+# -------------------------------------------------------------------
+
+factory.container.response = org.apache.jetspeed.container.ContainerResponse
+factory.container.request = org.apache.jetspeed.container.ContainerRequest
+
+# Servlet Invoker
+factory.invoker.servlet = org.apache.jetspeed.container.invoker.ServletPortletInvoker
+factory.invoker.servlet.pool.size = 50
+factory.invoker.servlet.mapping.name = /container
+
+# Local Invoker
+factory.invoker.local = org.apache.jetspeed.container.invoker.LocalPortletInvoker
+factory.invoker.local.pool.size = 50
+
+#--------------------------------------------------------------------
+# P O R T L E T  D E P L O Y M E N T  D E S C R I P T O R
+#--------------------------------------------------------------------
+deployment.descriptor.mapping.xml=/WEB-INF/conf/portletdefinitionmapping.xml
+
+
+#-------------------------------------------------------------------------
+# C A P A B I L I T Y,  C O N T E N T  E N C O D I N G
+#-------------------------------------------------------------------------
+content.defaultencoding=iso-8859-1
+
+#---------------------------------------------------------------------------------
+# Run Auto-Deployment set up
+#----'-----------------------------------------------------------------------------
+# THE NEXT PROPERTY DEFINITION MAY NOT BE MODIFIED (NOT EVEN BE PADDED WITH WHITESPACE)
+# BECAUSE ITS FILTERED BY ANT DURING DEPLOYMENT.
+# ITS CONCREET VALUE WILL BE SET FROM BUILD PROPERTY org.apache.jetspeed.catalina.version.major
+autodeployment.catalina.version.major=5
+autodeployment.catalina.base=${applicationRoot}/../../
+autodeployment.catalina.engine=Catalina
+autodeployment.server=@AUTODEPLOYMENT_SERVER@
+autodeployment.port=8080
+autodeployment.user=@AUTODEPLOYMENT_USER@
+autodeployment.password=@AUTODEPLOYMENT_PASSWORD@
+autodeployment.staging.dir=${applicationRoot}/WEB-INF/deploy
+autodeployment.target.dir=${applicationRoot}/../
+autodeployment.delay=10000
+autodeployment.earlyInit = true
+
+#-------------------------------------------------------------------------
+# A S S E M B L Y (note may move this to class path)
+#-------------------------------------------------------------------------
+assembly.dir=/WEB-INF/assembly
+assembly.extension=.xml
+
+#-------------------------------------------------------------------------
+# E M A I L
+#-------------------------------------------------------------------------
+# email of the system administrator
+email.admin = someemailaddress@somecompanyororganization.comororgornet
+# email of the system manager
+email.manager = someemailaddress@somecompanyororganization.comororgornet
+# email user info attribute (non standard)
+email.userinfo.attribute = user.email
+
+#-------------------------------------------------------------------------
+# L A Y O U T
+#-------------------------------------------------------------------------
+# the default page layout if none is specified
+layout.page.default = jetspeed-layouts::VelocityTwoColumns
+# optimization for looking up LayoutPortlet Page template, default == true
+layout.page.storeViewPageInSession = true
+
+#-------------------------------------------------------------------------
+# D E C O R A T O R S
+#-------------------------------------------------------------------------
+# default page decorator if none specified
+decorator.page.default = tigris
+# default portlet decorator if none specified
+decorator.portlet.default = tigris
+
+#-------------------------------------------------------------------------
+# P S M L
+#-------------------------------------------------------------------------
+# default page name (currently handled by PM)
+psml.page.default = default-page.psml    
+# PSML Folder Template to copy during new user creation and registration
+psml.template.folder = /_user/template/
+
+#-------------------------------------------------------------------------
+# P R O F I L E R
+#-------------------------------------------------------------------------
+# default profiling rule names assigned to a new user
+profiler.rule.names.default = page
+# default profiling rule values assigned to a new user
+profiler.rule.values.default = j2 
+    
+#-------------------------------------------------------------------------
+# R E G I S T R A T I O N
+#-------------------------------------------------------------------------
+# PSML Folder Template to copy during new user creation and registration
+# comma separated list
+registration.roles.default = user
+
+# Registration default groups assigned during registration or new user creation
+# comma separated list    
+registration.groups.default = 
+# Registration default profiling rules assigned during registration or new user creation
+# comma separated list
+registration.rules.default = 
+]]></source>        
+</section>
+</body>
+</document>

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

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

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

Added: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/navigation.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/navigation.xml?rev=747185&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/navigation.xml (added)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/navigation.xml Mon Feb 23 22:54:40 2009
@@ -0,0 +1,97 @@
+<?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>
+    <body>
+        <links>
+        	<item name="Main Docs" href="index.html" />
+        	<item name="Admin Guide" href="adminguide/index.html" />        	
+        	<item name="Developers Guide" href="devguide/index.html" />
+        	<item name="Users Guide" href="usersguide/index.html" />
+            <item name="PDF Documentation" href="/jetspeed2.pdf" img="images/pdf.gif" />        
+        </links>
+        <menu name="Deployment Overview">
+            <item name="Overview" href="deployguide/index.html" />            
+        </menu>
+    	<menu name="The Jetspeed Properties File">
+    	    <item name="Jetspeed Properties" href="deployguide/jetspeed-properties.html" />            
+    	    <item name="Override Properties" href="deployguide/override-properties.html" />            
+    	</menu>
+    	<menu name="Spring Configurations">
+    		<item name="Spring Introduction" href="deployguide/config-spring.html" />
+    		<item name="Datasource Bootstrap" href="deployguide/config-datasource.html" />
+    		<item name="Overrides" href="deployguide/config-overrides.html" />
+    		<item name="Jetspeed Components" href="deployguide/guide-components.html"/>
+    	</menu>
+    	
+    	<menu name="Deployment">
+			<item name="Tomcat 5" href="deployguide/guide-tomcat.html"/>
+			<item name="Websphere" href="deployguide/deploying-jetspeed-to-websphere.html"/>
+    		<item name="Deployer Tools" href="deployguide/deploye-tools.html" />
+		</menu>		
+    	
+    	<menu name="Security Components">
+    		<item name="Security Configuration" href="deployguide/security-config.html" />
+    		<item name="Credentials" href="deployguide/credentials.html" />
+    		<item name="Federated Authentication" href="deployguide/guide-federated-security.html" />
+    		<item name="NTLM" href="deployguide/guide-ntlm.html" />
+    		<item name="LDAP" href="deployguide/ldap.html" />
+    		
+    		<item name="SSO" href="deployguide/config-sso.html" />
+    		 <item name="Tomcat SSO Cross-Context" href="deployguide/guide-tomcat-sso-cross-context-j2-realm.html"/>
+    		 <item name="User Attributes" href="deployguide/guide-user-attributes.html"/>   		 
+		</menu>
+		
+    	<menu name="Portal Components">
+    		<item name="Aggregation" href="deployguide/guide-aggregation.html" />
+    		<item name="Caching" href="" />
+    		<item name="Device Capabilities" href="" />
+    		<item name="Portal Core" href="" />    		
+    		<item name="Pipelines" href="" />
+    		<item name="Pluto Container" href="" />
+    		<item name="Profiler" href="deployguide/config-profiler.html" />
+    		<item name="Registry" href="" />    		
+    		<item name="Services" href="" />
+    		<item name="Transactions" href="" />
+    	</menu>
+
+    	<menu name="PSML Configuration">
+    		<item name="Menus" href="deployguide/guide-menus-declarative-psml.html" />
+    		<item name="PSML Declarative Security" href="deployguide/guide-security-declarative-psml.html" />
+		</menu>
+
+		<menu name="Jetspeed Cluster">    				
+    		<item name="Clustering" href="deployguide/config-cluster.html" />
+    		<item name="Distributed Cache" href="deployguide/distributed-cache.html" />
+		</menu>
+		
+    	<menu name="Administration Compoenents">
+    		<item name="General Administration" href="" />
+    		<item name="Statistics" href="" />    		
+		</menu>
+		
+    	<menu name="Ajax">
+    		<item name="Ajax API" href="ajaxapi.html" />
+		</menu>
+		
+    	<menu name="Desktop">
+    		<item name="Desktop" href="" />    	
+    		<item name="Header Contribution" href="" />    	
+		</menu>
+		
+    </body>
+</project>

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

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

Added: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/override-properties.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/override-properties.xml?rev=747185&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/override-properties.xml (added)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/override-properties.xml Mon Feb 23 22:54:40 2009
@@ -0,0 +1,32 @@
+<?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>User Attributes</title>
+    <subtitle>User Information Configuration</subtitle>
+    <authors>
+      <person name="David Sean Taylor" email="taylor@apache.org"/>
+    </authors>
+  </properties>
+  <body>
+<section name="Override Properties">
+<p>
+</p>
+</section>
+</body>
+</document>

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

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/deployguide/override-properties.xml
------------------------------------------------------------------------------
    svn:keywords = Id

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

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

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

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

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

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

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

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

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

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

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

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

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

Added: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/credentials.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/credentials.xml?rev=747185&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/credentials.xml (added)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/credentials.xml Mon Feb 23 22:54:40 2009
@@ -0,0 +1,168 @@
+<?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 Security - Credentials Management</title>
+        <authors>
+            <person name="David Le Strat" email="dlestrat@apache.org" />
+            <person name="Ate Douma" email="ate@douma.nu" />
+        </authors>
+    </properties>
+    <body>
+        <section name="Credentials Management Overview">
+          <subsection name="DefaultCredentialHandler Features">
+            <p>
+                With the Jetspeed <a href="apidocs/org/apache/jetspeed/security/spi/impl/DefaultCredentialHandler.html">
+                <code>DefaultCredentialHandler</code></a> special management of password credentials can
+                easily be configured. Through the provided 
+                <a href="apidocs/org/apache/jetspeed/security/spi/PasswordCredentialProvider.html">
+                <code>PasswordCredentialProvider</code></a> and 
+                <a href="apidocs/org/apache/jetspeed/security/spi/InternalPasswordCredentialInterceptor.html">
+                <code>InternalPasswordCredentialInterceptor</code></a> components custom logic can be plugged in for:</p>
+            <ul>
+                <li>providing a custom 
+                    <a href="../jetspeed-api/apidocs/org/apache/jetspeed/security/PasswordCredential.html">
+                    <code>PasswordCredential</code></a> implementation</li>
+                <li>password encoding<br/>
+                    If an 
+                    <a href="apidocs/org/apache/jetspeed/security/spi/CredentialPasswordEncoder.html">
+                    <code>CredentialPasswordEncoder</code></a> is available from the 
+                    <code>PasswordCredentialProvider</code> passwords will be encoded with it before they are persisted.
+                    The provided 
+                    <a href="apidocs/org/apache/jetspeed/security/spi/impl/MessageDigestCredentialPasswordEncoder.html">
+                    <code>MessageDigestCredentialPasswordEncoder</code></a> uses 
+                    <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/security/MessageDigest.html">
+                    <code>MessageDigest</code></a> hash algorithms for the password encryption, and can for example be
+                    configured to use <code>SHA-1</code> and <code>Base64</code>.
+                </li>
+                <li>enforcing password value rules<br/>
+                    If an
+                    <a href="apidocs/org/apache/jetspeed/security/spi/CredentialPasswordValidator.html">
+                    <code>CredentialPasswordValidator</code></a> is available from the
+                    <code>PasswordCredentialProvider</code>, passwords will be validated with it before they are persisted.
+                    The 
+                    <a href="apidocs/org/apache/jetspeed/security/spi/impl/DefaultCredentialPasswordValidator.html">
+                    <code>DefaultCredentialPasswordValidator</code></a> for example enforces non-emtpy password. And
+                    with the 
+                    <a href="apidocs/org/apache/jetspeed/security/spi/impl/SimpleCredentialPasswordValidator.html">
+                    <code>SimpleCredentialPasswordValidator</code></a> a minimum length and a minum number of numeric
+                    characters can be enforced.
+                </li>
+                <li>intercepting 
+                    <a href="../jetspeed-api/apidocs/org/apache/jetspeed/security/om/InternalCredential.html">
+                    <code>InternalCredential</code></a> lifecycle events<br/>
+                    If the <code>DefaultCredentialHandler</code> is provided with an
+                    <code>InternalPasswordCredentialInterceptor</code>, it will invoke this interceptor (or an arbirary
+                    set if
+                    <a href="apidocs/org/apache/jetspeed/security/spi/impl/InternalPasswordCredentialInterceptorsProxy.html">
+                    <code>InternalPasswordCredentialInterceptorsProxy</code></a> is used) on:
+                    <ul>
+                      <li>after loading a credential from the persistent store</li>
+                      <li>after authenticating a user</li>
+                      <li>before a new credential is saved to the persistent store</li>
+                      <li>before a new password is save for the credential</li>                      
+                    </ul>
+                    Jetspeed already provides a basic set of interceptors, ready to be used:
+                    <ul>
+                      <li>
+                          <a href="apidocs/org/apache/jetspeed/security/spi/impl/ValidatePasswordOnLoadInterceptor.html">
+                          <code>ValidatePasswordOnLoadInterceptor</code></a><br/>
+                          This interceptor can be used to validate (pre)set passwords in the persistent store and force
+                          a required change by the user if invalid. It uses the configured <code>CredentialPasswordValidator</code>
+                          of the <code>PasswordCredentialProvider</code>, the same as used when a password is changed.
+                      </li>
+                      <li>
+                          <a href="apidocs/org/apache/jetspeed/security/spi/impl/EncodePasswordOnFirstLoadInterceptor.html">
+                          <code>EncodePasswordOnFirstLoadInterceptor</code></a><br/>
+                          This interceptor can be used if passwords needs to be preset in the persistent store or
+                          migrated unencoded from a different store. With this interceptor, these cleartext password
+                          will automatically be encoded the first time they are loaded from the database, using the 
+                          <code>CredentialPasswordEncoder</code> from the <code>PasswordCredentialProvider</code>
+                      </li>
+                      <li>
+                          <a href="apidocs/org/apache/jetspeed/security/spi/impl/PasswordExpirationInterceptor.html">
+                          <code>PasswordExpirationInterceptor</code></a><br/>
+                          This interceptor can be used to enforce a maximum lifespan for passwords.
+                          It manages the <code>expiration_date</code> and <code>is_expired</code> members of the
+                          <code>InternalCredential</code> and sets the expired flag when on authentication of a user
+                          its (valid) password is expired. The authentication will then fail.<br/>
+                          Note: A Jetspeed pipeline Valve, the <code>PasswordCredentialValveImpl</code> can be
+                          used to request or even enforce users to change their password in time to prevent a password
+                          expiration (described further below). 
+                      </li>
+                      <li>
+                          <a href="apidocs/org/apache/jetspeed/security/spi/impl/MaxPasswordAuthenticationFailuresInterceptor.html">
+                          <code>MaxPasswordAuthenticationFailuresInterceptor</code></a><br/>
+                          This interceptor can be used to prevent password hacking by enforcing a maximum number of
+                          invalid password attempts in a row. Once this number of authentication failures is reached,
+                          the credential will be disabled. On a successful authentication though, this count
+                          will automatically be reset to zero again by the <code>DefaultCredentialHandler</code>.
+                      </li>                          
+                      <li>
+                          <a href="apidocs/org/apache/jetspeed/security/spi/impl/PasswordHistoryInterceptor.html">
+                          <code>PasswordHistoryInterceptor</code></a><br/>
+                          This interceptor can be used to enforce usage of unique new passwords in respect to a certain
+                          number of previous used passwords. When a new password is set, the current password is saved
+                          in a FIFO stack of used passwords. When a user itself changes its password, it must be different
+                          from all the onces thus saved, otherwise a 
+                          <a href="../jetspeed-api/apidocs/org/apache/jetspeed/security/PasswordAlreadyUsedException.html">
+                          <code>PasswordAlreadyUsedException</code></a> will be
+                          thrown. But setting a new password through the administrative interface still allows any
+                          password (when otherwise valid) to be set.
+                      </li>
+                    </ul>
+                    <p>
+                    The <code>DefaultCredentialHandler</code> only supports one interceptor to be configured.
+                    But, with the 
+                    <a href="apidocs/org/apache/jetspeed/security/spi/impl/InternalPasswordCredentialInterceptorsProxy.html">
+                    <code>InternalPasswordCredentialInterceptorsProxy</code></a>, a list of interceptors can
+                    be configured which then will be invoked sequentially.</p>
+                    <p>
+                    Jetspeed comes out of the box with several of these interceptors configured, and its very easy to
+                    change and extend.See the <a href="config.html#security-spi-atn_xml">security-spi-atn.xml</a>
+                    section in the <a href="config.html">Security Services Configuration</a> document for a description
+                    of the default configuration. Also provided there is an example how to setup the interceptors to 
+                    restore the "old" (and much more restrict) configuration provided with the 2.0-M3 release and
+                    earlier.</p>
+                </li>
+            </ul>
+          </subsection>
+          <subsection name="Credentials Management Implementation">
+            <p>
+                The class diagram below describes the components used for the
+                <code>DefaultCredentialHandler</code>
+                implementation.
+            </p>
+            <p align="center">
+                <img src="devguide/imagescredential-handler-c.gif" border="0" />
+            </p>
+            <p>
+                The OJB mappings for the default credentials implementation are described in 
+                <code>security_repository.xml</code>:
+                <ul>
+                    <li><code>InternalCredential</code>: Maps to the SECURITY_CREDENTIAL table.</li>
+                </ul>
+                The following database schema is used to stored credentials and their associations to principals.
+            </p>
+            <p align="center">
+                <img src="devguide/imagesprincipals-credentials-schema.gif" border="0" />
+            </p>
+          </subsection>
+        </section>
+    </body>
+</document>

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

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

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

Added: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/dev-capabilities.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/dev-capabilities.xml?rev=747185&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/dev-capabilities.xml (added)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/dev-capabilities.xml Mon Feb 23 22:54:40 2009
@@ -0,0 +1,226 @@
+<?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 Capabilities</title>
+        <authors>
+            <person name="David Le Strat" email="dlestrat@apache.org" />
+        </authors>
+    </properties>
+    <body>
+        <section name="Capabilities Overview">
+            <p>
+            Jetspeed-2 capabilities provides a mechanism for mapping the client used to access Jetspeed-2 to media types
+            for page rendering.
+            </p>
+            <subsection name="Capabilities Definitions">
+            <p>
+            The Jetspeed-2 capability engine maps clients to media types to mime types.  Here are some more detailed
+            definitions:
+            <ul>
+            <li>Clients: The application that initiates a request to the Jetspeed-2 portal engine.  Jetspeed-2 uses
+            the <code>User-Agent</code> to determine the client that initiates a request.</li>
+            <li>Media Type:  The type of media requesting the content (HTML, WML, etc.).  Content in Jetspeed-2
+            can be requested by different type of devices through different media.</li>
+            <li>Mime Type:  The type of content being requested.</li>
+            </ul>
+            </p>
+            <p>
+            Jetspeed-2 works with the following media types:
+            <table>
+            	<tr>
+            		<th>Name</th>
+            		<th>Character Set</th>
+            		<th>Description</th>
+            	</tr>
+            	<tr>
+            		<td>html</td>
+            		<td>UTF-8</td>
+            		<td>Rich HTML for HTML 4.0 compliants browsers</td>
+            	</tr>
+            	<tr>
+            		<td>wml</td>
+            		<td>UTF-8</td>
+            		<td>Format for mobile phones and PDAs compatible with WML 1.1</td>
+            	</tr>
+            	<tr>
+            		<td>vxml</td>
+            		<td>UTF-8</td>
+            		<td>Format suitable for use with an audio VoiceXML server</td>
+            	</tr>
+            	<tr>
+            		<td>xml</td>
+            		<td></td>
+            		<td>XML 1.0</td>
+            	</tr>
+            	<tr>
+            		<td>xhtml-basic</td>
+            		<td>UTF-8</td>
+            		<td>XHTML Basic used in WAP devices</td>
+            	</tr>
+           	</table>
+            </p>
+            <p>
+            Jetspeed-2 is configured to recognize the following clients:
+            <table>
+            	<tr>
+            		<th>Client</th>
+            		<th>User Agent Pattern</th>
+            		<th>Manufacturer</th>
+            		<th>Preferred Mime Type</th>
+            	</tr>
+            	<tr>
+            		<td>ie5</td>
+            		<td>.*MSIE 5.*</td>
+            		<td>Microsoft</td>
+            		<td>html</td>
+            	</tr>
+            	<tr>
+            		<td>ie6</td>
+            		<td>.*MSIE 6.*</td>
+            		<td>Microsoft</td>
+            		<td>html</td>
+            	</tr>
+            	<tr>
+            		<td>ns4</td>
+            		<td>.*Mozilla/4.*</td>
+            		<td>Netscape</td>
+            		<td>html</td>
+            	</tr>
+            	<tr>
+            		<td>mozilla</td>
+            		<td>.*Mozilla/5.*</td>
+            		<td>Mozilla</td>
+            		<td>html</td>
+            	</tr>
+            	<tr>
+            		<td>lynx</td>
+            		<td>Lynx.*</td>
+            		<td>GNU</td>
+            		<td>html</td>
+            	</tr>
+            	<tr>
+            		<td>opera7</td>
+            		<td>.*Opera/7.*</td>
+            		<td>Opera</td>
+            		<td>html</td>
+            	</tr>
+            	<tr>
+            		<td>ie5mac</td>
+            		<td>.*MSIE 5.*Mac.*</td>
+            		<td>Microsoft</td>
+            		<td>html</td>
+            	</tr>
+            	<tr>
+            		<td>safari</td>
+            		<td>.*Mac.*Safari.*</td>
+            		<td>Apple</td>
+            		<td>html</td>
+            	</tr>
+            	<tr>
+            		<td>xhtml-basic</td>
+            		<td>DoCoMo/2.0.*|KDDI-.*UP\.Browser.*|J-PHONE/5.0.*|Vodafone/1.0/.*</td>
+            		<td>N/A</td>
+            		<td>xhtml</td>
+            	</tr>
+            	<tr>
+            		<td>agentxml</td>
+            		<td>agentxml/1.0.*</td>
+            		<td>N/A</td>
+            		<td>xml</td>
+            	</tr>
+            	<tr>
+            		<td>nokia_generic</td>
+            		<td>Nokia.*</td>
+            		<td>Nokia</td>
+            		<td>wml</td>
+            	</tr>
+            	<tr>
+            		<td>up</td>
+            		<td>UP.*|.*UP\.Browser.*</td>
+            		<td>United Planet</td>
+            		<td>wml</td>
+            	</tr>
+            	<tr>
+            		<td>sonyericsson</td>
+            		<td>Ercis.*|SonyE.*</td>
+            		<td>SonyEricsson</td>
+            		<td>wml</td>
+            	</tr>
+            	<tr>
+            		<td>wapalizer</td>
+            		<td>Wapalizer.*</td>
+            		<td>Wapalizer</td>
+            		<td>wml</td>
+            	</tr>
+            	<tr>
+            		<td>klondike</td>
+            		<td>Klondike.*</td>
+            		<td>Klondike</td>
+            		<td>wml</td>
+            	</tr>
+            	<tr>
+            		<td>wml_generic</td>
+            		<td>.*WML.*|.*WAP.*|.*Wap.*|.*wml.*</td>
+            		<td>N/A</td>
+            		<td>wml</td>
+            	</tr>
+            	<tr>
+            		<td>vxml_generic</td>
+            		<td>.*VoiceXML.*</td>
+            		<td>N/A</td>
+            		<td>vxml</td>
+            	</tr>
+            	<tr>
+            		<td>nuance</td>
+            		<td>Nuance.*</td>
+            		<td>Nuance</td>
+            		<td>vxml</td>
+            	</tr>
+            </table>
+            </p>
+            </subsection>
+            <subsection name="Capabilities and Content Rendering">
+            <p>
+            The <code>media-type</code> is used to locate the appropriate decorations template for the given <code>media-type</code>.
+            </p>
+            </subsection>
+            <subsection name="Capabilities Implementation">
+            <p>
+            The <code>Capabilities</code> component derive a <code>CapabilityMap</code> from the information provided 
+            by the <code>User-Agent</code> request header:
+            <source>
+cm = capabilities.getCapabilityMap(agent);
+            </source>
+            </p>
+            <p>
+            This operation occurs at the very beginning of Jetspeed-2 request pipeline processing.  Once the 
+            <code>CapabilityMap</code> is retrieved, it is added to the Jetspeed-2 <code>org.apache.jetspeed.request.RequestContext</code>
+            and made available to the portal engine for processing the request.
+            </p>
+            <p>
+            The two pictures below describes the <code>Capabilities</code> interfaces and the relational database model
+            backing the implementation.<br/><br/>
+            <img src="devguide/images/capabilities-c.gif" border="0"/><br/><br/>
+            <img src="devguide/images/capabilities-db.gif" border="0"/>
+            </p>
+            </subsection>
+        </section>
+    </body>
+</document>
+

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

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

Added: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/dev-cm.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/dev-cm.xml?rev=747185&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/dev-cm.xml (added)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/dev-cm.xml Mon Feb 23 22:54:40 2009
@@ -0,0 +1,47 @@
+<?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 Component Manager</title>
+        <authors>
+            <person name="David Le Strat" email="dlestrat@apache.org" />
+        </authors>
+    </properties>
+    <body>
+        <section name="Component Manager Overview">
+            <p>
+            The <code>ComponentManager</code> provides a layer of abstraction on top of the component framework that
+            will be used by Jetspeed-2.  This provides a flexible architecture where the component framework used can
+            easily be "swapped".  By default Jetspeed-2 uses the <a href="http://www.springframework.com">spring
+            framework</a>.
+            </p>
+            <subsection name="Component Manager with Spring">
+            <p>
+            The <code>ComponentManager</code> delegates the initialization of the component framework engine
+            to an implementation specific to the component framework as illustrated below.  The <code>SpringComponentManager</code>
+            is responsible for initializing the spring engine and calls to spring components within the Jetspeed-2 engines are wrapped
+            behind generic methods such as <code>getComponent()</code>.
+            </p>
+            <p>
+            <img src="devguide/images/spring-component-manager-c.gif" border="0"/><br/><br/>
+            </p>
+            </subsection>
+        </section>
+    </body>
+</document>
+

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

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

Added: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/dev-deploy.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/dev-deploy.xml?rev=747185&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/dev-deploy.xml (added)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/dev-deploy.xml Mon Feb 23 22:54:40 2009
@@ -0,0 +1,87 @@
+<?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 Deploy Tools</title>
+        <authors>
+            <person name="David Le Strat" email="dlestrat@apache.org" />
+        </authors>
+    </properties>
+    <body>
+        <section name="Jetspeed-2 Deployment Overview">
+        	<subsection name="Deploying Portlets in Jetspeed-2: An End User View">
+        	<p>
+        	Deploying custom portlets in Jetspeed-2 is simple.  Portlets are very similar to servlets.
+        	They require a deployment descriptor, <code>portlet.xml</code> which goes in <code>WEB-INF</code>
+            and need to be packaged in a war-like format. You can find quite a few example <code>portlet.xml</code> files within the Jetspeed-2 source tree.
+            For starters take a look at the one under <code>/portal/src/webapp/WEB-INF</code>.  In order to deploy a portlet, Jetspeed-2 requires the user
+            to follow those steps:
+            <ol>
+            <li>Build you portlet as a portlet application just as you would a web application.</li>
+            <li>Package your portlet application into a .war file.</li>
+            <li>Copy the .war file to Jetspeed's deployment directory, by default this is <code>WEB-INF/deploy</code>.
+            Jetspeed will take care of automatically deplying the portlet into the portlet registry and will also deploy the portlet
+            as a web application into the app server Jetspeed is deployed to.</li>
+            <li>The easiest way to view your portlet is to add an entry to the <code>default-page.psml</code> under <code>jetspeed/WEB-INF/pages</code>.
+            The id for the portlet fragment uses a unique combination of <code>${portlet.application.id}::${portlet.name}</code>
+            where <code>${portlet.application.id}</code> is the actual name of the war file (minus the ".war") that contains your portlet app and
+            <code>${portlet.name}</code> needs to be the value in the portlet name tags, <code>&lt;portlet-name&gt;MyPortlet&lt;/portlet-name&gt;</code>.
+            Changes to the psml will be picked up automatically and you should now be able to view your portlet!
+            </li>
+            </ol>
+			</p>        	
+        	</subsection>
+        	<subsection name="Portlet Deployment: How Does it Work?">
+        	<p>
+        	The component hierarchy below describes the assembly dependencies supporting Jetspeed-2 deployment functionality.
+        	</p>
+        	<p>
+            <img src="images/deployment-mgr-assembly.gif" border="0"/><br/><br/>
+            </p>
+        	<p>
+        	The <code>DeploymentManager</code> is configured with the properties specified in
+        	<code>WEB-INF/conf/jetspeed.properties</code>:
+        	<ul>
+        	<li><code>autodeployment.staging.dir</code>: The directory scanned for autodeployment.</li>
+        	<li><code>autodeployment.delay</code>: The frequency of the deploy directory scanning.</li>
+        	</ul>
+        	The <code>DeploymentManager</code> is also configured with 2 types of <code>DeploymentEventListener</code>:
+        	</p>
+        	<p>
+            <img src="images/deployment-event-listener-c.gif" border="0"/><br/><br/>
+            </p>
+            <p>
+            <ul>
+            <li>The <code>DeployPortletAppEventListener</code> handles the hot deployment of portlet applications.</li>
+            <li>The <code>DeployDecoratorEventListener</code>: handles the hot deployment of decorators. See 
+            <a href="../../guides/guide-decorators.html">guide to decorators</a> for more information.</li>
+            </ul>
+            </p>
+        	<p>
+        	Jetspeed-2 provides a <code>StandardDeploymentManager</code>.  The <code>StandardDeploymentManager</code> leverages
+        	a <code>FileSystemScanner</code> to scan for new assets to deploy.  It leverages Jetspeed-2 
+        	<a href="deploy-tools.html">deploy tools</a> to prepare portlet applications prior to deployment.
+            </p>
+            <p>
+            <img src="images/deployment-mgr-c.gif" border="0"/><br/><br/>
+            </p>
+            </subsection>
+        </section>
+    </body>
+</document>
+

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

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

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

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

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

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

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

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

Copied: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/dev-statistics.xml (from r740206, portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/statistics/xdocs/index.xml)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/dev-statistics.xml?p2=portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/dev-statistics.xml&p1=portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/statistics/xdocs/index.xml&r1=740206&r2=747185&rev=747185&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/statistics/xdocs/index.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/dev-statistics.xml Mon Feb 23 22:54:40 2009
@@ -116,8 +116,64 @@
       &lt;constructor-arg  index='8'&gt;&lt;ref bean="JetspeedDS"/&gt;&lt;/constructor-arg&gt;
     &lt;/bean&gt;</source>
         	</p>
-        	</subsection>
+        	</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="stats.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>
 

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

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

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

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

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

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

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

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

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

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

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

Copied: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/guide-layouts.xml (from r740206, portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/guides/guide-layouts.xml)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/guide-layouts.xml?p2=portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/guide-layouts.xml&p1=portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/guides/guide-layouts.xml&r1=740206&r2=747185&rev=747185&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/guides/guide-layouts.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/guide-layouts.xml Mon Feb 23 22:54:40 2009
@@ -52,7 +52,7 @@
 </ul>
 </p>
 <p>
-    <img src='images/layouts/layouts-overview.png'/>
+    <img src='devguide/images/layouts-overview.png'/>
 </p>
 </section>
 <section name="Layouts Packaging">

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

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

Copied: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/guide-pipeline.xml (from r740206, portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/guides/guide-pipeline.xml)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/guide-pipeline.xml?p2=portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/guide-pipeline.xml&p1=portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/guides/guide-pipeline.xml&r1=740206&r2=747185&rev=747185&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/guides/guide-pipeline.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/guide-pipeline.xml Mon Feb 23 22:54:40 2009
@@ -27,13 +27,73 @@
 		<section name="Jetspeed-2 Pipeline">
 			<p>As described below, one of key component of the Jetspeed-2 portal engine is its request pipeline.
 			<br/><br/>
-			<img src="images/j2-overview.gif" border="0"/>
+			<img src="devguide/images/j2-overview.gif" border="0"/>
 			<br/>
 			In Jetspeed-2 request are processed through a series of <code>Valve</code> assembled together as a
-			pipeline.  For detailed information about Jetspeed-2 pipeline, 
-			<a href="../multiproject/jetspeed-portal/pipeline.html">click here</a>.
+			pipeline.  
 			</p>
 		</section>
+        <section name="Request Pipeline">
+            <p>
+            In Jetspeed-2, a request pipeline performs individual operations to the request.
+            </p>
+            <subsection name="Pipeline Concepts">
+            <p>
+            A <code>Pipeline</code> is made of <code>Valves</code> chained together in a chain of responsibility pattern.
+            The <code>JetspeedPipeline</code> implementation assembles a ordered list of <code>Valves</code> that are
+            processed sequentially.
+            <br/><br/>
+            <img src="images/pipeline-c.gif" border="0"/><br/><br/>
+            <img src="images/pipeline-assembly.gif" border="0"/>
+            </p>	
+            </subsection>
+            <subsection name="Jetspeed-2 Valves">
+            <p>
+            Jetspeed-2 provides various type of <code>Valve</code> as illustrated below:<br/><br/>
+           	<img src="images/valve-c.gif" border="0"/><br/>
+			The above valves serve the following purpose:
+           	<table>
+            	<tr>
+            		<th>Valve Name</th>
+            		<th>Description</th>
+            	</tr>
+            	<tr>
+            		<td>ActionValve</td>
+            		<td>Check if <code>PortletAction</code> needs to be processed and process it, if required.
+            		Used in the portlet pipeline.</td>
+            	</tr>
+            	<tr>
+            		<td>AggregateValve</td>
+            		<td>Invokes all Layout components in render mode to aggregate the generated contents and
+            		send the result to the client.</td>
+            	</tr>
+            	<tr>
+            		<td>CapabilityValve</td>
+            		<td>Identifies the browser and adds a <code>CapabilityMap</code> to the <code>RequestContext</code>.</td>
+            	</tr>
+            	<tr>
+            		<td>CleanupValve</td>
+            		<td>Looks for JSP pages that were pushed onto the <code>org.apache.jetspeed.renderStack</code>
+					request attribute, and attempts to include them.</td>
+            	</tr>
+            	<tr>
+            		<td>LoginValidationValve</td>
+            		<td>Checks if a login attempt failed and determines the cause.</td>
+            	</tr>
+            	<tr>
+            		<td>PasswordCredentialValve</td>
+            		<td>Checks the PasswordCredential (only once) after a User is logged in and redirects to a 
+            		change password page if necessary.</td>
+            	</tr>
+            	<tr>
+            		<td>SecurityValve</td>
+            		<td>Authenticates the user or redirects to Login if necessary, adds the
+					authenticated Subject to the <code>RequestContext</code>.</td>
+            	</tr>
+            </table>
+           	</p>
+            </subsection>
+        </section>
 
 	</body>
 </document>

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

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

Copied: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/guide-portal-design.xml (from r740206, portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/guides/guide-portal-design.xml)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/guide-portal-design.xml?p2=portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/guide-portal-design.xml&p1=portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/guides/guide-portal-design.xml&r1=740206&r2=747185&rev=747185&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/guides/guide-portal-design.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/guide-portal-design.xml Mon Feb 23 22:54:40 2009
@@ -32,11 +32,10 @@
 does not define standards for laying out and aggregating portlets and markup on a page.
 The documentation here under "Portal Design" covers:
 <ul>
-  <li><a href='guide-psml.html'>Page Aggregation - see the section on PSML</a></li>    
-  <li><a href='guide-decorators.html'>Page and Portlet Decorators</a></li>    
-  <li><a href='guide-layouts.html'>Page Layouts</a></li>    
-  <li><a href='guide-jpt.html'>The Jetspeed Power Tool</a></li>    
-  <li><a href='guide-site.html'>The Site Content Model</a></li>        
+  <li><a href='devguide/guide-psml.html'>Page Aggregation - see the section on PSML</a></li>    
+  <li><a href='devguide/guide-decorators.html'>Page and Portlet Decorators</a></li>    
+  <li><a href='devguide/guide-layouts.html'>Page Layouts</a></li>    
+  <li><a href='devguide/guide-jpt.html'>The Jetspeed Power Tool</a></li>    
   <li><a href='#Template Locators'>Template Locators</a></li>          
   <li><a href='#Terminology'>Terminology</a></li>          
 </ul>
@@ -68,7 +67,7 @@
 Layout templates control the overall aggregation of a portal page. Layout templates are 
 combined with portlets, providing a component model for aggregation. Jetspeed-2 comes out 
 of the box with several layout components including one, two and three column layouts. 
-See the <a href='guide-decorators.html'>Decorator Documentation</a> for all available Layouts in the 
+See the <a href='devguide/guide-decorators.html'>Decorator Documentation</a> for all available Layouts in the 
 default Jetspeed-2 system. Of course you can define and derive your own layouts. 
 </p>
 </subsection>
@@ -79,7 +78,7 @@
 locates templates using a normalized name/value pair URL scheme. 
 using this scheme in what is called a 'normalized' URL to either a decorator or layout.
 However, templating engines such as  Velocity need to work with templates using paths to templates that are
-relative of a document root. The <a href='guide-jpt.html'>Jetspeed Power Tool</a> facilitates conversion between normalized
+relative of a document root. The <a href='devguide/guide-jpt.html'>Jetspeed Power Tool</a> facilitates conversion between normalized
 and relative paths. Typically in the Spring configuration, the template root of all decorators is defined as:
 <source test=""><![CDATA[
 ${applicationRoot}/WEB-INF/decorations

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

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

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

Propchange: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/xdocs/devguide/guide-portlet-bridges.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