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 rw...@apache.org on 2009/04/16 07:19:06 UTC

svn commit: r765465 [3/3] - in /portals/jetspeed-2/portal/trunk: components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/ components/jetspeed-cm/src/test/java/org/apache/jetspeed/components/ components/jetspeed-portal-site/src/test/resource...

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/sso.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/sso.xml?rev=765465&r1=765464&r2=765465&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/sso.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/sso.xml Thu Apr 16 05:19:05 2009
@@ -22,7 +22,7 @@
   <!-- SSO Implementation -->
 
   <bean id="org.apache.jetspeed.sso.spi.impl.SSOUserManagerSPIImpl" class="org.apache.jetspeed.sso.spi.impl.SSOUserManagerSPIImpl">
-      <meta key="j2:cat" value="default,security" />
+      <meta key="j2:cat" value="default or security" />
       <constructor-arg index="0" ref="org.apache.jetspeed.security.JetspeedPrincipalType.sso_user" />
       <constructor-arg index="1" ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
       <constructor-arg index="2" ref="org.apache.jetspeed.security.spi.JetspeedPrincipalStorageManager" />
@@ -34,7 +34,7 @@
     
   <bean id="org.apache.jetspeed.security.JetspeedPrincipalType.sso_user"
     class="org.apache.jetspeed.security.impl.JetspeedPrincipalTypeImpl">
-    <meta key="j2:cat" value="default,security" />
+    <meta key="j2:cat" value="default or security" />
     <constructor-arg index="0" value="sso_user" />
     <constructor-arg index="1" value="org.apache.jetspeed.sso.impl.SSOUserImpl" />
     <constructor-arg index="2">
@@ -74,7 +74,7 @@
   </bean>
   
   <bean id="org.apache.jetspeed.sso.spi.SSOUserManagerSPI" parent="baseTransactionProxy">
-    <meta key="j2:cat" value="default,security" />
+    <meta key="j2:cat" value="default or security" />
     <property name="proxyInterfaces">
       <value>
         org.apache.jetspeed.sso.spi.SSOUserManagerSPI, org.apache.jetspeed.security.JetspeedPrincipalManager,
@@ -96,7 +96,7 @@
 
   <bean id="ssoUserIsOwnedByUserAssociationHandler"
     class="org.apache.jetspeed.sso.impl.IsOwnedByPrincipalAssociationHandler">
-    <meta key="j2:cat" value="default,security" />
+    <meta key="j2:cat" value="default or security" />
     <constructor-arg index="0" ref="org.apache.jetspeed.sso.spi.SSOUserManagerSPI" />
     <constructor-arg index="1" ref="org.apache.jetspeed.security.UserManager" />
     <constructor-arg index="2" ref="org.apache.jetspeed.security.spi.JetspeedPrincipalAssociationStorageManager" />
@@ -104,7 +104,7 @@
 
   <bean id="ssoUserIsOwnedByGroupAssociationHandler"
     class="org.apache.jetspeed.sso.impl.IsOwnedByPrincipalAssociationHandler">
-    <meta key="j2:cat" value="default,security" />
+    <meta key="j2:cat" value="default or security" />
     <constructor-arg index="0" ref="org.apache.jetspeed.sso.spi.SSOUserManagerSPI" />
     <constructor-arg index="1" ref="org.apache.jetspeed.security.GroupManager" />
     <constructor-arg index="2" ref="org.apache.jetspeed.security.spi.JetspeedPrincipalAssociationStorageManager" />
@@ -112,7 +112,7 @@
   
   <bean id="ssoUserIsRelatedToUserAssociationHandler"
     class="org.apache.jetspeed.sso.impl.IsRemoteIdentityForPrincipalAssociationHandler">
-    <meta key="j2:cat" value="default,security" />
+    <meta key="j2:cat" value="default or security" />
     <constructor-arg index="0" ref="org.apache.jetspeed.sso.spi.SSOUserManagerSPI" />
     <constructor-arg index="1" ref="org.apache.jetspeed.security.UserManager" />
     <constructor-arg index="2" ref="org.apache.jetspeed.security.spi.JetspeedPrincipalAssociationStorageManager" />
