You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by sg...@apache.org on 2005/08/17 16:35:20 UTC

svn commit: r233183 [2/3] - in /portals/jetspeed-2: branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/layout/html/neat/ branches/SummersOfCode-2005/src/webapp/WEB-INF/decorations/portlet/html/neat/ trunk/components/prefs/xdocs/ trunk/component...

Modified: portals/jetspeed-2/trunk/components/security/xdocs/hierarchy.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/security/xdocs/hierarchy.xml?rev=233183&r1=233182&r2=233183&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/security/xdocs/hierarchy.xml (original)
+++ portals/jetspeed-2/trunk/components/security/xdocs/hierarchy.xml Wed Aug 17 07:33:31 2005
@@ -1,171 +1,171 @@
-<?xml version="1.0"?>
-<!--
-    Copyright 2004 The Apache Software Foundation
-    
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<document>
-    <properties>
-        <title>Jetspeed 2 Security - Hierarchy Management</title>
-        <authors>
-            <person name="David Le Strat" email="dlestrat@apache.org" />
-        </authors>
-    </properties>
-    <body>
-        <section name="Hierarchy Management Overview">
-            <p>
-                Two hierarchy resolution strategies are supported for authorization decisions:
-                <ul>
-                    <li>
-                        Hierarchy resolution by Generalization: This is the default hierarchy resolution in Jetspeed. If a hierarchy uses a generalization
-                        strategy, each role is more general than the previous one. For instance, if a user has the role [roleA.roleB.roleC] then
-                        <code>user.getSubject().getPrincipals()</code>
-                        returns:
-                        <ul>
-                            <li>/role/roleA</li>
-                            <li>/role/roleA/roleB</li>
-                            <li>/role/roleA/roleB/roleC</li>
-                        </ul>
-                    </li>
-                    <li>
-                        Hierarchy resolution by Aggregation: If a hierarchy uses a aggregation strategy, the higher role is responsible for a superset of the
-                        activities of the lower role. For instance, if the following roles are available:
-                        <ul>
-                            <li>roleA</li>
-                            <li>roleA.roleB</li>
-                            <li>roleA.roleB.roleC</li>
-                        </ul>
-                        If a user has the role [roleA] then,
-                        <code>user.getSubject().getPrincipals()</code>
-                        returns:
-                        <ul>
-                            <li>/role/roleA</li>
-                            <li>/role/roleA/roleB</li>
-                            <li>/role/roleA/roleB/roleC</li>
-                        </ul>
-                    </li>
-                </ul>
-            </p>
-            <p>
-                As described in the
-                <a href="atz-spi.html">authorization SPI section</a>
-                , the
-                <code>SecurityMappingHandler</code>
-                is configured with a specific hierarchy strategy for group and role hierarchy management. See the
-                <a href="config.html#security-spi-atz_xml">authorization SPI configuration</a>
-                for a configuration example.
-            </p>
-        </section>
-        <section name="Leveraging Preferences to Manage Hierarchies">
-            <p>
-                The default hierarchy management implementation resolves the hierarchy strategy by leveraging Jetspeed 2's
-                <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/prefs/Preferences.html">java.util.prefs.Preferences</a>
-                implementation. The
-                <code>Preferences</code>
-                implementation provides the underlying structure in Jetspeed to store user attributes, and roles and groups definitions. The
-                <code>Preferences</code>
-                model provides a hierarchy model that is leveraged to store the base roles and groups hierarchy upon which various resolving strategies can be
-                applied (resolution by generalization or aggregation).
-            </p>
-            <p>
-                See Jetspeed 2
-                <a href="../../multiproject/jetspeed-prefs/index.html">Preferences implementation section</a>
-                for more information.
-            </p>
-            <subsection name="How does this work?">
-                <p>
-                    The
-                    <code>SecurityMappingHandler</code>
-                    implementation resolves the mappings between roles and groups. Let's say that we want to find out the roles mapping to a specific group
-                    name. To do so, the
-                    <code>SecurityMappingHandler</code>
-                    implements a
-                    <code>getRolePrincipalsInGroup(String groupFullPathName)</code>
-                    method. In this method, the group name is mapped to a specific
-                    <code>Preferences</code>
-                    node. According to a given hierarchy resolution strategy (see
-                    <a href="#Hierarchy_Management_Overview">overview section</a>
-                    ), being in [group A] may mean belonging to a set of groups; the HierarchyResolver is used to do so as illustrated below:
-                    <source>
-                        <![CDATA[
-public Set getRolePrincipalsInGroup(String groupFullPathName)
-{
-   ...
-   Preferences preferences = Preferences.userRoot().node(
-       GroupPrincipalImpl.getFullPathFromPrincipalName(groupFullPathName));
-   String[] fullPaths = groupHierarchyResolver.resolve(preferences);
-   ...
-}]]>
-                    </source>
-                    The resulting groups are then used to find all associated roles.
-                </p>
-                <p>
-                    As a result of this implementation, the name of a role principal (<code>Principal</code> 
-                    <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/security/Principal.html#getName()">getName()</a>) 
-                    in the security layer should match the full path of that user preferences
-                    root in the preferences layer (<code>Preference</code> 
-                    <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/prefs/Preferences.html#absolutePath()">absolutePath()</a>; e.g:
-                    <code>/role/theRolePrincipal</code>
-                    ).
-                </p>
-                <p>
-                    Group and roles hierarchy are stored in the
-                    <code>Preferences</code>
-                    layer as follow (the output of <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/prefs/Preferences.html#exportNode(java.io.OutputStream)">
-                    exportNode()</a> for <a href="/multiprojectjetspeed-prefs/index.html">Jetspeed's RBMS Preferences</a> implementation):
-                    <source>
-                        <![CDATA[
-<preferences EXTERNAL_XML_VERSION="1.0">
-<root type="user">
-<map />
-    <node name="group1">
-    <map />
-        <node name="groupid1.1">
-        <map />
-	    <node name="groupid1.1.1">
-            <map />
-            </node>
-        </node>
-    </node>
-
-    <node name="role1">
-    <map />
-        <node name="roleid1.1">
-        <map />
-	    <node name="roleid1.1.1">
-            <map />
-            </node>
-        </node>
-    </node>
-</root>]]>
-                    </source>
-                    This structure would define the following group and role hierarchy:
-                    <ul>
-                        <li>
-                            <code>/group1/groupid1.1/groupid1.1.1</code>
-                        </li>
-                        <li>
-                            <code>/role1/roleid1.1/roleid1.1.1</code>
-                        </li>
-                    </ul>
-                    Additionally, in this model, the
-                    <code>map</code>
-                    element can define groups or roles custom properties. For instance, a role could have a rule custom property (or a pointer to a rule) that
-                    allow rule based role definition tied to some rule engine (Drools for instance) and is validated when the isInRole method is invoked. For
-                    groups, a portal could use group to describe organization and have custom property such as address, city, etc. associated with the
-                    organization/group.
-                </p>
-            </subsection>
-        </section>
-    </body>
+<?xml version="1.0"?>
+<!--
+    Copyright 2004 The Apache Software Foundation
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<document>
+    <properties>
+        <title>Jetspeed 2 Security - Hierarchy Management</title>
+        <authors>
+            <person name="David Le Strat" email="dlestrat@apache.org" />
+        </authors>
+    </properties>
+    <body>
+        <section name="Hierarchy Management Overview">
+            <p>
+                Two hierarchy resolution strategies are supported for authorization decisions:
+                <ul>
+                    <li>
+                        Hierarchy resolution by Generalization: This is the default hierarchy resolution in Jetspeed. If a hierarchy uses a generalization
+                        strategy, each role is more general than the previous one. For instance, if a user has the role [roleA.roleB.roleC] then
+                        <code>user.getSubject().getPrincipals()</code>
+                        returns:
+                        <ul>
+                            <li>/role/roleA</li>
+                            <li>/role/roleA/roleB</li>
+                            <li>/role/roleA/roleB/roleC</li>
+                        </ul>
+                    </li>
+                    <li>
+                        Hierarchy resolution by Aggregation: If a hierarchy uses a aggregation strategy, the higher role is responsible for a superset of the
+                        activities of the lower role. For instance, if the following roles are available:
+                        <ul>
+                            <li>roleA</li>
+                            <li>roleA.roleB</li>
+                            <li>roleA.roleB.roleC</li>
+                        </ul>
+                        If a user has the role [roleA] then,
+                        <code>user.getSubject().getPrincipals()</code>
+                        returns:
+                        <ul>
+                            <li>/role/roleA</li>
+                            <li>/role/roleA/roleB</li>
+                            <li>/role/roleA/roleB/roleC</li>
+                        </ul>
+                    </li>
+                </ul>
+            </p>
+            <p>
+                As described in the
+                <a href="atz-spi.html">authorization SPI section</a>
+                , the
+                <code>SecurityMappingHandler</code>
+                is configured with a specific hierarchy strategy for group and role hierarchy management. See the
+                <a href="config.html#security-spi-atz_xml">authorization SPI configuration</a>
+                for a configuration example.
+            </p>
+        </section>
+        <section name="Leveraging Preferences to Manage Hierarchies">
+            <p>
+                The default hierarchy management implementation resolves the hierarchy strategy by leveraging Jetspeed 2's
+                <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/prefs/Preferences.html">java.util.prefs.Preferences</a>
+                implementation. The
+                <code>Preferences</code>
+                implementation provides the underlying structure in Jetspeed to store user attributes, and roles and groups definitions. The
+                <code>Preferences</code>
+                model provides a hierarchy model that is leveraged to store the base roles and groups hierarchy upon which various resolving strategies can be
+                applied (resolution by generalization or aggregation).
+            </p>
+            <p>
+                See Jetspeed 2
+                <a href="../../multiproject/jetspeed-prefs/index.html">Preferences implementation section</a>
+                for more information.
+            </p>
+            <subsection name="How does this work?">
+                <p>
+                    The
+                    <code>SecurityMappingHandler</code>
+                    implementation resolves the mappings between roles and groups. Let's say that we want to find out the roles mapping to a specific group
+                    name. To do so, the
+                    <code>SecurityMappingHandler</code>
+                    implements a
+                    <code>getRolePrincipalsInGroup(String groupFullPathName)</code>
+                    method. In this method, the group name is mapped to a specific
+                    <code>Preferences</code>
+                    node. According to a given hierarchy resolution strategy (see
+                    <a href="#Hierarchy_Management_Overview">overview section</a>
+                    ), being in [group A] may mean belonging to a set of groups; the HierarchyResolver is used to do so as illustrated below:
+                    <source>
+                        <![CDATA[
+public Set getRolePrincipalsInGroup(String groupFullPathName)
+{
+   ...
+   Preferences preferences = Preferences.userRoot().node(
+       GroupPrincipalImpl.getFullPathFromPrincipalName(groupFullPathName));
+   String[] fullPaths = groupHierarchyResolver.resolve(preferences);
+   ...
+}]]>
+                    </source>
+                    The resulting groups are then used to find all associated roles.
+                </p>
+                <p>
+                    As a result of this implementation, the name of a role principal (<code>Principal</code> 
+                    <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/security/Principal.html#getName()">getName()</a>) 
+                    in the security layer should match the full path of that user preferences
+                    root in the preferences layer (<code>Preference</code> 
+                    <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/prefs/Preferences.html#absolutePath()">absolutePath()</a>; e.g:
+                    <code>/role/theRolePrincipal</code>
+                    ).
+                </p>
+                <p>
+                    Group and roles hierarchy are stored in the
+                    <code>Preferences</code>
+                    layer as follow (the output of <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/prefs/Preferences.html#exportNode(java.io.OutputStream)">
+                    exportNode()</a> for <a href="/multiprojectjetspeed-prefs/index.html">Jetspeed's RBMS Preferences</a> implementation):
+                    <source>
+                        <![CDATA[
+<preferences EXTERNAL_XML_VERSION="1.0">
+<root type="user">
+<map />
+    <node name="group1">
+    <map />
+        <node name="groupid1.1">
+        <map />
+	    <node name="groupid1.1.1">
+            <map />
+            </node>
+        </node>
+    </node>
+
+    <node name="role1">
+    <map />
+        <node name="roleid1.1">
+        <map />
+	    <node name="roleid1.1.1">
+            <map />
+            </node>
+        </node>
+    </node>
+</root>]]>
+                    </source>
+                    This structure would define the following group and role hierarchy:
+                    <ul>
+                        <li>
+                            <code>/group1/groupid1.1/groupid1.1.1</code>
+                        </li>
+                        <li>
+                            <code>/role1/roleid1.1/roleid1.1.1</code>
+                        </li>
+                    </ul>
+                    Additionally, in this model, the
+                    <code>map</code>
+                    element can define groups or roles custom properties. For instance, a role could have a rule custom property (or a pointer to a rule) that
+                    allow rule based role definition tied to some rule engine (Drools for instance) and is validated when the isInRole method is invoked. For
+                    groups, a portal could use group to describe organization and have custom property such as address, city, etc. associated with the
+                    organization/group.
+                </p>
+            </subsection>
+        </section>
+    </body>
 </document>

Propchange: portals/jetspeed-2/trunk/components/security/xdocs/hierarchy.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/trunk/components/security/xdocs/high-level-services.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/security/xdocs/high-level-services.xml?rev=233183&r1=233182&r2=233183&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/security/xdocs/high-level-services.xml (original)
+++ portals/jetspeed-2/trunk/components/security/xdocs/high-level-services.xml Wed Aug 17 07:33:31 2005
@@ -1,97 +1,97 @@
-<?xml version="1.0" ?>
-<!--
-    Copyright 2004 The Apache Software Foundation
-    
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<document>
-    <properties>
-        <title>Jetspeed 2 Security - High Level Security Services</title>
-    </properties>
-    <body>
-        <section name="High Level Security Services Overview">
-            <p>
-                Jetspeed 2 provides the four following high level security services:
-                <ul>
-                    <li>
-                        <code>UserManager</code>
-                        : Service providing user management capabilities.
-                    </li>
-                    <li>
-                        <code>GroupManager</code>
-                        : Service providing group management capabilities.
-                    </li>
-                    <li>
-                        <code>RoleManager</code>
-                        : Service providing role management capabilities.
-                    </li>
-                    <li>
-                        <code>PermissionManager</code>
-                        : Service providing permission management capabilities.
-                    </li>
-                </ul>
-            </p>
-        </section>
-        <section name="Using High Level Security Services in Portlets">
-            <p>
-                In order to access Jetspeed high level security services in your portlets, Jetspeed provide a custom
-                extension to the <code>portlet.xml</code> metadata.  All Jetspeed custom metadata is located in the 
-                <code>jetspeed-portlet.xml</code> configuration file in the <code>WEB-INF</code> folder of the portlet
-                application.  The custom <code>js:services</code> tag provides the ability to expose portal services
-                to a portlet through the <code>javax.portlet.PortletContext</code>.
-            </p>
-            <p>
-                Jetspeed portal services are configured in the spring assembly file located in the portal 
-                <code>WEB-INF/assembly/jetspeed-services</code> configuration file.  The UserManager for instance
-                is configured as follow:
-                <source><![CDATA[
-<!-- Portlet Services  -->
-<bean id="PortalServices" 
-  	 class="org.apache.jetspeed.services.JetspeedPortletServices" >
-   <constructor-arg>
-      <map>
-  	     ...
-  	     <entry key="UserManager">
-  	   	    <ref bean="org.apache.jetspeed.security.UserManager"/>
-  	   	 </entry>
-  	   	 ...
-      </map>
-   </constructor-arg>
-</bean>]]>
-                </source>
-            </p>
-            <p>
-                The <code>UserManager</code> services is then available to be loaded in a specific portlet
-                <code>PortletContext</code>.  Portlet developers need to specify the portal services they
-                would like to use.  The following example shows how to expose the portal <code>UserManager</code> 
-                to a portlet application:
-                <source><![CDATA[
-<js:services>
-   <js:service name='UserManager'/>
-</js:services>]]>
-                </source>   
-            </p>
-            <p>
-                Once a portal service is loaded in the portlet context, the portlet implementation (which typically
-                extends <code>javax.portlet.GenericPortlet</code>) can access the service as follow:
-                <source><![CDATA[
-PortletContext context = getPortletContext();
-userManager = (UserManager) context.getAttribute(CommonPortletServices.CPS_USER_MANAGER_COMPONENT);
-]]>
-                </source>
-                where <code>CommonPortletServices.CPS_USER_MANAGER_COMPONENT = "cps:UserManager"</code>
-            </p>
-        </section>
-    </body>
-</document>
-
+<?xml version="1.0" ?>
+<!--
+    Copyright 2004 The Apache Software Foundation
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<document>
+    <properties>
+        <title>Jetspeed 2 Security - High Level Security Services</title>
+    </properties>
+    <body>
+        <section name="High Level Security Services Overview">
+            <p>
+                Jetspeed 2 provides the four following high level security services:
+                <ul>
+                    <li>
+                        <code>UserManager</code>
+                        : Service providing user management capabilities.
+                    </li>
+                    <li>
+                        <code>GroupManager</code>
+                        : Service providing group management capabilities.
+                    </li>
+                    <li>
+                        <code>RoleManager</code>
+                        : Service providing role management capabilities.
+                    </li>
+                    <li>
+                        <code>PermissionManager</code>
+                        : Service providing permission management capabilities.
+                    </li>
+                </ul>
+            </p>
+        </section>
+        <section name="Using High Level Security Services in Portlets">
+            <p>
+                In order to access Jetspeed high level security services in your portlets, Jetspeed provide a custom
+                extension to the <code>portlet.xml</code> metadata.  All Jetspeed custom metadata is located in the 
+                <code>jetspeed-portlet.xml</code> configuration file in the <code>WEB-INF</code> folder of the portlet
+                application.  The custom <code>js:services</code> tag provides the ability to expose portal services
+                to a portlet through the <code>javax.portlet.PortletContext</code>.
+            </p>
+            <p>
+                Jetspeed portal services are configured in the spring assembly file located in the portal 
+                <code>WEB-INF/assembly/jetspeed-services</code> configuration file.  The UserManager for instance
+                is configured as follow:
+                <source><![CDATA[
+<!-- Portlet Services  -->
+<bean id="PortalServices" 
+  	 class="org.apache.jetspeed.services.JetspeedPortletServices" >
+   <constructor-arg>
+      <map>
+  	     ...
+  	     <entry key="UserManager">
+  	   	    <ref bean="org.apache.jetspeed.security.UserManager"/>
+  	   	 </entry>
+  	   	 ...
+      </map>
+   </constructor-arg>
+</bean>]]>
+                </source>
+            </p>
+            <p>
+                The <code>UserManager</code> services is then available to be loaded in a specific portlet
+                <code>PortletContext</code>.  Portlet developers need to specify the portal services they
+                would like to use.  The following example shows how to expose the portal <code>UserManager</code> 
+                to a portlet application:
+                <source><![CDATA[
+<js:services>
+   <js:service name='UserManager'/>
+</js:services>]]>
+                </source>   
+            </p>
+            <p>
+                Once a portal service is loaded in the portlet context, the portlet implementation (which typically
+                extends <code>javax.portlet.GenericPortlet</code>) can access the service as follow:
+                <source><![CDATA[
+PortletContext context = getPortletContext();
+userManager = (UserManager) context.getAttribute(CommonPortletServices.CPS_USER_MANAGER_COMPONENT);
+]]>
+                </source>
+                where <code>CommonPortletServices.CPS_USER_MANAGER_COMPONENT = "cps:UserManager"</code>
+            </p>
+        </section>
+    </body>
+</document>
+

Propchange: portals/jetspeed-2/trunk/components/security/xdocs/high-level-services.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/trunk/components/security/xdocs/login-module.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/security/xdocs/login-module.xml?rev=233183&r1=233182&r2=233183&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/security/xdocs/login-module.xml (original)
+++ portals/jetspeed-2/trunk/components/security/xdocs/login-module.xml Wed Aug 17 07:33:31 2005
@@ -1,154 +1,154 @@
-<?xml version="1.0"?>
-<!--
-    Copyright 2004 The Apache Software Foundation
-    
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<document>
-    <properties>
-        <title>Jetspeed 2 Security - Login Module</title>
-        <authors>
-            <person name="David Le Strat" email="dlestrat@apache.org" />
-        </authors>
-    </properties>
-    <body>
-        <section name="Login Module Overview">
-            <p>
-                For authentication purpose, Jetspeed 2 provide a default login module implementation. Login modules provide a standard way to expose
-                authentication services for java application. More information about login modules can be found in the JDK
-                <a href="http://java.sun.com/j2se/1.4.2/docs/api/javax/security/auth/spi/LoginModule.html">LoginModule interface</a>
-                documentation.
-            </p>
-        </section>
-        <section name="Login Module Configuration">
-            <p>
-                Configuration is central to JAAS authentication. By default, Jetspeed 2 is configured to use its
-                <code>DefaultLoginModule</code>
-                implementation. The configuration file (login.conf) for the login module ship with the
-                <code>jetspeed2-security-{version}.jar</code>
-                component and provide the following configuration:
-                <source>
-                    <![CDATA[
-Jetspeed {
-   org.apache.jetspeed.security.impl.DefaultLoginModule required;
-};]]>
-                </source>
-            </p>
-            <p>
-                In order to override this configuration, you can place your own login.conf file in your web application class path under WEB-INF/classes. The
-                location of the login.conf file is configured in the
-                <code>security-providers.xml</code>
-                as described below. For more information on how to configure the security providers, see
-                <a href="config.html">the configuration section</a>.
-            </p>
-            <p>
-                <source>
-                    <![CDATA[
-<!-- Security: Default Authentication Provider -->
-<bean id="org.apache.jetspeed.security.AuthenticationProvider" 
-  	  class="org.apache.jetspeed.security.impl.AuthenticationProviderImpl"
->  	   
-    <constructor-arg index="0"><value>DefaultAuthenticator</value></constructor-arg>
-  	<constructor-arg index="1"><value>The default authenticator</value></constructor-arg>
-  	<constructor-arg index="2"><value>login.conf</value></constructor-arg>
-  	<constructor-arg index="3">
-  	    <ref bean="org.apache.jetspeed.security.spi.CredentialHandler"/>
-  	</constructor-arg>
-  	<constructor-arg index="4">
-  	    <ref bean="org.apache.jetspeed.security.spi.UserSecurityHandler"/>
-    </constructor-arg>
-</bean>]]>
-                </source>
-            </p>
-            <p>
-                The <code>AuthenticationProvider</code> configures the <code>LoginModule</code> to be used by the
-                application by setting the System property <code>java.security.auth.login.config</code> to the 
-                <code>login.conf</code> specified in the component configuration.
-            </p>
-        </section>
-        <section name="Login Module Implementation">
-            <p>
-                The
-                <code>DefaultLoginModule</code>
-                implementation is illustrated by the class diagram below:
-                <br />
-            </p>
-            <table>
-                <tr>
-                    <td style="background-color:#FFFFFF;" align="center">
-                        <img src="images/default-login-module-c.gif" border="0" />
-                    </td>
-                </tr>
-            </table>
-            <p>
-                The roles of the classes used to implement the DefaultLoginModule are:
-            </p>
-            <table>
-                <tr>
-                    <th>Class</th>
-                    <th>Description</th>
-                </tr>
-                <tr>
-                    <td><code>org.apache.jetspeed.security.impl.DefaultLoginModule</code></td>
-                    <td>
-                        The
-                        <code>javax.security.auth.spi.LoginModule</code>
-                        implementation. The
-                        <code>DefaultLoginModule</code>
-                        authentication decision is encapsulated behind the
-                        <code>UserManager</code>
-                        interface which leverages the SPI implementation to decide which authenticator should be used in order to authenticate a user against a
-                        specific system of record. For more information on how to implement your own authenticator, see the
-                        <a href="atn-spi.html">authentication SPI documentation</a>.
-                    </td>
-                </tr>
-                <tr>
-                    <td><code>org.apache.jetspeed.security.LoginModuleProxy</code></td>
-                    <td>
-                        A utility component used to expose the
-                        <code>UserManager</code>
-                        to the
-                        <code>DefaultLoginModule</code>.
-                    </td>
-                </tr>
-                <tr>
-                    <td><code>org.apache.jetspeed.security.User</code></td>
-                    <td>
-                        The
-                        <code>User</code>
-                        is an interface that holds the
-                        <code>javax.security.auth.Subject</code>
-                        and his/her
-                        <code>java.util.prefs.Preferences</code>. The
-                        <code>UserManager</code>
-                        upon user authentication populates the user subject with all user
-                        <code>java.security.Principal</code>. Jetspeed 2 implements 3 types of principals:
-                        <ul>
-                            <li>UserPrincipal: The principal holding the user unique identifier for the application.</li>
-                            <li>RolePrincipal: The principal representing a role for the system.</li>
-                            <li>GroupPrincipal: The principal representing a group for the system.</li>
-                        </ul>
-                    </td>
-                </tr>
-                <tr>
-                    <td><code>org.apache.jetspeed.security.UserManager</code></td>
-                    <td>
-                        The interface exposing all user operations. This interfaces fronts the aggregates various SPI to provide developers with the ability to
-                        map users to their specific system of record.
-                    </td>
-                </tr>
-            </table>
-        </section>
-
-    </body>
+<?xml version="1.0"?>
+<!--
+    Copyright 2004 The Apache Software Foundation
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<document>
+    <properties>
+        <title>Jetspeed 2 Security - Login Module</title>
+        <authors>
+            <person name="David Le Strat" email="dlestrat@apache.org" />
+        </authors>
+    </properties>
+    <body>
+        <section name="Login Module Overview">
+            <p>
+                For authentication purpose, Jetspeed 2 provide a default login module implementation. Login modules provide a standard way to expose
+                authentication services for java application. More information about login modules can be found in the JDK
+                <a href="http://java.sun.com/j2se/1.4.2/docs/api/javax/security/auth/spi/LoginModule.html">LoginModule interface</a>
+                documentation.
+            </p>
+        </section>
+        <section name="Login Module Configuration">
+            <p>
+                Configuration is central to JAAS authentication. By default, Jetspeed 2 is configured to use its
+                <code>DefaultLoginModule</code>
+                implementation. The configuration file (login.conf) for the login module ship with the
+                <code>jetspeed2-security-{version}.jar</code>
+                component and provide the following configuration:
+                <source>
+                    <![CDATA[
+Jetspeed {
+   org.apache.jetspeed.security.impl.DefaultLoginModule required;
+};]]>
+                </source>
+            </p>
+            <p>
+                In order to override this configuration, you can place your own login.conf file in your web application class path under WEB-INF/classes. The
+                location of the login.conf file is configured in the
+                <code>security-providers.xml</code>
+                as described below. For more information on how to configure the security providers, see
+                <a href="config.html">the configuration section</a>.
+            </p>
+            <p>
+                <source>
+                    <![CDATA[
+<!-- Security: Default Authentication Provider -->
+<bean id="org.apache.jetspeed.security.AuthenticationProvider" 
+  	  class="org.apache.jetspeed.security.impl.AuthenticationProviderImpl"
+>  	   
+    <constructor-arg index="0"><value>DefaultAuthenticator</value></constructor-arg>
+  	<constructor-arg index="1"><value>The default authenticator</value></constructor-arg>
+  	<constructor-arg index="2"><value>login.conf</value></constructor-arg>
+  	<constructor-arg index="3">
+  	    <ref bean="org.apache.jetspeed.security.spi.CredentialHandler"/>
+  	</constructor-arg>
+  	<constructor-arg index="4">
+  	    <ref bean="org.apache.jetspeed.security.spi.UserSecurityHandler"/>
+    </constructor-arg>
+</bean>]]>
+                </source>
+            </p>
+            <p>
+                The <code>AuthenticationProvider</code> configures the <code>LoginModule</code> to be used by the
+                application by setting the System property <code>java.security.auth.login.config</code> to the 
+                <code>login.conf</code> specified in the component configuration.
+            </p>
+        </section>
+        <section name="Login Module Implementation">
+            <p>
+                The
+                <code>DefaultLoginModule</code>
+                implementation is illustrated by the class diagram below:
+                <br />
+            </p>
+            <table>
+                <tr>
+                    <td style="background-color:#FFFFFF;" align="center">
+                        <img src="images/default-login-module-c.gif" border="0" />
+                    </td>
+                </tr>
+            </table>
+            <p>
+                The roles of the classes used to implement the DefaultLoginModule are:
+            </p>
+            <table>
+                <tr>
+                    <th>Class</th>
+                    <th>Description</th>
+                </tr>
+                <tr>
+                    <td><code>org.apache.jetspeed.security.impl.DefaultLoginModule</code></td>
+                    <td>
+                        The
+                        <code>javax.security.auth.spi.LoginModule</code>
+                        implementation. The
+                        <code>DefaultLoginModule</code>
+                        authentication decision is encapsulated behind the
+                        <code>UserManager</code>
+                        interface which leverages the SPI implementation to decide which authenticator should be used in order to authenticate a user against a
+                        specific system of record. For more information on how to implement your own authenticator, see the
+                        <a href="atn-spi.html">authentication SPI documentation</a>.
+                    </td>
+                </tr>
+                <tr>
+                    <td><code>org.apache.jetspeed.security.LoginModuleProxy</code></td>
+                    <td>
+                        A utility component used to expose the
+                        <code>UserManager</code>
+                        to the
+                        <code>DefaultLoginModule</code>.
+                    </td>
+                </tr>
+                <tr>
+                    <td><code>org.apache.jetspeed.security.User</code></td>
+                    <td>
+                        The
+                        <code>User</code>
+                        is an interface that holds the
+                        <code>javax.security.auth.Subject</code>
+                        and his/her
+                        <code>java.util.prefs.Preferences</code>. The
+                        <code>UserManager</code>
+                        upon user authentication populates the user subject with all user
+                        <code>java.security.Principal</code>. Jetspeed 2 implements 3 types of principals:
+                        <ul>
+                            <li>UserPrincipal: The principal holding the user unique identifier for the application.</li>
+                            <li>RolePrincipal: The principal representing a role for the system.</li>
+                            <li>GroupPrincipal: The principal representing a group for the system.</li>
+                        </ul>
+                    </td>
+                </tr>
+                <tr>
+                    <td><code>org.apache.jetspeed.security.UserManager</code></td>
+                    <td>
+                        The interface exposing all user operations. This interfaces fronts the aggregates various SPI to provide developers with the ability to
+                        map users to their specific system of record.
+                    </td>
+                </tr>
+            </table>
+        </section>
+
+    </body>
 </document>

Propchange: portals/jetspeed-2/trunk/components/security/xdocs/login-module.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/trunk/components/security/xdocs/permission.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/security/xdocs/permission.xml?rev=233183&r1=233182&r2=233183&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/security/xdocs/permission.xml (original)
+++ portals/jetspeed-2/trunk/components/security/xdocs/permission.xml Wed Aug 17 07:33:31 2005
@@ -1,80 +1,80 @@
-<?xml version="1.0"?>
-<!--
-    Copyright 2004 The Apache Software Foundation
-    
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<document>
-    <properties>
-        <title>Jetspeed 2 Security - PermissionManager Overview</title>
-        <authors>
-            <person name="David Le Strat" email="dlestrat@apache.org" />
-        </authors>
-    </properties>
-    <body>
-        <section name="PermissionManager Overview">
-            <p>The <code>PermissionManager</code> is used by the <code>RdbmsPolicy</code> to get the permissions for
-            a given user principals as presented 
-            in the <a href="atz-jaas.html#Jetspeed_JAAS_Policy">Jetspeed JAAS Policy</a> section of the documentation.
-            </p>
-            <p>
-            The <code>PermissionManager</code> manages the association between permissions and principals.  Each permission
-            or  principal maps to a generic object model and reflexion is used to instantiate the proper permission or
-            principal type.  The class diagram below represents the interfaces representing a generic permission 
-            (<code>InternalPermission</code>) and a generic principal (<code>InternalPrincipal</code>) and their relation
-            to the <code>PermissionManager</code>.
-            </p>
-            <p>
-            <img src="images/permission-mgr-c.gif" border="0" />
-            </p>
-            <p>
-            Each <code>InternalPermission</code> maps to one or more <code>InternalPrincipal</code> and, each 
-            <code>InternalPrincipal</code> can have one or more <code>InternalPermission</code>.
-            </p>
-            <p>
-            <img src="images/permissions-principals-om-c.gif" border="0" />
-            </p>
-        </section>
-        <section name="Schema and OJB Mapping">
-            <p>
-            The OJB mappings for the security component are described in <code>security_repository.xml</code>:
-            <ul>
-            <li><code>InternalPrincipal</code>: Maps to the <code>SECURITY_PRINCIPAL</code> table.</li>
-            <li><code>InternalPermission</code>: Maps to the <code>SECURITY_PERMISSION</code> table.</li>
-            <li>Associations between <code>InternalPrincipal</code> and <code>InternalPermission</code> are
-            maintained through the indirection table <code>PRINCIPAL_PERMISSION</code>.</li>
-            </ul>
-            <source><![CDATA[
-<class-descriptor
-	    class="org.apache.jetspeed.security.om.impl.InternalPrincipalImpl"
-	    proxy="dynamic"
-	    table="SECURITY_PRINCIPAL"
-	>...</class-descriptor>
-	
-<class-descriptor
-	    class="org.apache.jetspeed.security.om.impl.InternalPermissionImpl"
-	    proxy="dynamic"
-	    table="SECURITY_PERMISSION"
-	>...</class-descriptor>      
-            ]]>
-            </source>
-            </p>
-            <p>
-            The relational schema maintaining principal to permission associations is provided below:
-            </p>
-            <p>
-            <img src="images/permissions-principals-schema.gif" border="0" />
-            </p>
-        </section>
-    </body>
+<?xml version="1.0"?>
+<!--
+    Copyright 2004 The Apache Software Foundation
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<document>
+    <properties>
+        <title>Jetspeed 2 Security - PermissionManager Overview</title>
+        <authors>
+            <person name="David Le Strat" email="dlestrat@apache.org" />
+        </authors>
+    </properties>
+    <body>
+        <section name="PermissionManager Overview">
+            <p>The <code>PermissionManager</code> is used by the <code>RdbmsPolicy</code> to get the permissions for
+            a given user principals as presented 
+            in the <a href="atz-jaas.html#Jetspeed_JAAS_Policy">Jetspeed JAAS Policy</a> section of the documentation.
+            </p>
+            <p>
+            The <code>PermissionManager</code> manages the association between permissions and principals.  Each permission
+            or  principal maps to a generic object model and reflexion is used to instantiate the proper permission or
+            principal type.  The class diagram below represents the interfaces representing a generic permission 
+            (<code>InternalPermission</code>) and a generic principal (<code>InternalPrincipal</code>) and their relation
+            to the <code>PermissionManager</code>.
+            </p>
+            <p>
+            <img src="images/permission-mgr-c.gif" border="0" />
+            </p>
+            <p>
+            Each <code>InternalPermission</code> maps to one or more <code>InternalPrincipal</code> and, each 
+            <code>InternalPrincipal</code> can have one or more <code>InternalPermission</code>.
+            </p>
+            <p>
+            <img src="images/permissions-principals-om-c.gif" border="0" />
+            </p>
+        </section>
+        <section name="Schema and OJB Mapping">
+            <p>
+            The OJB mappings for the security component are described in <code>security_repository.xml</code>:
+            <ul>
+            <li><code>InternalPrincipal</code>: Maps to the <code>SECURITY_PRINCIPAL</code> table.</li>
+            <li><code>InternalPermission</code>: Maps to the <code>SECURITY_PERMISSION</code> table.</li>
+            <li>Associations between <code>InternalPrincipal</code> and <code>InternalPermission</code> are
+            maintained through the indirection table <code>PRINCIPAL_PERMISSION</code>.</li>
+            </ul>
+            <source><![CDATA[
+<class-descriptor
+	    class="org.apache.jetspeed.security.om.impl.InternalPrincipalImpl"
+	    proxy="dynamic"
+	    table="SECURITY_PRINCIPAL"
+	>...</class-descriptor>
+	
+<class-descriptor
+	    class="org.apache.jetspeed.security.om.impl.InternalPermissionImpl"
+	    proxy="dynamic"
+	    table="SECURITY_PERMISSION"
+	>...</class-descriptor>      
+            ]]>
+            </source>
+            </p>
+            <p>
+            The relational schema maintaining principal to permission associations is provided below:
+            </p>
+            <p>
+            <img src="images/permissions-principals-schema.gif" border="0" />
+            </p>
+        </section>
+    </body>
 </document>

Propchange: portals/jetspeed-2/trunk/components/security/xdocs/permission.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/ajax.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/ajax.xml?rev=233183&r1=233182&r2=233183&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/ajax.xml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/ajax.xml Wed Aug 17 07:33:31 2005
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<beans>
-  <bean id="AJAXService"
-      class="org.apache.jetspeed.ajax.AJAXServiceImpl">
-    <constructor-arg>
-      <map>
-		<entry key="portletRegistry.getPortletApplications">
-			<value>
-			  org.apache.jetspeed.components.portletregistry.PortletRegistry	
-			</value>
-		</entry>
-		<entry key="portletRegistry.getPortletApplication">
-			<value>
-			  org.apache.jetspeed.components.portletregistry.PortletRegistry	
-			</value>
-		</entry>
-		<entry key="entityAccess.getPortletEntities">
-			<value>
-			  org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent
-			</value>
-		</entry>
-		<entry key="entityAccess.getPortletEntity">
-			<value>
-			  org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent
-			</value>
-		</entry>
-	  </map>
-    </constructor-arg>
-  </bean>  
-	
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<beans>
+  <bean id="AJAXService"
+      class="org.apache.jetspeed.ajax.AJAXServiceImpl">
+    <constructor-arg>
+      <map>
+		<entry key="portletRegistry.getPortletApplications">
+			<value>
+			  org.apache.jetspeed.components.portletregistry.PortletRegistry	
+			</value>
+		</entry>
+		<entry key="portletRegistry.getPortletApplication">
+			<value>
+			  org.apache.jetspeed.components.portletregistry.PortletRegistry	
+			</value>
+		</entry>
+		<entry key="entityAccess.getPortletEntities">
+			<value>
+			  org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent
+			</value>
+		</entry>
+		<entry key="entityAccess.getPortletEntity">
+			<value>
+			  org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent
+			</value>
+		</entry>
+	  </map>
+    </constructor-arg>
+  </bean>  
+	
 </beans>

Propchange: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/ajax.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/capabilities.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/capabilities.xml?rev=233183&r1=233182&r2=233183&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/capabilities.xml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/capabilities.xml Wed Aug 17 07:33:31 2005
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
-    Copyright 2004 The Apache Software Foundation
-    
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<beans>
-
-    <!-- Capabilities DAO-->
-    <bean id="capabilitiesImpl" class="org.apache.jetspeed.capabilities.impl.JetspeedCapabilities" init-method="init">
-        <constructor-arg>
-            <value>JETSPEED-INF/ojb/capabilities_repository.xml</value>
-        </constructor-arg>
-    </bean>
-
-    <!-- Capabilities -->
-    <bean id="org.apache.jetspeed.capabilities.Capabilities" name="capabilities" parent="baseTransactionProxy">
-        <property name="proxyInterfaces">
-            <value>org.apache.jetspeed.capabilities.Capabilities</value>
-        </property>
-        <property name="target">
-            <ref bean="capabilitiesImpl" />
-        </property>
-        <property name="transactionAttributes">
-            <props>
-                <prop key="*">PROPAGATION_SUPPORTS</prop>
-            </props>
-        </property>
-    </bean>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+    Copyright 2004 The Apache Software Foundation
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<beans>
+
+    <!-- Capabilities DAO-->
+    <bean id="capabilitiesImpl" class="org.apache.jetspeed.capabilities.impl.JetspeedCapabilities" init-method="init">
+        <constructor-arg>
+            <value>JETSPEED-INF/ojb/capabilities_repository.xml</value>
+        </constructor-arg>
+    </bean>
+
+    <!-- Capabilities -->
+    <bean id="org.apache.jetspeed.capabilities.Capabilities" name="capabilities" parent="baseTransactionProxy">
+        <property name="proxyInterfaces">
+            <value>org.apache.jetspeed.capabilities.Capabilities</value>
+        </property>
+        <property name="target">
+            <ref bean="capabilitiesImpl" />
+        </property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="*">PROPAGATION_SUPPORTS</prop>
+            </props>
+        </property>
+    </bean>
+
 </beans>

Propchange: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/capabilities.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/prefs.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/prefs.xml?rev=233183&r1=233182&r2=233183&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/prefs.xml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/prefs.xml Wed Aug 17 07:33:31 2005
@@ -1,82 +1,82 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
-    Copyright 2004 The Apache Software Foundation
-    
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<beans>
-
-    <!-- Preferences Implementation -->
-    <bean id="PreferencesProviderImpl" class="org.apache.jetspeed.prefs.impl.PersistenceBrokerPreferencesProvider" name="prefsPersistenceBroker" init-method="init">
-        <constructor-arg index="0">
-            <value>JETSPEED-INF/ojb/prefs_repository.xml</value>
-        </constructor-arg>
-        <constructor-arg type="boolean" index="1">
-            <value>false</value>
-        </constructor-arg>
-    </bean>
-
-    <bean id="org.apache.jetspeed.prefs.PreferencesProvider" parent="baseTransactionProxy" name="prefsProvider">
-        <property name="proxyInterfaces">
-            <value>org.apache.jetspeed.prefs.PreferencesProvider</value>
-        </property>
-
-        <property name="target">
-            <ref bean="PreferencesProviderImpl" />
-        </property>
-        <property name="transactionAttributes">
-            <props>
-                <prop key="createNode*">PROPAGATION_REQUIRED</prop>
-                <prop key="storeNode*">PROPAGATION_REQUIRED</prop>
-                <prop key="removeNode*">PROPAGATION_REQUIRED</prop>
-                <prop key="*">PROPAGATION_SUPPORTS</prop>
-            </props>
-        </property>
-    </bean>
-
-    <!-- PreferencesFactory implementation -->
-    <bean id="java.util.prefs.PreferencesFactory" class="org.apache.jetspeed.prefs.impl.PreferencesFactoryImpl" name="prefsFactory" init-method="init">
-        <property name="prefsProvider">
-            <ref bean="prefsProvider" />
-        </property>
-    </bean>
-
-    <!-- Property Manager -->
-    <bean id="PropertyManagerImpl" class="org.apache.jetspeed.prefs.impl.PropertyManagerImpl">
-        <!-- We don't use the Tx proxied prefs provider so that we can demarcate Txs
-            exclusively for the PropertyManager -->
-        <constructor-arg>
-            <ref bean="PreferencesProviderImpl" />
-        </constructor-arg>
-    </bean>
-
-
-    <bean id="org.apache.jetspeed.prefs.PropertyManager" parent="baseTransactionProxy" name="propertyManager">
-        <property name="proxyInterfaces">
-            <value>org.apache.jetspeed.prefs.PropertyManager</value>
-        </property>
-
-        <property name="target">
-            <ref bean="PropertyManagerImpl" />
-        </property>
-        <property name="transactionAttributes">
-            <props>
-                <prop key="add*">PROPAGATION_REQUIRED</prop>
-                <prop key="remove*">PROPAGATION_REQUIRED</prop>
-                <prop key="update*">PROPAGATION_REQUIRED</prop>
-                <prop key="*">PROPAGATION_SUPPORTS</prop>
-            </props>
-        </property>
-    </bean>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+    Copyright 2004 The Apache Software Foundation
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<beans>
+
+    <!-- Preferences Implementation -->
+    <bean id="PreferencesProviderImpl" class="org.apache.jetspeed.prefs.impl.PersistenceBrokerPreferencesProvider" name="prefsPersistenceBroker" init-method="init">
+        <constructor-arg index="0">
+            <value>JETSPEED-INF/ojb/prefs_repository.xml</value>
+        </constructor-arg>
+        <constructor-arg type="boolean" index="1">
+            <value>false</value>
+        </constructor-arg>
+    </bean>
+
+    <bean id="org.apache.jetspeed.prefs.PreferencesProvider" parent="baseTransactionProxy" name="prefsProvider">
+        <property name="proxyInterfaces">
+            <value>org.apache.jetspeed.prefs.PreferencesProvider</value>
+        </property>
+
+        <property name="target">
+            <ref bean="PreferencesProviderImpl" />
+        </property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="createNode*">PROPAGATION_REQUIRED</prop>
+                <prop key="storeNode*">PROPAGATION_REQUIRED</prop>
+                <prop key="removeNode*">PROPAGATION_REQUIRED</prop>
+                <prop key="*">PROPAGATION_SUPPORTS</prop>
+            </props>
+        </property>
+    </bean>
+
+    <!-- PreferencesFactory implementation -->
+    <bean id="java.util.prefs.PreferencesFactory" class="org.apache.jetspeed.prefs.impl.PreferencesFactoryImpl" name="prefsFactory" init-method="init">
+        <property name="prefsProvider">
+            <ref bean="prefsProvider" />
+        </property>
+    </bean>
+
+    <!-- Property Manager -->
+    <bean id="PropertyManagerImpl" class="org.apache.jetspeed.prefs.impl.PropertyManagerImpl">
+        <!-- We don't use the Tx proxied prefs provider so that we can demarcate Txs
+            exclusively for the PropertyManager -->
+        <constructor-arg>
+            <ref bean="PreferencesProviderImpl" />
+        </constructor-arg>
+    </bean>
+
+
+    <bean id="org.apache.jetspeed.prefs.PropertyManager" parent="baseTransactionProxy" name="propertyManager">
+        <property name="proxyInterfaces">
+            <value>org.apache.jetspeed.prefs.PropertyManager</value>
+        </property>
+
+        <property name="target">
+            <ref bean="PropertyManagerImpl" />
+        </property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="add*">PROPAGATION_REQUIRED</prop>
+                <prop key="remove*">PROPAGATION_REQUIRED</prop>
+                <prop key="update*">PROPAGATION_REQUIRED</prop>
+                <prop key="*">PROPAGATION_SUPPORTS</prop>
+            </props>
+        </property>
+    </bean>
 </beans>

Propchange: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/prefs.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/profiler.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/profiler.xml?rev=233183&r1=233182&r2=233183&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/profiler.xml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/profiler.xml Wed Aug 17 07:33:31 2005
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
-    Copyright 2004 The Apache Software Foundation
-    
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<beans>
-    <!-- Profiler -->
-    <bean id="profilerImpl" class="org.apache.jetspeed.profiler.impl.JetspeedProfilerImpl" name="profilerImpl" init-method="init">
-        <constructor-arg index="0">
-            <value>JETSPEED-INF/ojb/profiler_repository.xml</value>
-        </constructor-arg>
-        <constructor-arg index="1">
-            <value>j2</value>
-        </constructor-arg>
-    </bean>
-
-    <bean id="org.apache.jetspeed.profiler.Profiler" name="profiler" parent="baseTransactionProxy">
-        <property name="proxyInterfaces">
-            <value>org.apache.jetspeed.profiler.Profiler</value>
-        </property>
-        <property name="target">
-            <ref bean="profilerImpl" />
-        </property>
-        <property name="transactionAttributes">
-            <props>
-                <prop key="setRuleForPrincipal">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.profiler.ProfilerException</prop>
-                <prop key="store*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.profiler.ProfilerException</prop>
-                <prop key="delete*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.profiler.ProfilerException</prop>
-                <prop key="*">PROPAGATION_SUPPORTS</prop>
-            </props>
-        </property>
-    </bean>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+    Copyright 2004 The Apache Software Foundation
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<beans>
+    <!-- Profiler -->
+    <bean id="profilerImpl" class="org.apache.jetspeed.profiler.impl.JetspeedProfilerImpl" name="profilerImpl" init-method="init">
+        <constructor-arg index="0">
+            <value>JETSPEED-INF/ojb/profiler_repository.xml</value>
+        </constructor-arg>
+        <constructor-arg index="1">
+            <value>j2</value>
+        </constructor-arg>
+    </bean>
+
+    <bean id="org.apache.jetspeed.profiler.Profiler" name="profiler" parent="baseTransactionProxy">
+        <property name="proxyInterfaces">
+            <value>org.apache.jetspeed.profiler.Profiler</value>
+        </property>
+        <property name="target">
+            <ref bean="profilerImpl" />
+        </property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="setRuleForPrincipal">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.profiler.ProfilerException</prop>
+                <prop key="store*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.profiler.ProfilerException</prop>
+                <prop key="delete*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.profiler.ProfilerException</prop>
+                <prop key="*">PROPAGATION_SUPPORTS</prop>
+            </props>
+        </property>
+    </bean>
 </beans>

Propchange: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/profiler.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/registry.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/registry.xml?rev=233183&r1=233182&r2=233183&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/registry.xml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/registry.xml Wed Aug 17 07:33:31 2005
@@ -1,128 +1,128 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
-    Copyright 2004 The Apache Software Foundation
-    
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<beans>
-
-    <!-- Portlet Factory -->
-    <bean id="portletFactory" class="org.apache.jetspeed.factory.JetspeedPortletFactory"></bean>
-
-    <!-- Portlet Registry DAO-->
-    <bean id="portletRegistryImpl" class="org.apache.jetspeed.components.portletregistry.PersistenceBrokerPortletRegistry" init-method="init">
-
-        <constructor-arg index="0">
-            <value>JETSPEED-INF/ojb/registry_repository.xml</value>
-        </constructor-arg>
-        <constructor-arg index="1">
-            <ref bean="portletFactory" />
-        </constructor-arg>
-    </bean>
-
-    <bean id="org.apache.jetspeed.components.portletregistry.PortletRegistry" name="portletRegistry" parent="baseTransactionProxy">
-        <property name="proxyInterfaces">
-            <value>org.apache.jetspeed.components.portletregistry.PortletRegistry</value>
-        </property>
-
-        <property name="target">
-            <ref bean="portletRegistryImpl" />
-        </property>
-        <property name="transactionAttributes">
-            <props>
-                <prop key="register*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
-                <prop key="remove*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
-                <prop key="update*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
-                <prop key="save*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
-                <prop key="*">PROPAGATION_SUPPORTS</prop>
-            </props>
-        </property>
-    </bean>
-
-    <!-- Portlet Entity Access DAO-->
-    <!--
-        <bean id="systemCache" class="org.apache.jetspeed.cache.general.SimpleHashMapCache" />
-        
-        <bean id="systemCachingInterceptor" class="org.apache.jetspeed.components.interceptors.CachingInterceptor" >
-        <constructor-arg>
-        <ref bean="systemCache"/>
-        </constructor-arg>
-        </bean>
-        
-        <bean id="systemRemoveFromCacheInterceptor" class="org.apache.jetspeed.components.interceptors.RemoveFromCacheInterceptor" >
-        <constructor-arg>
-        <ref bean="systemCache"/>
-        </constructor-arg>
-        </bean>   	
-        
-        <bean id="portletEntityCachingAdvisor" class="org.springframework.aop.support.RegexpMethodPointcutAdvisor">
-        <property name="advice">
-        <ref bean="systemCachingInterceptor"/>
-        </property>
-        <property name="patterns">
-        <list>
-        <value>.*getPortletEntity.*</value>
-        </list>
-        </property>
-        </bean>
-        
-        <bean id="portletEntityRemoveFromCacheAdvisor" class="org.springframework.aop.support.RegexpMethodPointcutAdvisor">
-        <property name="advice">
-        <ref bean="systemRemoveFromCacheInterceptor"/>
-        </property>
-        <property name="patterns">
-        <list>
-        <value>.*removePortletEntity.*</value>
-        </list>
-        </property>
-        </bean>
-        
-    -->
-    <!--
-        - PortletEntity business object: OJB implementation, as an inner bean wrapped
-        - by an outer transactional proxy. The two bean definitions could have been separate,
-        - but this is cleaner as there is no need to ever access the unwrapped object.
-    -->
-
-    <bean id="portletEntityAccessImpl" class="org.apache.jetspeed.components.portletentity.PersistenceBrokerPortletEntityAccess"
-        name="portletEntityAccessImpl">
-        <constructor-arg>
-            <ref bean="portletRegistry" />
-        </constructor-arg>
-    </bean>
-
-    <bean id="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent" parent="baseTransactionProxy" name="portletEntityAccess">
-        <property name="proxyInterfaces">
-            <value>org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent</value>
-        </property>
-        <property name="target">
-            <ref bean="portletEntityAccessImpl" />
-        </property>
-        <!--
-            <property name="preInterceptors">
-            <list>
-            <ref bean="portletEntityCachingAdvisor"/>
-            <ref bean="portletEntityRemoveFromCacheAdvisor"/>
-            </list>
-            </property>
-        -->
-        <property name="transactionAttributes">
-            <props>
-                <prop key="remove*">PROPAGATION_REQUIRED</prop>
-                <prop key="store*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletentity.PortletEntityNotStoredException</prop>
-                <prop key="*">PROPAGATION_SUPPORTS</prop>
-            </props>
-        </property>
-    </bean>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+    Copyright 2004 The Apache Software Foundation
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<beans>
+
+    <!-- Portlet Factory -->
+    <bean id="portletFactory" class="org.apache.jetspeed.factory.JetspeedPortletFactory"></bean>
+
+    <!-- Portlet Registry DAO-->
+    <bean id="portletRegistryImpl" class="org.apache.jetspeed.components.portletregistry.PersistenceBrokerPortletRegistry" init-method="init">
+
+        <constructor-arg index="0">
+            <value>JETSPEED-INF/ojb/registry_repository.xml</value>
+        </constructor-arg>
+        <constructor-arg index="1">
+            <ref bean="portletFactory" />
+        </constructor-arg>
+    </bean>
+
+    <bean id="org.apache.jetspeed.components.portletregistry.PortletRegistry" name="portletRegistry" parent="baseTransactionProxy">
+        <property name="proxyInterfaces">
+            <value>org.apache.jetspeed.components.portletregistry.PortletRegistry</value>
+        </property>
+
+        <property name="target">
+            <ref bean="portletRegistryImpl" />
+        </property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="register*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
+                <prop key="remove*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
+                <prop key="update*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
+                <prop key="save*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
+                <prop key="*">PROPAGATION_SUPPORTS</prop>
+            </props>
+        </property>
+    </bean>
+
+    <!-- Portlet Entity Access DAO-->
+    <!--
+        <bean id="systemCache" class="org.apache.jetspeed.cache.general.SimpleHashMapCache" />
+        
+        <bean id="systemCachingInterceptor" class="org.apache.jetspeed.components.interceptors.CachingInterceptor" >
+        <constructor-arg>
+        <ref bean="systemCache"/>
+        </constructor-arg>
+        </bean>
+        
+        <bean id="systemRemoveFromCacheInterceptor" class="org.apache.jetspeed.components.interceptors.RemoveFromCacheInterceptor" >
+        <constructor-arg>
+        <ref bean="systemCache"/>
+        </constructor-arg>
+        </bean>   	
+        
+        <bean id="portletEntityCachingAdvisor" class="org.springframework.aop.support.RegexpMethodPointcutAdvisor">
+        <property name="advice">
+        <ref bean="systemCachingInterceptor"/>
+        </property>
+        <property name="patterns">
+        <list>
+        <value>.*getPortletEntity.*</value>
+        </list>
+        </property>
+        </bean>
+        
+        <bean id="portletEntityRemoveFromCacheAdvisor" class="org.springframework.aop.support.RegexpMethodPointcutAdvisor">
+        <property name="advice">
+        <ref bean="systemRemoveFromCacheInterceptor"/>
+        </property>
+        <property name="patterns">
+        <list>
+        <value>.*removePortletEntity.*</value>
+        </list>
+        </property>
+        </bean>
+        
+    -->
+    <!--
+        - PortletEntity business object: OJB implementation, as an inner bean wrapped
+        - by an outer transactional proxy. The two bean definitions could have been separate,
+        - but this is cleaner as there is no need to ever access the unwrapped object.
+    -->
+
+    <bean id="portletEntityAccessImpl" class="org.apache.jetspeed.components.portletentity.PersistenceBrokerPortletEntityAccess"
+        name="portletEntityAccessImpl">
+        <constructor-arg>
+            <ref bean="portletRegistry" />
+        </constructor-arg>
+    </bean>
+
+    <bean id="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent" parent="baseTransactionProxy" name="portletEntityAccess">
+        <property name="proxyInterfaces">
+            <value>org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent</value>
+        </property>
+        <property name="target">
+            <ref bean="portletEntityAccessImpl" />
+        </property>
+        <!--
+            <property name="preInterceptors">
+            <list>
+            <ref bean="portletEntityCachingAdvisor"/>
+            <ref bean="portletEntityRemoveFromCacheAdvisor"/>
+            </list>
+            </property>
+        -->
+        <property name="transactionAttributes">
+            <props>
+                <prop key="remove*">PROPAGATION_REQUIRED</prop>
+                <prop key="store*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletentity.PortletEntityNotStoredException</prop>
+                <prop key="*">PROPAGATION_SUPPORTS</prop>
+            </props>
+        </property>
+    </bean>
 </beans>

Propchange: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/registry.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/sso.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/sso.xml?rev=233183&r1=233182&r2=233183&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/sso.xml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/sso.xml Wed Aug 17 07:33:31 2005
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
-    Copyright 2004 The Apache Software Foundation
-    
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<beans>
-    <!-- SSO Implementation -->
-    <bean id="PersistenceBrokerSSOProvider" class="org.apache.jetspeed.sso.impl.PersistenceBrokerSSOProvider" init-method="init">
-        <constructor-arg index="0">
-            <value>JETSPEED-INF/ojb/sso_repository.xml</value>
-        </constructor-arg>
-    </bean>
-
-    <bean id="org.apache.jetspeed.sso.SSOProvider" parent="baseTransactionProxy" name="ssoProvider">
-        <property name="proxyInterfaces">
-            <value>org.apache.jetspeed.sso.SSOProvider</value>
-        </property>
-
-        <property name="target">
-            <ref bean="PersistenceBrokerSSOProvider" />
-        </property>
-        <property name="transactionAttributes">
-            <props>
-                <prop key="addSite">PROPAGATION_REQUIRED</prop>
-                <prop key="removeSite">PROPAGATION_REQUIRED</prop>
-                <prop key="addCredentialsForSite">PROPAGATION_REQUIRED</prop>
-                <prop key="updateCredentialsForSite">PROPAGATION_REQUIRED</prop>
-                <prop key="removeCredentialsForSite">PROPAGATION_REQUIRED</prop>
-                <prop key="*">PROPAGATION_SUPPORTS</prop>
-            </props>
-        </property>
-
-    </bean>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+    Copyright 2004 The Apache Software Foundation
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<beans>
+    <!-- SSO Implementation -->
+    <bean id="PersistenceBrokerSSOProvider" class="org.apache.jetspeed.sso.impl.PersistenceBrokerSSOProvider" init-method="init">
+        <constructor-arg index="0">
+            <value>JETSPEED-INF/ojb/sso_repository.xml</value>
+        </constructor-arg>
+    </bean>
+
+    <bean id="org.apache.jetspeed.sso.SSOProvider" parent="baseTransactionProxy" name="ssoProvider">
+        <property name="proxyInterfaces">
+            <value>org.apache.jetspeed.sso.SSOProvider</value>
+        </property>
+
+        <property name="target">
+            <ref bean="PersistenceBrokerSSOProvider" />
+        </property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="addSite">PROPAGATION_REQUIRED</prop>
+                <prop key="removeSite">PROPAGATION_REQUIRED</prop>
+                <prop key="addCredentialsForSite">PROPAGATION_REQUIRED</prop>
+                <prop key="updateCredentialsForSite">PROPAGATION_REQUIRED</prop>
+                <prop key="removeCredentialsForSite">PROPAGATION_REQUIRED</prop>
+                <prop key="*">PROPAGATION_SUPPORTS</prop>
+            </props>
+        </property>
+
+    </bean>
 </beans>

Propchange: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/sso.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