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 at...@apache.org on 2008/04/10 13:08:22 UTC
svn commit: r646756 [2/2] - in /portals/jetspeed-2/portal/trunk:
components/jetspeed-file-cache/src/test/java/org/apache/jetspeed/cache/file/
components/jetspeed-portal/src/main/java/org/apache/jetspeed/engine/
components/jetspeed-portal/src/test/java/...
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/portal-url-generation.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/portal-url-generation.xml?rev=646756&r1=646755&r2=646756&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/portal-url-generation.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/portal-url-generation.xml Thu Apr 10 04:07:54 2008
@@ -19,6 +19,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
<bean id="NavigationalStateCodec" class="org.apache.jetspeed.container.state.impl.JetspeedNavigationalStateCodec">
+ <meta key="j2:cat" value="default" />
<constructor-arg>
<ref bean="PortalContext" />
</constructor-arg>
@@ -30,6 +31,7 @@
<!-- Navigation state we are currently using -->
<bean id="NavigationalState" class="org.apache.jetspeed.container.state.impl.SessionFullExtendedNavigationalState"
scope="prototype">
+ <meta key="j2:cat" value="default" />
<constructor-arg index='0'>
<ref bean="NavigationalStateCodec" />
</constructor-arg>
@@ -53,6 +55,7 @@
<!-- PortalURL we are currently using -->
<bean id="PortalURL" class="org.apache.jetspeed.container.url.impl.PathInfoEncodingPortalURL" scope="prototype">
+ <meta key="j2:cat" value="default" />
<constructor-arg>
<ref bean="NavigationalState" />
</constructor-arg>
@@ -66,6 +69,7 @@
<!-- PortalURL we are currently using -->
<bean id="DesktopPortalURL" class="org.apache.jetspeed.container.url.impl.DesktopEncodingPortalURL"
scope="prototype">
+ <meta key="j2:cat" value="default" />
<constructor-arg index='0'>
<ref bean="NavigationalState" />
</constructor-arg>
@@ -97,6 +101,7 @@
<bean id="NavigationalStateComponent"
class="org.apache.jetspeed.container.state.impl.JetspeedNavigationalStateComponent"
name="org.apache.jetspeed.container.state.NavigationalStateComponent">
+ <meta key="j2:cat" value="default" />
<constructor-arg index="0">
<value>NavigationalState</value>
</constructor-arg>
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/prefs.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/prefs.xml?rev=646756&r1=646755&r2=646756&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/prefs.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/prefs.xml Thu Apr 10 04:07:54 2008
@@ -21,6 +21,7 @@
<!-- Preferences Implementation -->
<bean id="PreferencesProviderImpl" class="org.apache.jetspeed.prefs.impl.PersistenceBrokerPreferencesProvider"
name="prefsPersistenceBroker" init-method="init" destroy-method="destroy">
+ <meta key="j2:cat" value="default,prefs" />
<constructor-arg index="0">
<value>JETSPEED-INF/ojb/prefs_repository.xml</value>
</constructor-arg>
@@ -41,6 +42,7 @@
<bean id="org.apache.jetspeed.prefs.PreferencesProvider" parent="baseTransactionProxy" name="prefsProvider"
destroy-method="destroy">
+ <meta key="j2:cat" value="default,prefs" />
<property name="proxyInterfaces">
<value>org.apache.jetspeed.prefs.PreferencesProvider</value>
</property>
@@ -61,6 +63,7 @@
<!-- PreferencesFactory implementation -->
<bean id="java.util.prefs.PreferencesFactory" class="org.apache.jetspeed.prefs.impl.PreferencesFactoryImpl"
name="prefsFactory" init-method="init" destroy-method="destroy">
+ <meta key="j2:cat" value="default,prefs" />
<!-- dummy constructor argument to distinguish it from the default constructor invoked by the Java Preferences itself -->
<constructor-arg>
<value>1</value>
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/profiler.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/profiler.xml?rev=646756&r1=646755&r2=646756&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/profiler.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/profiler.xml Thu Apr 10 04:07:54 2008
@@ -20,6 +20,7 @@
<!-- Profiler -->
<bean id="profilerImpl" class="org.apache.jetspeed.profiler.impl.JetspeedProfilerImpl" init-method="init">
+ <meta key="j2:cat" value="default,profiler" />
<constructor-arg index="0">
<value>JETSPEED-INF/ojb/profiler_repository.xml</value>
</constructor-arg>
@@ -54,6 +55,7 @@
</bean>
<bean id="org.apache.jetspeed.profiler.Profiler" name="profiler" parent="baseTransactionProxy">
+ <meta key="j2:cat" value="default,profiler" />
<property name="proxyInterfaces">
<value>org.apache.jetspeed.profiler.Profiler</value>
</property>
@@ -73,6 +75,7 @@
</bean>
<bean id="ProfileResolvers" class="org.apache.jetspeed.profiler.rules.impl.ProfileResolversImpl">
+ <meta key="j2:cat" value="default,profiler" />
<constructor-arg index="0">
<map>
<entry key="request">
@@ -139,54 +142,100 @@
</constructor-arg>
</bean>
- <bean id='StandardResolver' class='org.apache.jetspeed.profiler.rules.impl.StandardResolver'></bean>
- <bean id='SessionResolver' class='org.apache.jetspeed.profiler.rules.impl.SessionResolver'></bean>
- <bean id='RequestSessionResolver' class='org.apache.jetspeed.profiler.rules.impl.RequestSessionResolver'></bean>
- <bean id='PathResolver' class='org.apache.jetspeed.profiler.rules.impl.PathResolver'></bean>
- <bean id='PathSessionResolver' class='org.apache.jetspeed.profiler.rules.impl.PathSessionResolver'></bean>
- <bean id='HardCodedResolver' class='org.apache.jetspeed.profiler.rules.impl.HardCodedResolver'></bean>
- <bean id='UserCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.UserCriterionResolver'></bean>
- <bean id='RoleCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.RoleCriterionResolver'></bean>
- <bean id='RoleComboCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.RoleComboCriterionResolver'></bean>
- <bean id='GroupCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.GroupCriterionResolver'></bean>
- <bean id='MediatypeCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.MediatypeCriterionResolver'></bean>
- <bean id='LanguageCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.LanguageCriterionResolver'></bean>
- <bean id='CountryCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.CountryCriterionResolver'></bean>
+ <bean id='StandardResolver' class='org.apache.jetspeed.profiler.rules.impl.StandardResolver'>
+ <meta key="j2:cat" value="default,profiler" />
+ </bean>
+ <bean id='SessionResolver' class='org.apache.jetspeed.profiler.rules.impl.SessionResolver'>
+ <meta key="j2:cat" value="default,profiler" />
+ </bean>
+ <bean id='RequestSessionResolver' class='org.apache.jetspeed.profiler.rules.impl.RequestSessionResolver'>
+ <meta key="j2:cat" value="default,profiler" />
+ </bean>
+ <bean id='PathResolver' class='org.apache.jetspeed.profiler.rules.impl.PathResolver'>
+ <meta key="j2:cat" value="default,profiler" />
+ </bean>
+ <bean id='PathSessionResolver' class='org.apache.jetspeed.profiler.rules.impl.PathSessionResolver'>
+ <meta key="j2:cat" value="default,profiler" />
+ </bean>
+ <bean id='HardCodedResolver' class='org.apache.jetspeed.profiler.rules.impl.HardCodedResolver'>
+ <meta key="j2:cat" value="default,profiler" />
+ </bean>
+ <bean id='UserCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.UserCriterionResolver'>
+ <meta key="j2:cat" value="default,profiler" />
+ </bean>
+ <bean id='RoleCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.RoleCriterionResolver'>
+ <meta key="j2:cat" value="default,profiler" />
+ </bean>
+ <bean id='RoleComboCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.RoleComboCriterionResolver'>
+ <meta key="j2:cat" value="default,profiler" />
+ </bean>
+ <bean id='GroupCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.GroupCriterionResolver'>
+ <meta key="j2:cat" value="default,profiler" />
+ </bean>
+ <bean id='MediatypeCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.MediatypeCriterionResolver'>
+ <meta key="j2:cat" value="default,profiler" />
+ </bean>
+ <bean id='LanguageCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.LanguageCriterionResolver'>
+ <meta key="j2:cat" value="default,profiler" />
+ </bean>
+ <bean id='CountryCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.CountryCriterionResolver'>
+ <meta key="j2:cat" value="default,profiler" />
+ </bean>
<bean id='GroupRoleUserCriterionResolver'
class='org.apache.jetspeed.profiler.rules.impl.GroupRoleUserCriterionResolver'>
+ <meta key="j2:cat" value="default,profiler" />
+ </bean>
+ <bean id='UserAttributeResolver' class='org.apache.jetspeed.profiler.rules.impl.UserAttributeResolver'>
+ <meta key="j2:cat" value="default,profiler" />
+ </bean>
+ <bean id='NavigationCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.NavigationCriterionResolver'>
+ <meta key="j2:cat" value="default,profiler" />
+ </bean>
+ <bean id='UserAgentCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.UserAgentCriterionResolver'>
+ <meta key="j2:cat" value="default,profiler" />
+ </bean>
+ <bean id='IPCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.IPCriterionResolver'>
+ <meta key="j2:cat" value="default,profiler" />
</bean>
- <bean id='UserAttributeResolver' class='org.apache.jetspeed.profiler.rules.impl.UserAttributeResolver'></bean>
- <bean id='NavigationCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.NavigationCriterionResolver'></bean>
- <bean id='UserAgentCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.UserAgentCriterionResolver'></bean>
- <bean id='IPCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.IPCriterionResolver'></bean>
<bean id='HostnameCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.HostnameCriterionResolver'>
+ <meta key="j2:cat" value="default,profiler" />
<!-- use the dot prefix, for ex: "accounting.xyz.com" returns "accounting" -->
<constructor-arg type="boolean" index="0">
<value>false</value>
</constructor-arg>
</bean>
- <bean id='DomainCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.DomainCriterionResolver'></bean>
+ <bean id='DomainCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.DomainCriterionResolver'>
+ <meta key="j2:cat" value="default,profiler" />
+ </bean>
<!-- Profiling Rules -->
<!-- Standard Profiler -->
<bean id="StandardProfilingRule" class="org.apache.jetspeed.profiler.rules.impl.StandardProfilingRule"
scope="prototype">
+ <meta key="j2:cat" value="default,profiler" />
</bean>
<!-- Fallback Profiler -->
<bean id="RoleFallbackProfilingRule" class="org.apache.jetspeed.profiler.rules.impl.RoleFallbackProfilingRule"
scope="prototype">
+ <meta key="j2:cat" value="default,profiler" />
</bean>
<!-- Locator -->
- <bean id="ProfileLocator" class="org.apache.jetspeed.profiler.impl.JetspeedProfileLocator" scope="prototype"></bean>
+ <bean id="ProfileLocator" class="org.apache.jetspeed.profiler.impl.JetspeedProfileLocator" scope="prototype">
+ <meta key="j2:cat" value="default,profiler" />
+ </bean>
<!-- Principal Rule -->
- <bean id="PrincipalRule" class="org.apache.jetspeed.profiler.rules.impl.PrincipalRuleImpl" scope="prototype"></bean>
+ <bean id="PrincipalRule" class="org.apache.jetspeed.profiler.rules.impl.PrincipalRuleImpl" scope="prototype">
+ <meta key="j2:cat" value="default,profiler" />
+ </bean>
<!-- Rule Criterion -->
- <bean id="RuleCriterion" class="org.apache.jetspeed.profiler.rules.impl.RuleCriterionImpl" scope="prototype"></bean>
+ <bean id="RuleCriterion" class="org.apache.jetspeed.profiler.rules.impl.RuleCriterionImpl" scope="prototype">
+ <meta key="j2:cat" value="default,profiler" />
+ </bean>
</beans>
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/registry.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/registry.xml?rev=646756&r1=646755&r2=646756&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/registry.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/registry.xml Thu Apr 10 04:07:54 2008
@@ -20,6 +20,7 @@
<!-- Portlet Factory -->
<bean id="portletFactory" class="org.apache.jetspeed.factory.JetspeedPortletFactory">
+ <meta key="j2:cat" value="default,registry" />
<!-- If the following constructor-arg is set to true,
proxy instances will switch config mode to built-in custom config mode portlet. -->
<constructor-arg index="0">
@@ -39,6 +40,7 @@
<!-- Portlet Registry DAO-->
<bean id="portletRegistryImpl" class="org.apache.jetspeed.components.portletregistry.PersistenceBrokerPortletRegistry"
init-method="init">
+ <meta key="j2:cat" value="default,registry" />
<constructor-arg index="0">
<value>JETSPEED-INF/ojb/registry_repository.xml</value>
@@ -62,6 +64,7 @@
<bean id="org.apache.jetspeed.components.portletregistry.PortletRegistry" name="portletRegistry"
parent="baseTransactionProxy">
+ <meta key="j2:cat" value="default,registry" />
<property name="proxyInterfaces">
<value>org.apache.jetspeed.components.portletregistry.PortletRegistry</value>
</property>
@@ -94,6 +97,7 @@
<bean id="portletEntityAccessImpl"
class="org.apache.jetspeed.components.portletentity.PersistenceBrokerPortletEntityAccess">
+ <meta key="j2:cat" value="default,registry" />
<constructor-arg>
<ref bean="portletRegistry" />
</constructor-arg>
@@ -118,6 +122,7 @@
<bean id="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent" parent="baseTransactionProxy"
name="portletEntityAccess">
+ <meta key="j2:cat" value="default,registry" />
<property name="proxyInterfaces">
<value>org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent</value>
</property>
@@ -145,6 +150,7 @@
<!-- Inject Portlet Entity Proxy into Portlet Entity impl -->
<bean id="injectEntityAccessProxy" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+ <meta key="j2:cat" value="default,registry" />
<property name="targetObject">
<ref bean="portletEntityAccessImpl" />
</property>
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/request-context-objects.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/request-context-objects.xml?rev=646756&r1=646755&r2=646756&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/request-context-objects.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/request-context-objects.xml Thu Apr 10 04:07:54 2008
@@ -23,6 +23,7 @@
$rco.get("myObject")
-->
<bean id="RequestContextObjects" class="java.util.HashMap">
+ <meta key="j2:cat" value="default" />
<constructor-arg index="0">
<map>
<!--
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/search.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/search.xml?rev=646756&r1=646755&r2=646756&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/search.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/search.xml Thu Apr 10 04:07:54 2008
@@ -20,6 +20,7 @@
<!--SEARCH COMPONENT-->
<bean id="org.apache.jetspeed.search.HandlerFactory" class="org.apache.jetspeed.search.handlers.HandlerFactoryImpl">
+ <meta key="j2:cat" value="default,search" />
<constructor-arg>
<map>
<entry key="java.net.URL">
@@ -37,6 +38,7 @@
<bean id="org.apache.jetspeed.search.SearchEngine" class="org.apache.jetspeed.search.lucene.SearchEngineImpl">
+ <meta key="j2:cat" value="default,search" />
<constructor-arg index="0">
<value>${applicationRoot}/WEB-INF/search_index</value>
</constructor-arg>
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-atn.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-atn.xml?rev=646756&r1=646755&r2=646756&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-atn.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-atn.xml Thu Apr 10 04:07:54 2008
@@ -22,6 +22,7 @@
<!-- Security: Login Module Proxy -->
<bean id="org.apache.jetspeed.security.LoginModuleProxy"
class="org.apache.jetspeed.security.impl.LoginModuleProxyImpl">
+ <meta key="j2:cat" value="default,security" />
<!-- User Manager to construct JAAS subject/principals returned to container -->
<constructor-arg index="0">
<ref bean="org.apache.jetspeed.security.UserManager" />
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-atz.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-atz.xml?rev=646756&r1=646755&r2=646756&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-atz.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-atz.xml Thu Apr 10 04:07:54 2008
@@ -20,6 +20,7 @@
<!-- Security: RDBMS Policy implementation for JAAS -->
<bean id="org.apache.jetspeed.security.impl.RdbmsPolicy" class="org.apache.jetspeed.security.impl.RdbmsPolicy">
+ <meta key="j2:cat" value="default,security" />
<constructor-arg>
<ref bean="org.apache.jetspeed.security.PermissionManager" />
</constructor-arg>
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml?rev=646756&r1=646755&r2=646756&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml Thu Apr 10 04:07:54 2008
@@ -20,6 +20,7 @@
<!-- Security: User Manager -->
<bean id="org.apache.jetspeed.security.UserManager" class="org.apache.jetspeed.security.impl.UserManagerImpl">
+ <meta key="j2:cat" value="default,security" />
<constructor-arg>
<ref bean="org.apache.jetspeed.security.SecurityProvider" />
</constructor-arg>
@@ -27,6 +28,7 @@
<!-- Security: Group Manager -->
<bean id="org.apache.jetspeed.security.GroupManager" class="org.apache.jetspeed.security.impl.GroupManagerImpl">
+ <meta key="j2:cat" value="default,security" />
<constructor-arg>
<ref bean="org.apache.jetspeed.security.SecurityProvider" />
</constructor-arg>
@@ -34,6 +36,7 @@
<!-- Security: Role Manager -->
<bean id="org.apache.jetspeed.security.RoleManager" class="org.apache.jetspeed.security.impl.RoleManagerImpl">
+ <meta key="j2:cat" value="default,security" />
<constructor-arg>
<ref bean="org.apache.jetspeed.security.SecurityProvider" />
</constructor-arg>
@@ -41,9 +44,12 @@
<!-- Security: Permission Manager -->
<bean id="org.apache.jetspeed.security.impl.PermissionManagerImpl"
- class="org.apache.jetspeed.security.impl.PermissionManagerImpl" />
+ class="org.apache.jetspeed.security.impl.PermissionManagerImpl">
+ <meta key="j2:cat" value="default,security" />
+ </bean>
<bean id="org.apache.jetspeed.security.PermissionManager" parent="baseTransactionProxy" name="permissionManager">
+ <meta key="j2:cat" value="default,security" />
<property name="proxyInterfaces">
<value>org.apache.jetspeed.security.PermissionManager</value>
</property>
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-providers.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-providers.xml?rev=646756&r1=646755&r2=646756&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-providers.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-providers.xml Thu Apr 10 04:07:54 2008
@@ -22,6 +22,7 @@
<!-- Security: Default Authentication Provider -->
<bean id="org.apache.jetspeed.security.AuthenticationProvider"
class="org.apache.jetspeed.security.impl.AuthenticationProviderImpl">
+ <meta key="j2:cat" value="default,security" />
<constructor-arg index="0">
<value>DefaultAuthenticator</value>
</constructor-arg>
@@ -42,6 +43,7 @@
<!-- Security: Authentication Provider Proxy -->
<bean id="org.apache.jetspeed.security.AuthenticationProviderProxy"
class="org.apache.jetspeed.security.impl.AuthenticationProviderProxyImpl">
+ <meta key="j2:cat" value="default,security" />
<constructor-arg>
<list>
<ref bean="org.apache.jetspeed.security.AuthenticationProvider" />
@@ -55,6 +57,7 @@
<!-- Security: Security Provider -->
<bean id="org.apache.jetspeed.security.SecurityProvider"
class="org.apache.jetspeed.security.impl.SecurityProviderImpl">
+ <meta key="j2:cat" value="default,security" />
<constructor-arg>
<ref bean="org.apache.jetspeed.security.AuthenticationProviderProxy" />
</constructor-arg>
@@ -72,6 +75,7 @@
<!-- Security: Authorization Provider -->
<bean id="org.apache.jetspeed.security.AuthorizationProvider"
class="org.apache.jetspeed.security.impl.AuthorizationProviderImpl">
+ <meta key="j2:cat" value="default,security" />
<constructor-arg index="0">
<ref bean="org.apache.jetspeed.security.impl.RdbmsPolicy" />
</constructor-arg>
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-spi-atn.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-spi-atn.xml?rev=646756&r1=646755&r2=646756&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-spi-atn.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-spi-atn.xml Thu Apr 10 04:07:54 2008
@@ -22,17 +22,21 @@
<!-- require a non-empty password -->
<bean id="org.apache.jetspeed.security.spi.CredentialPasswordValidator"
- class="org.apache.jetspeed.security.spi.impl.DefaultCredentialPasswordValidator" />
- <!-- UNCOMMENT TO TURN ON Regex-based password validation. The pattern below gives:
- * Must be at least 6 characters
- * Must contain at least one one lower case letter, one upper case letter, one digit and one special character
- * Valid special characters are @#$%^&+=
- <constructor-arg index="1"><value><![CDATA[^.*(?=.{6,})(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[@#$%^&+=]).*$]]></value></constructor-arg>
- -->
+ class="org.apache.jetspeed.security.spi.impl.DefaultCredentialPasswordValidator">
+ <meta key="j2:cat" value="default,security" />
+
+ <!-- UNCOMMENT TO TURN ON Regex-based password validation. The pattern below gives:
+ * Must be at least 6 characters
+ * Must contain at least one one lower case letter, one upper case letter, one digit and one special character
+ * Valid special characters are @#$%^&+=
+ <constructor-arg index="1"><value><![CDATA[^.*(?=.{6,})(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[@#$%^&+=]).*$]]></value></constructor-arg>
+ -->
+ </bean>
<!-- MessageDigest encode passwords using SHA-1 -->
<bean id="org.apache.jetspeed.security.spi.CredentialPasswordEncoder"
class="org.apache.jetspeed.security.spi.impl.MessageDigestCredentialPasswordEncoder">
+ <meta key="j2:cat" value="default,security" />
<constructor-arg index="0">
<value>SHA-1</value>
</constructor-arg>
@@ -49,6 +53,7 @@
<bean id="org.apache.jetspeed.security.spi.PasswordCredentialProvider"
class="org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialProvider">
+ <meta key="j2:cat" value="default,security" />
<constructor-arg index="0">
<ref bean="org.apache.jetspeed.security.spi.CredentialPasswordValidator" />
</constructor-arg>
@@ -98,6 +103,7 @@
<!-- allow multiple InternalPasswordCredentialInterceptors to be used for DefaultCredentialHandler -->
<bean id="org.apache.jetspeed.security.spi.InternalPasswordCredentialInterceptor"
class="org.apache.jetspeed.security.spi.impl.InternalPasswordCredentialInterceptorsProxy">
+ <meta key="j2:cat" value="default,security" />
<constructor-arg index="0">
<list>
<!-- enforce an invalid preset password value in the persisent store is required to be changed -->
@@ -112,6 +118,7 @@
<!-- Security SPI: CredentialHandler -->
<bean id="org.apache.jetspeed.security.spi.CredentialHandler"
class="org.apache.jetspeed.security.spi.impl.DefaultCredentialHandler">
+ <meta key="j2:cat" value="default,security" />
<constructor-arg index="0">
<ref bean="org.apache.jetspeed.security.spi.SecurityAccess" />
</constructor-arg>
@@ -128,6 +135,7 @@
may demarcate its own transactions -->
<bean id="org.apache.jetspeed.security.spi.UserSecurityHandlerImpl"
class="org.apache.jetspeed.security.spi.impl.DefaultUserSecurityHandler">
+ <meta key="j2:cat" value="default,security" />
<constructor-arg>
<ref bean="org.apache.jetspeed.security.spi.SecurityAccess" />
</constructor-arg>
@@ -135,6 +143,7 @@
<bean id="org.apache.jetspeed.security.spi.UserSecurityHandler" parent="baseTransactionProxy"
name="userSecurityHandler">
+ <meta key="j2:cat" value="default,security" />
<property name="proxyInterfaces">
<value>org.apache.jetspeed.security.spi.UserSecurityHandler</value>
</property>
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-spi-atz.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-spi-atz.xml?rev=646756&r1=646755&r2=646756&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-spi-atz.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-spi-atz.xml Thu Apr 10 04:07:54 2008
@@ -22,6 +22,7 @@
<!-- Security SPI: RoleSecurityHandler -->
<bean id="org.apache.jetspeed.security.spi.RoleSecurityHandler"
class="org.apache.jetspeed.security.spi.impl.DefaultRoleSecurityHandler">
+ <meta key="j2:cat" value="default,security" />
<constructor-arg>
<ref bean="org.apache.jetspeed.security.spi.SecurityAccess" />
</constructor-arg>
@@ -30,6 +31,7 @@
<!-- Security SPI: GroupSecurityHandler -->
<bean id="org.apache.jetspeed.security.spi.GroupSecurityHandler"
class="org.apache.jetspeed.security.spi.impl.DefaultGroupSecurityHandler">
+ <meta key="j2:cat" value="default,security" />
<constructor-arg>
<ref bean="org.apache.jetspeed.security.spi.SecurityAccess" />
</constructor-arg>
@@ -38,6 +40,7 @@
<!-- Security SPI: SecurityMappingHandler -->
<bean id="org.apache.jetspeed.security.spi.SecurityMappingHandler"
class="org.apache.jetspeed.security.spi.impl.DefaultSecurityMappingHandler">
+ <meta key="j2:cat" value="default,security" />
<constructor-arg>
<ref bean="org.apache.jetspeed.security.spi.SecurityAccess" />
</constructor-arg>
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-spi.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-spi.xml?rev=646756&r1=646755&r2=646756&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-spi.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-spi.xml Thu Apr 10 04:07:54 2008
@@ -22,6 +22,7 @@
<!-- Security SPI: CommonQueries -->
<bean id="org.apache.jetspeed.security.spi.impl.SecurityAccessImpl"
class="org.apache.jetspeed.security.spi.impl.SecurityAccessImpl" init-method="init">
+ <meta key="j2:cat" value="default,security" />
<constructor-arg>
<value>JETSPEED-INF/ojb/security_repository.xml</value>
</constructor-arg>
@@ -29,6 +30,7 @@
<bean id="org.apache.jetspeed.security.spi.SecurityAccess" parent="baseTransactionProxy"
name="SecurityCommonQueries">
+ <meta key="j2:cat" value="default,security" />
<property name="proxyInterfaces">
<value>org.apache.jetspeed.security.spi.SecurityAccess</value>
</property>
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/serializer.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/serializer.xml?rev=646756&r1=646755&r2=646756&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/serializer.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/serializer.xml Thu Apr 10 04:07:54 2008
@@ -4,6 +4,7 @@
<bean id="org.apache.jetspeed.serializer.JetspeedSerializer" name="JetspeedSerializer"
class="org.apache.jetspeed.serializer.JetspeedSerializerImpl">
+ <meta key="j2:cat" value="default,serializer" />
<constructor-arg index="0">
<list>
<bean class="org.apache.jetspeed.serializer.JetspeedCapabilitiesSerializer">
@@ -51,6 +52,14 @@
<entry key="process_portal_preferences">
<value type="java.lang.Boolean">false</value>
</entry>
+ <!-- following settings are for export -->
+ <entry key="overwrite_existing">
+ <value type="java.lang.Boolean">true</value>
+ </entry>
+ <entry key="backup_before_process">
+ <value type="java.lang.Boolean">true</value>
+ </entry>
+ <entry key="export_indentation" value=" "/>
</map>
</constructor-arg>
</bean>
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=646756&r1=646755&r2=646756&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 10 04:07:54 2008
@@ -21,12 +21,14 @@
<!-- SSO Implementation -->
<bean id="PersistenceBrokerSSOProvider" class="org.apache.jetspeed.sso.impl.PersistenceBrokerSSOProvider"
init-method="init">
+ <meta key="j2:cat" value="default" />
<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">
+ <meta key="j2:cat" value="default" />
<property name="proxyInterfaces">
<value>org.apache.jetspeed.sso.SSOProvider</value>
</property>
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/statistics.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/statistics.xml?rev=646756&r1=646755&r2=646756&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/statistics.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/statistics.xml Thu Apr 10 04:07:54 2008
@@ -21,6 +21,7 @@
<!-- Statistics Implementation -->
<bean id="PortalStatistics" class="org.apache.jetspeed.statistics.impl.PortalStatisticsImpl" init-method="springInit"
destroy-method="springDestroy">
+ <meta key="j2:cat" value="default" />
<!-- logToCLF -->
<constructor-arg index='0' type="boolean">
<value>false</value>
@@ -69,6 +70,7 @@
<!-- Audit Activity Implementation -->
<bean id="org.apache.jetspeed.audit.AuditActivity" class="org.apache.jetspeed.audit.impl.AuditActivityImpl">
+ <meta key="j2:cat" value="default" />
<constructor-arg index='0'>
<ref bean="JetspeedDS" />
</constructor-arg>
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/theme-engine.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/theme-engine.xml?rev=646756&r1=646755&r2=646756&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/theme-engine.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/theme-engine.xml Thu Apr 10 04:07:54 2008
@@ -18,9 +18,12 @@
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
- <bean id="ResourceValidator" class="org.apache.jetspeed.decoration.validators.WebApplicationResourceValidator" />
+ <bean id="ResourceValidator" class="org.apache.jetspeed.decoration.validators.WebApplicationResourceValidator">
+ <meta key="j2:cat" value="default" />
+ </bean>
<bean id="DecorationFactory" class="org.apache.jetspeed.decoration.DecorationFactoryImpl">
+ <meta key="j2:cat" value="default" />
<constructor-arg index="0">
<ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
</constructor-arg>
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=646756&r1=646755&r2=646756&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 10 04:07:54 2008
@@ -23,7 +23,9 @@
-->
<!-- Transaction manager for a single OJB PersistenceBroker (alternative to JTA) -->
- <bean id="transactionManager" class="org.springframework.orm.ojb.PersistenceBrokerTransactionManager" />
+ <bean id="transactionManager" class="org.springframework.orm.ojb.PersistenceBrokerTransactionManager">
+ <meta key="j2:cat" value="default,transaction" />
+ </bean>
<!-- Transaction manager that delegates to JTA (for a transactional JNDI DataSource) -->
<!--
@@ -38,6 +40,7 @@
-->
<bean id="baseTransactionProxy" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean"
abstract="true">
+ <meta key="j2:cat" value="default,transaction" />
<property name="transactionManager">
<ref bean="transactionManager" />
</property>
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/userinfo.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/userinfo.xml?rev=646756&r1=646755&r2=646756&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/userinfo.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/userinfo.xml Thu Apr 10 04:07:54 2008
@@ -21,6 +21,7 @@
<!-- Single Source User Info -->
<bean id="org.apache.jetspeed.userinfo.UserInfoManager"
class="org.apache.jetspeed.userinfo.impl.UserInfoManagerImpl">
+ <meta key="j2:cat" value="default" />
<constructor-arg index="0">
<ref bean="org.apache.jetspeed.security.UserManager" />
</constructor-arg>
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/spring-filter.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/spring-filter.properties?rev=646756&r1=646755&r2=646756&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/spring-filter.properties (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/spring-filter.properties Thu Apr 10 04:07:54 2008
@@ -25,4 +25,7 @@
# jndiDS (default), jdbcDS, schemaAwareDS, ojbConnectionRepositoryDS
# default filter
-default=default
\ No newline at end of file
+default=default
+
+portal=${default},jndiDS
+serializer=jdbcDS,serializer,capabilities,security,profiler,registry,search,transaction,cache,prefs,springProperties,noRequestContext,noPageManager
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org