@@ -120,14 +120,14 @@
 
   <bean id="ssoUserIsRelatedGroupAssociationHandler"
     class="org.apache.jetspeed.sso.impl.IsRemoteIdentityForPrincipalAssociationHandler">
-    <meta key="j2:cat" value="default,security" />
+    <meta key="j2:cat" value="default or security" />
     <constructor-arg index="0" ref="org.apache.jetspeed.sso.spi.SSOUserManagerSPI" />
     <constructor-arg index="1" ref="org.apache.jetspeed.security.GroupManager" />
     <constructor-arg index="2" ref="org.apache.jetspeed.security.spi.JetspeedPrincipalAssociationStorageManager" />
   </bean>
   
   <bean id="org.apache.jetspeed.sso.SSOManager" class="org.apache.jetspeed.sso.impl.SSOManagerImpl">
-    <meta key="j2:cat" value="default,security"/>
+    <meta key="j2:cat" value="default or security"/>
     <property name="userManager" ref="org.apache.jetspeed.security.UserManager"/>
     <property name="SSOUserManagerSPI" ref="org.apache.jetspeed.sso.spi.SSOUserManagerSPI"/>
     <property name="domainAccessManager" ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager"/>
@@ -137,14 +137,14 @@
   
   <bean id="PersistenceBrokerSSOSiteManager"
     class="org.apache.jetspeed.sso.spi.impl.JetspeedPersistentSSOSiteManager" init-method="init">
-    <meta key="j2:cat" value="default,security"/>
+    <meta key="j2:cat" value="default or security"/>
     <constructor-arg index="0">
       <value>JETSPEED-INF/ojb/sso_repository.xml</value>
     </constructor-arg>
   </bean>
 
   <bean id="org.apache.jetspeed.sso.spi.SSOSiteManagerSPI" parent="baseTransactionProxy" name="ssoSiteManager">
-    <meta key="j2:cat" value="default,security"/>
+    <meta key="j2:cat" value="default or security"/>
     <property name="proxyInterfaces">
       <value>org.apache.jetspeed.sso.spi.SSOSiteManagerSPI</value>
     </property>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/static-bean-references.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/static-bean-references.xml?rev=765465&r1=765464&r2=765465&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/static-bean-references.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/static-bean-references.xml Thu Apr 16 05:19:05 2009
@@ -20,7 +20,7 @@
 
   <bean id="_portletDefinitionImplPortletPreferencesProviderInitializer"
     class="org.apache.jetspeed.components.LifecycleAwareStaticClassInitializer">
-    <meta key="j2:cat" value="default,registry" />
+    <meta key="j2:cat" value="default or registry" />
     <property name="className" value="org.apache.jetspeed.om.portlet.impl.PortletDefinitionImpl" />
     <property name="methodName" value="setPortletPreferencesProvider" />
     <property name="typeName" value="org.apache.jetspeed.components.portletpreferences.PortletPreferencesProvider" />
@@ -31,7 +31,7 @@
 
   <bean id="_portletEntityImplPortletRegistryInitializer"
     class="org.apache.jetspeed.components.LifecycleAwareStaticClassInitializer">
-    <meta key="j2:cat" value="default,registry" />
+    <meta key="j2:cat" value="default or registry" />
     <property name="className" value="org.apache.jetspeed.components.portletentity.PortletEntityImpl" />
     <property name="methodName" value="setPortletRegistry" />
     <property name="typeName" value="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
@@ -42,7 +42,7 @@
 
   <bean id="_abstractBaseElementInitializer"
     class="org.apache.jetspeed.components.LifecycleAwareStaticClassInitializer">
-    <meta key="j2:cat" value="default,xmlPageManager,pageSerializer" />
+    <meta key="j2:cat" value="default or xmlPageManager or pageSerializer" />
     <property name="className" value="org.apache.jetspeed.om.page.psml.AbstractBaseElement" />
     <property name="methodName" value="setPermissionsFactory" />
     <property name="typeName" value="org.apache.jetspeed.security.PermissionFactory" />
