portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r725977 [41/48] - in /portals/jetspeed-2/portal/trunk: ./ app-servers/security/jboss/src/java/META-INF/jboss-secsvc/ app-servers/security/jboss/src/java/org/apache/jetspeed/appservers/security/jboss/ applications/jetspeed/src/main/javascrip...
Date Fri, 12 Dec 2008 12:07:04 GMT
Modified: portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml Fri Dec 12 04:06:29 2008
@@ -1,185 +1,185 @@
-#set($dollar = '$')
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-  
-   http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>2.0.9</maven>
-  </prerequisites>
-  <groupId>${groupId}</groupId>
-  <artifactId>${artifactId}</artifactId>
-  <name>My Portal Project</name>
-  <version>${version}</version>
-  <packaging>pom</packaging>
-
-  <properties>
-    <org.apache.portals.jetspeed.version>2.2-SNAPSHOT</org.apache.portals.jetspeed.version>
-    <org.apache.pluto.version>2.0.0-SNAPSHOT</org.apache.pluto.version>
-    <ccpp.version>1.0</ccpp.version>
-    <org.apache.portals.bridges.common.version>1.0.4</org.apache.portals.bridges.common.version>
-    <servlet-api.version>2.4</servlet-api.version>
-    <portlet-api.version>2.0</portlet-api.version>
-    <portal.context.name>${artifactId}</portal.context.name>
-    <org.apache.jetspeed.server.home>/opt/apache-tomcat-5.5.27/</org.apache.jetspeed.server.home>
-
-  </properties>
-
-  <repositories>
-    <repository>
-      <id>bluesunrise</id>
-      <name>BlueSunrise Maven 2 Repository</name>
-      <url>http://bluesunrise.com/maven2</url>
-    </repository>
-  </repositories>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>javax.portlet</groupId>
-        <artifactId>portlet-api</artifactId>
-        <version>${dollar}{portlet-api.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>javax.servlet</groupId>
-        <artifactId>servlet-api</artifactId>
-        <version>${dollar}{servlet-api.version}</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
-    <!-- Provided Dependencies -->
-    <dependency>
-      <groupId>javax.portlet</groupId>
-      <artifactId>portlet-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <pluginManagement>
-      <plugins>
-        <!-- Compiler -->
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <configuration>
-            <source>1.5</source>
-            <target>1.5</target>
-            <debug>true</debug>
-            <showDeprecation>true</showDeprecation>
-            <showWarnings>true</showWarnings>
-            <optimize>false</optimize>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.portals.jetspeed-2</groupId>
-          <artifactId>jetspeed-mvn-maven-plugin</artifactId>
-          <version>${dollar}{org.apache.portals.jetspeed.version}</version>
-          <configuration>
-            <targets combine.children="append">
-              <target>
-                <id>install-pa</id>
-                <dir>@rootdir@/${artifactId}-pa</dir>
-                <goals>clean,install</goals>
-              </target>
-              <target>
-                <id>install-portal</id>
-                <dir>@rootdir@/${artifactId}-portal</dir>
-                <goals>clean,install</goals>
-              </target>
-              <target>
-                <id>install</id>
-                <depends>install-portal,install-pa</depends>
-              </target>
-              <target>
-                <id>db-portal</id>
-                <depends>install-portal</depends>
-                <name>portal</name>
-                <dir>@rootdir@/${artifactId}-portal</dir>
-                <profiles>db</profiles>
-              </target>
-              <target>
-                <id>db</id>
-                <depends>db-portal</depends>
-              </target>
-              <target>
-                <id>deploy-pa</id>
-                <depends>install-pa</depends>
-                <name>pa</name>
-                <dir>@rootdir@/${artifactId}-pa</dir>
-                <profiles>deploy</profiles>
-              </target>
-              <target>
-                <id>deploy-portal</id>
-                <depends>install</depends>
-                <name>portal</name>
-                <dir>@rootdir@/${artifactId}-portal</dir>
-                <profiles>deploy</profiles>
-              </target>
-              <target>
-                <id>portal-seed</id>
-                <depends>install-portal</depends>
-                <name>portal</name>
-                <dir>@rootdir@/${artifactId}-portal</dir>
-                <profiles>seed</profiles>
-              </target>
-              <target>
-                <id>portal-seed-dbpsml</id>
-                <depends>install-portal</depends>
-                <name>portal</name>
-                <dir>@rootdir@/${artifactId}-portal</dir>
-                <profiles>seed-dbpsml</profiles>
-              </target>
-              <target>
-                <id>deploy-portal-dbpsml</id>
-                <depends>install-portal</depends>
-                <name>portal</name>
-                <dir>@rootdir@/${artifactId}-portal</dir>
-                <profiles>deploy-dbpsml</profiles>
-              </target>
-              
-              <target>
-                <id>all</id>
-                <depends>install,db,deploy-portal,deploy-pa</depends>
-              </target>
-            </targets>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-    <plugins>
-      <!--  ensure jetspeed:mvn plugin is installed automatically when executing for the first time -->
-      <plugin>
-        <groupId>org.apache.portals.jetspeed-2</groupId>
-        <artifactId>jetspeed-mvn-maven-plugin</artifactId>
-        <version>${dollar}{org.apache.portals.jetspeed.version}</version>
-      </plugin>
-    </plugins>
-
-  </build>
-
-</project>
+#set($dollar = '$')
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  
+   http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <prerequisites>
+    <maven>2.0.9</maven>
+  </prerequisites>
+  <groupId>${groupId}</groupId>
+  <artifactId>${artifactId}</artifactId>
+  <name>My Portal Project</name>
+  <version>${version}</version>
+  <packaging>pom</packaging>
+
+  <properties>
+    <org.apache.portals.jetspeed.version>2.2-SNAPSHOT</org.apache.portals.jetspeed.version>
+    <org.apache.pluto.version>2.0.0-SNAPSHOT</org.apache.pluto.version>
+    <ccpp.version>1.0</ccpp.version>
+    <org.apache.portals.bridges.common.version>1.0.4</org.apache.portals.bridges.common.version>
+    <servlet-api.version>2.4</servlet-api.version>
+    <portlet-api.version>2.0</portlet-api.version>
+    <portal.context.name>${artifactId}</portal.context.name>
+    <org.apache.jetspeed.server.home>/opt/apache-tomcat-5.5.27/</org.apache.jetspeed.server.home>
+
+  </properties>
+
+  <repositories>
+    <repository>
+      <id>bluesunrise</id>
+      <name>BlueSunrise Maven 2 Repository</name>
+      <url>http://bluesunrise.com/maven2</url>
+    </repository>
+  </repositories>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>javax.portlet</groupId>
+        <artifactId>portlet-api</artifactId>
+        <version>${dollar}{portlet-api.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>javax.servlet</groupId>
+        <artifactId>servlet-api</artifactId>
+        <version>${dollar}{servlet-api.version}</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+    <!-- Provided Dependencies -->
+    <dependency>
+      <groupId>javax.portlet</groupId>
+      <artifactId>portlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <!-- Compiler -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <configuration>
+            <source>1.5</source>
+            <target>1.5</target>
+            <debug>true</debug>
+            <showDeprecation>true</showDeprecation>
+            <showWarnings>true</showWarnings>
+            <optimize>false</optimize>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.portals.jetspeed-2</groupId>
+          <artifactId>jetspeed-mvn-maven-plugin</artifactId>
+          <version>${dollar}{org.apache.portals.jetspeed.version}</version>
+          <configuration>
+            <targets combine.children="append">
+              <target>
+                <id>install-pa</id>
+                <dir>@rootdir@/${artifactId}-pa</dir>
+                <goals>clean,install</goals>
+              </target>
+              <target>
+                <id>install-portal</id>
+                <dir>@rootdir@/${artifactId}-portal</dir>
+                <goals>clean,install</goals>
+              </target>
+              <target>
+                <id>install</id>
+                <depends>install-portal,install-pa</depends>
+              </target>
+              <target>
+                <id>db-portal</id>
+                <depends>install-portal</depends>
+                <name>portal</name>
+                <dir>@rootdir@/${artifactId}-portal</dir>
+                <profiles>db</profiles>
+              </target>
+              <target>
+                <id>db</id>
+                <depends>db-portal</depends>
+              </target>
+              <target>
+                <id>deploy-pa</id>
+                <depends>install-pa</depends>
+                <name>pa</name>
+                <dir>@rootdir@/${artifactId}-pa</dir>
+                <profiles>deploy</profiles>
+              </target>
+              <target>
+                <id>deploy-portal</id>
+                <depends>install</depends>
+                <name>portal</name>
+                <dir>@rootdir@/${artifactId}-portal</dir>
+                <profiles>deploy</profiles>
+              </target>
+              <target>
+                <id>portal-seed</id>
+                <depends>install-portal</depends>
+                <name>portal</name>
+                <dir>@rootdir@/${artifactId}-portal</dir>
+                <profiles>seed</profiles>
+              </target>
+              <target>
+                <id>portal-seed-dbpsml</id>
+                <depends>install-portal</depends>
+                <name>portal</name>
+                <dir>@rootdir@/${artifactId}-portal</dir>
+                <profiles>seed-dbpsml</profiles>
+              </target>
+              <target>
+                <id>deploy-portal-dbpsml</id>
+                <depends>install-portal</depends>
+                <name>portal</name>
+                <dir>@rootdir@/${artifactId}-portal</dir>
+                <profiles>deploy-dbpsml</profiles>
+              </target>
+              
+              <target>
+                <id>all</id>
+                <depends>install,db,deploy-portal,deploy-pa</depends>
+              </target>
+            </targets>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <!--  ensure jetspeed:mvn plugin is installed automatically when executing for the first time -->
+      <plugin>
+        <groupId>org.apache.portals.jetspeed-2</groupId>
+        <artifactId>jetspeed-mvn-maven-plugin</artifactId>
+        <version>${dollar}{org.apache.portals.jetspeed.version}</version>
+      </plugin>
+    </plugins>
+
+  </build>
+
+</project>

Propchange: portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/maven/src/site/resources/css/site.css
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/quickStart.sh
------------------------------------------------------------------------------
    svn:eol-style = LF

Modified: portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-capability/index.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-capability/index.xml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-capability/index.xml (original)
+++ portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-capability/index.xml Fri Dec 12 04:06:29 2008
@@ -1,226 +1,226 @@
-<?xml version="1.0" ?>
-<!--
+<?xml version="1.0" ?>
+<!--
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
     this work for additional information regarding copyright ownership.
     The ASF licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<document>
-    <properties>
-        <title>Jetspeed-2 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>.
-			See the <a href="../../guides/guide-portal-design.html">portal design guide</a> for more information.
-            </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="../../images/components/capabilities-c.gif" border="0"/><br/><br/>
-            <img src="../../images/components/capabilities-db.gif" border="0"/>
-            </p>
-            </subsection>
-        </section>
-    </body>
+    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>.
+			See the <a href="../../guides/guide-portal-design.html">portal design guide</a> for more information.
+            </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="../../images/components/capabilities-c.gif" border="0"/><br/><br/>
+            <img src="../../images/components/capabilities-db.gif" border="0"/>
+            </p>
+            </subsection>
+        </section>
+    </body>
 </document>
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-capability/index.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-cm/index.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-cm/index.xml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-cm/index.xml (original)
+++ portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-cm/index.xml Fri Dec 12 04:06:29 2008
@@ -1,46 +1,46 @@
-<?xml version="1.0" ?>
-<!--
+<?xml version="1.0" ?>
+<!--
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
     this work for additional information regarding copyright ownership.
     The ASF licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<document>
-    <properties>
-        <title>Jetspeed-2 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="../../images/components/spring-component-manager-c.gif" border="0"/><br/><br/>
-            </p>
-            </subsection>
-        </section>
-    </body>
+    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="../../images/components/spring-component-manager-c.gif" border="0"/><br/><br/>
+            </p>
+            </subsection>
+        </section>
+    </body>
 </document>
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-cm/index.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-deploy-tools/deploy-tools.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-deploy-tools/deploy-tools.xml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-deploy-tools/deploy-tools.xml (original)
+++ portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-deploy-tools/deploy-tools.xml Fri Dec 12 04:06:29 2008
@@ -1,89 +1,89 @@
-<?xml version="1.0" ?>
-<!--
+<?xml version="1.0" ?>
+<!--
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
     this work for additional information regarding copyright ownership.
     The ASF licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<document>
-    <properties>
-        <title>Jetspeed-2 Deploy Tools</title>
-        <authors>
-            <person name="David Le Strat" email="dlestrat@apache.org" />
-        </authors>
-    </properties>
-    <body>
-        <section name="The Role of Jetspeed-2 Deploy Tools">
-        	<subsection name="JetspeedDeploy and the DeploymentManager">
-        	<p>
-        	<code>JetspeedDeploy</code> prepares portlet applications for deployment within Jetspeed-2. When a new
-        	portlet deployment event is registered, the <code>DeployPortletAppEventListener</code> invokes <code>JetspeedDeploy</code>
-        	to prepare the portlet application for deployment.
-        	<source>
-    new JetspeedDeploy(event.getPath(), toFile.getAbsolutePath(), stripLoggers);
-            </source>
-        	</p>
-        	<p>
-        	<code>JetspeedDeploy</code> copies the web application archives (.war) from the input directory to the
-        	output directory and parses the <code>web.xml</code>, <code>portlet.xml</code>, and <code>context.xml</code>
-        	to ensure their compliance with the Jetspeed-2 portal engine. 
-        	</p>
-        	<p>
-            <img src="../../images/components/jetspeed-deploy-c.gif" border="0"/><br/><br/>
-            </p>
-            <p>
-            <code>JetspeedDeploy</code> invokes the <code>JetspeedWebApplicationRewriter</code> to infuse the <code>web.xml</code>
-            with the <code>JetspeedContainer</code> servlet if it does not already exist:
-            <source>
-  &lt;servlet&gt;
-    &lt;servlet-name&gt;JetspeedContainer&lt;/servlet-name&gt;
-    &lt;display-name&gt;Jetspeed Container&lt;/display-name&gt;
-    &lt;description&gt;MVC Servlet for Jetspeed Portlet Applications&lt;/description&gt;
-    &lt;servlet-class&gt;org.apache.jetspeed.container.JetspeedContainerServlet&lt;/servlet-class&gt;
-    &lt;init-param&gt;
-      &lt;param-name&gt;contextName&lt;/param-name&gt;
-      &lt;param-value&gt;${portlet-application-name}&lt;/param-value&gt;
-    &lt;/init-param&gt;
-    &lt;load-on-startup&gt;0&lt;/load-on-startup&gt;
-  &lt;/servlet&gt;
-  ...
-  &lt;servlet-mapping&gt;
-    &lt;servlet-name&gt;JetspeedContainer&lt;/servlet-name&gt;
-    &lt;url-pattern&gt;/container/*&lt;/url-pattern&gt;
-  &lt;/servlet-mapping&gt;
-            </source>
-            </p>
-            <p>
-            In the same fashion, the <code>JetspeedDeploy</code> invokes the <code>JetspeedContextRewriter</code> to manipulate
-            a portlet application <code>context.xml</code> file.  For more information about Tomcat <code>context.xml</code>, 
-            see <a href="http://tomcat.apache.org/tomcat-5.0-doc/deployer-howto.html#Context%20descriptors">tomcat's documentation</a>.
-            </p>
-        	</subsection>
-            <subsection name="JetspeedDeploy Standalone Usage">
-            <p>
-            <code>JetspeedDeploy</code> can also be invoke through the command line:
-            <source>
-    java -jar jetspeed-deploy-tools-&lt;version&gt;.jar -s inputWarPath outputWarPath
-            </source>
-            where:
-            <ul>
-            <li><code>-s</code>: flag indicating whether or not to strip to loggers from the application. When the flag is present, the
-            loggers available in the application will be removed.</li>
-            <li><code>inputWarPath</code>: the path of the war to process.</li>
-            <li><code>outputWarPath</code>: the path of the processed war.</li>
-            </ul>
-            </p>  
-            </subsection>
-        </section>
-    </body>
+    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="The Role of Jetspeed-2 Deploy Tools">
+        	<subsection name="JetspeedDeploy and the DeploymentManager">
+        	<p>
+        	<code>JetspeedDeploy</code> prepares portlet applications for deployment within Jetspeed-2. When a new
+        	portlet deployment event is registered, the <code>DeployPortletAppEventListener</code> invokes <code>JetspeedDeploy</code>
+        	to prepare the portlet application for deployment.
+        	<source>
+    new JetspeedDeploy(event.getPath(), toFile.getAbsolutePath(), stripLoggers);
+            </source>
+        	</p>
+        	<p>
+        	<code>JetspeedDeploy</code> copies the web application archives (.war) from the input directory to the
+        	output directory and parses the <code>web.xml</code>, <code>portlet.xml</code>, and <code>context.xml</code>
+        	to ensure their compliance with the Jetspeed-2 portal engine. 
+        	</p>
+        	<p>
+            <img src="../../images/components/jetspeed-deploy-c.gif" border="0"/><br/><br/>
+            </p>
+            <p>
+            <code>JetspeedDeploy</code> invokes the <code>JetspeedWebApplicationRewriter</code> to infuse the <code>web.xml</code>
+            with the <code>JetspeedContainer</code> servlet if it does not already exist:
+            <source>
+  &lt;servlet&gt;
+    &lt;servlet-name&gt;JetspeedContainer&lt;/servlet-name&gt;
+    &lt;display-name&gt;Jetspeed Container&lt;/display-name&gt;
+    &lt;description&gt;MVC Servlet for Jetspeed Portlet Applications&lt;/description&gt;
+    &lt;servlet-class&gt;org.apache.jetspeed.container.JetspeedContainerServlet&lt;/servlet-class&gt;
+    &lt;init-param&gt;
+      &lt;param-name&gt;contextName&lt;/param-name&gt;
+      &lt;param-value&gt;${portlet-application-name}&lt;/param-value&gt;
+    &lt;/init-param&gt;
+    &lt;load-on-startup&gt;0&lt;/load-on-startup&gt;
+  &lt;/servlet&gt;
+  ...
+  &lt;servlet-mapping&gt;
+    &lt;servlet-name&gt;JetspeedContainer&lt;/servlet-name&gt;
+    &lt;url-pattern&gt;/container/*&lt;/url-pattern&gt;
+  &lt;/servlet-mapping&gt;
+            </source>
+            </p>
+            <p>
+            In the same fashion, the <code>JetspeedDeploy</code> invokes the <code>JetspeedContextRewriter</code> to manipulate
+            a portlet application <code>context.xml</code> file.  For more information about Tomcat <code>context.xml</code>, 
+            see <a href="http://tomcat.apache.org/tomcat-5.0-doc/deployer-howto.html#Context%20descriptors">tomcat's documentation</a>.
+            </p>
+        	</subsection>
+            <subsection name="JetspeedDeploy Standalone Usage">
+            <p>
+            <code>JetspeedDeploy</code> can also be invoke through the command line:
+            <source>
+    java -jar jetspeed-deploy-tools-&lt;version&gt;.jar -s inputWarPath outputWarPath
+            </source>
+            where:
+            <ul>
+            <li><code>-s</code>: flag indicating whether or not to strip to loggers from the application. When the flag is present, the
+            loggers available in the application will be removed.</li>
+            <li><code>inputWarPath</code>: the path of the war to process.</li>
+            <li><code>outputWarPath</code>: the path of the processed war.</li>
+            </ul>
+            </p>  
+            </subsection>
+        </section>
+    </body>
 </document>
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-deploy-tools/deploy-tools.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-deploy-tools/index.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-deploy-tools/index.xml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-deploy-tools/index.xml (original)
+++ portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-deploy-tools/index.xml Fri Dec 12 04:06:29 2008
@@ -1,86 +1,86 @@
-<?xml version="1.0" ?>
-<!--
+<?xml version="1.0" ?>
+<!--
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
     this work for additional information regarding copyright ownership.
     The ASF licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<document>
-    <properties>
-        <title>Jetspeed-2 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/components/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/components/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/components/deployment-mgr-c.gif" border="0"/><br/><br/>
-            </p>
-            </subsection>
-        </section>
-    </body>
+    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/components/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/components/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/components/deployment-mgr-c.gif" border="0"/><br/><br/>
+            </p>
+            </subsection>
+        </section>
+    </body>
 </document>
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-deploy-tools/index.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-portal/index.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-portal/index.xml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-portal/index.xml (original)
+++ portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-portal/index.xml Fri Dec 12 04:06:29 2008
@@ -1,38 +1,38 @@
-<?xml version="1.0" ?>
-<!--
+<?xml version="1.0" ?>
+<!--
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
     this work for additional information regarding copyright ownership.
     The ASF licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<document>
-    <properties>
-        <title>Jetspeed-2 Portal</title>
-        <authors>
-            <person name="David Le Strat" email="dlestrat@apache.org" />
-        </authors>
-    </properties>
-    <body>
-        <section name="Portal Overview">
-            <p>
-            The core portal components are:
-            <ul>
-            <li>The portal engine</li>
-            <li>The <a href="pipeline.html">request pipeline</a></li>
-            <li>The aggregation engine</li>
-            <li>The portlet container engine integration</li>
-            </ul>
-            </p>
-        </section>
-    </body>
-</document>
+    the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<document>
+    <properties>
+        <title>Jetspeed-2 Portal</title>
+        <authors>
+            <person name="David Le Strat" email="dlestrat@apache.org" />
+        </authors>
+    </properties>
+    <body>
+        <section name="Portal Overview">
+            <p>
+            The core portal components are:
+            <ul>
+            <li>The portal engine</li>
+            <li>The <a href="pipeline.html">request pipeline</a></li>
+            <li>The aggregation engine</li>
+            <li>The portlet container engine integration</li>
+            </ul>
+            </p>
+        </section>
+    </body>
+</document>

Propchange: portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-portal/index.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-portal/pipeline.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-portal/pipeline.xml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-portal/pipeline.xml (original)
+++ portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-portal/pipeline.xml Fri Dec 12 04:06:29 2008
@@ -1,88 +1,88 @@
-<?xml version="1.0" ?>
-<!--
+<?xml version="1.0" ?>
+<!--
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
     this work for additional information regarding copyright ownership.
     The ASF licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<document>
-    <properties>
-        <title>Jetspeed-2 Portal</title>
-        <authors>
-            <person name="David Le Strat" email="dlestrat@apache.org" />
-        </authors>
-    </properties>
-    <body>
-        <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/components/pipeline-c.gif" border="0"/><br/><br/>
-            <img src="../../images/components/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/components/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>
+    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 Portal</title>
+        <authors>
+            <person name="David Le Strat" email="dlestrat@apache.org" />
+        </authors>
+    </properties>
+    <body>
+        <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/components/pipeline-c.gif" border="0"/><br/><br/>
+            <img src="../../images/components/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/components/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/trunk/src/site/xdoc/components/jetspeed-portal/pipeline.xml
------------------------------------------------------------------------------
    svn:eol-style = native

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

Propchange: portals/jetspeed-2/portal/trunk/src/site/xdoc/components/jetspeed-rdbms/dao.xml
------------------------------------------------------------------------------
    svn:eol-style = native



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


Mime
View raw message