@@ -52,7 +52,7 @@
   </bean>
 
   <bean id="_baseElementImplInitializer" class="org.apache.jetspeed.components.LifecycleAwareStaticClassInitializer">
-    <meta key="j2:cat" value="default,dbPageManager,pageSerializer" />
+    <meta key="j2:cat" value="default or dbPageManager or pageSerializer" />
     <property name="className" value="org.apache.jetspeed.om.page.impl.BaseElementImpl" />
     <property name="methodName" value="setPermissionsFactory" />
     <property name="typeName" value="org.apache.jetspeed.security.PermissionFactory" />
@@ -62,7 +62,7 @@
   </bean>
 
   <bean id="_dbFolderImplInitializer" class="org.apache.jetspeed.components.LifecycleAwareStaticClassInitializer">
-    <meta key="j2:cat" value="default,dbPageManager,pageSerializer" />
+    <meta key="j2:cat" value="default or dbPageManager or pageSerializer" />
     <property name="className" value="org.apache.jetspeed.om.folder.impl.FolderImpl" />
     <property name="methodName" value="setPermissionsFactory" />
     <property name="typeName" value="org.apache.jetspeed.security.PermissionFactory" />
@@ -72,7 +72,7 @@
   </bean>
 
   <bean id="_xmlFolderImplInitializer" class="org.apache.jetspeed.components.LifecycleAwareStaticClassInitializer">
-    <meta key="j2:cat" value="default,xmlPageManager,pageSerializer" />
+    <meta key="j2:cat" value="default or xmlPageManager or pageSerializer" />
     <property name="className" value="org.apache.jetspeed.om.folder.psml.FolderImpl" />
     <property name="methodName" value="setPermissionsFactory" />
     <property name="typeName" value="org.apache.jetspeed.security.PermissionFactory" />
@@ -82,7 +82,7 @@
   </bean>
 
   <bean id="_dbFragmentImplInitializer" class="org.apache.jetspeed.components.LifecycleAwareStaticClassInitializer">
-    <meta key="j2:cat" value="default,dbPageManager,pageSerializer" />
+    <meta key="j2:cat" value="default or dbPageManager or pageSerializer" />
     <property name="className" value="org.apache.jetspeed.om.page.impl.FragmentImpl" />
     <property name="methodName" value="setPermissionsFactory" />
     <property name="typeName" value="org.apache.jetspeed.security.PermissionFactory" />
@@ -92,7 +92,7 @@
   </bean>
 
   <bean id="_xmlFragmentImplInitializer" class="org.apache.jetspeed.components.LifecycleAwareStaticClassInitializer">
-    <meta key="j2:cat" value="default,xmlPageManager,pageSerializer" />
+    <meta key="j2:cat" value="default or xmlPageManager or pageSerializer" />
     <property name="className" value="org.apache.jetspeed.om.page.psml.FragmentImpl" />
     <property name="methodName" value="setPermissionsFactory" />
     <property name="typeName" value="org.apache.jetspeed.security.PermissionFactory" />
@@ -103,7 +103,7 @@
 
   <bean id="_jetspeedPrincipalConcreteClassRowReaderInitializer"
     class="org.apache.jetspeed.components.LifecycleAwareStaticClassInitializer">
-    <meta key="j2:cat" value="default,security" />
+    <meta key="j2:cat" value="default or security" />
     <property name="className" value="org.apache.jetspeed.security.util.ojb.JetspeedPrincipalConcreteClassRowReader" />
     <property name="methodName" value="setJetspeedPrincipalManagerProvider" />
     <property name="typeName" value="org.apache.jetspeed.security.JetspeedPrincipalManagerProvider" />
@@ -114,7 +114,7 @@
 
   <bean id="_transientJetspeedPrincipalInitializer"
     class="org.apache.jetspeed.components.LifecycleAwareStaticClassInitializer">
-    <meta key="j2:cat" value="default,security" />
+    <meta key="j2:cat" value="default or security" />
     <property name="className" value="org.apache.jetspeed.security.impl.TransientJetspeedPrincipal" />
     <property name="methodName" value="setJetspeedPrincipalManagerProvider" />
     <property name="typeName" value="org.apache.jetspeed.security.JetspeedPrincipalManagerProvider" />
@@ -125,7 +125,7 @@
 
   <bean id="_baseJetspeedPrincipalManagerInitializer"
     class="org.apache.jetspeed.components.LifecycleAwareStaticClassInitializer">
-    <meta key="j2:cat" value="default,security" />
+    <meta key="j2:cat" value="default or security" />
     <property name="className" value="org.apache.jetspeed.security.impl.BaseJetspeedPrincipalManager" />
     <property name="methodName" value="setJetspeedPrincipalManagerProvider" />
     <property name="typeName" value="org.apache.jetspeed.security.JetspeedPrincipalManagerProvider" />
@@ -134,4 +134,4 @@
     </property>
   </bean>
 
-</beans>
\ No newline at end of file
+</beans>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/transaction.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/transaction.xml?rev=765465&r1=765464&r2=765465&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/transaction.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/transaction.xml Thu Apr 16 05:19:05 2009
@@ -24,7 +24,7 @@
 
   <!-- Transaction manager for a single OJB PersistenceBroker (alternative to JTA) -->
   <bean id="transactionManager" class="org.springframework.orm.ojb.PersistenceBrokerTransactionManager">
-    <meta key="j2:cat" value="default,transaction" />
+    <meta key="j2:cat" value="default or transaction" />
   </bean>
 
   <!-- Transaction manager that delegates to JTA (for a transactional JNDI DataSource) -->
@@ -40,7 +40,7 @@
   -->
   <bean id="baseTransactionProxy" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean"
     abstract="true">
-    <meta key="j2:cat" value="default,transaction" />
+    <meta key="j2:cat" value="default or transaction" />
     <property name="transactionManager">
       <ref bean="transactionManager" />
     </property>
@@ -51,4 +51,4 @@
     </property>
   </bean>
 
-</beans>
\ No newline at end of file
+</beans>

Modified: portals/jetspeed-2/portal/trunk/src/site/xdoc/spring-config.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/src/site/xdoc/spring-config.xml?rev=765465&r1=765464&r2=765465&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/src/site/xdoc/spring-config.xml (original)
+++ portals/jetspeed-2/portal/trunk/src/site/xdoc/spring-config.xml Thu Apr 16 05:19:05 2009
@@ -41,11 +41,11 @@
                 <p>
                     In Jetspeed assembly files, a bean definition should have <strong><code>j2:cat</code></strong> meta data like the following example:
                     <div class="source"><pre>&lt;bean name="xmlPageManager" class="org.apache.jetspeed.page.psml.CastorXmlPageManager"&gt;
-    &lt;meta key="j2:cat" value="xmlPageManager,pageSerializer" /&gt;
+    &lt;meta key="j2:cat" value="xmlPageManager or pageSerializer" /&gt;
     ...
 &lt;/bean&gt;</pre></div>
-                    In the above example, the <strong><code>xmlPageManager</code></strong> bean definition has two categories: <strong><code>xmlPageManager</code></strong> and <strong><code>pageSerializer</code></strong>.
-                    If the Spring filter key setting of Jetspeed contains one of the categories, then the <strong><code>xmlPageManager</code></strong> bean definition will be registered. Otherwise, the bean definition will be ignored. By the Spring filter key setting, bean definitions in assembly files will be filtered according to their cateogories.
+                    In the above example, the <strong><code>xmlPageManager</code></strong> bean definition is included for two categories: <strong><code>xmlPageManager</code></strong> and <strong><code>pageSerializer</code></strong>.
+                    If the Spring filter key setting of Jetspeed contains one of the categories, then the <strong><code>xmlPageManager</code></strong> bean definition will be registered. Otherwise, the bean definition will be ignored. By the Spring filter key setting, bean definitions in assembly files will be filtered according to their categories.
                 </p>
             </subsection>
             <subsection name="Spring Filter Keys and Categories Settings">



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