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/03/27 02:18:26 UTC
svn commit: r641679 [1/5] - in /portals/jetspeed-2/portal/trunk: ./
app-servers/security/jboss/src/java/META-INF/jboss-secsvc/
components/jetspeed-capability/src/test/resources/
components/jetspeed-capability/src/test/resources/boot/ components/jetspee...
Author: ate
Date: Wed Mar 26 18:18:18 2008
New Revision: 641679
URL: http://svn.apache.org/viewvc?rev=641679&view=rev
Log:
Bumping to latest Spring 2.5.2 and updating all assembly files replacing old Spring dtd with spring-beans-2.5.xsd,
Coming up: dynamic Spring assembly filtering based on custom categories and bean meta data...
Modified:
portals/jetspeed-2/portal/trunk/app-servers/security/jboss/src/java/META-INF/jboss-secsvc/jboss-security-service.xml
portals/jetspeed-2/portal/trunk/app-servers/security/jboss/src/java/META-INF/jboss-secsvc/security-providers.xml
portals/jetspeed-2/portal/trunk/app-servers/security/jboss/src/java/META-INF/jboss-secsvc/security-spi.xml
portals/jetspeed-2/portal/trunk/app-servers/security/jboss/src/java/META-INF/jboss-secsvc/transaction.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-capability/src/test/resources/boot/datasource.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-capability/src/test/resources/serializer.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/test/java/org/apache/jetspeed/cache/general/cache-test.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/database-page-manager.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/interceptors.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/secure-database-page-manager.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/secure-permissions-database-page-manager.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/tx-page-manager.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/boot/datasource.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/java/JETSPEED-INF/spring/test-spring.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/assembly/page-manager.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/assembly/test-layout-api.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/assembly/test-layout-constraints-api.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/JETSPEED-INF/spring/user-info.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/boot/datasource.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/rc2.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/rc3.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/system-properties.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-prefs/src/test/resources/boot/datasource.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/resources/boot/datasource.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/resources/serializer.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/resources/boot/datasource.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/resources/registry-test.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/JETSPEED-INF/directory/config/apacheds/setup1/security-spi-ldap.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/JETSPEED-INF/directory/config/apacheds/setup2/security-spi-ldap.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/JETSPEED-INF/directory/config/apacheds/setup3/security-spi-ldap.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/JETSPEED-INF/directory/config/apacheds/setup4/security-spi-ldap.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/JETSPEED-INF/directory/config/apacheds/setup5/security-spi-ldap.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/JETSPEED-INF/directory/config/domino/setup1/security-spi-ldap.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/JETSPEED-INF/directory/config/domino/setup2/security-spi-ldap.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/JETSPEED-INF/directory/config/domino/setup3/security-spi-ldap.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/JETSPEED-INF/directory/config/openldap/setup1/security-spi-ldap.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/JETSPEED-INF/directory/config/openldap/setup2/security-spi-ldap.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/JETSPEED-INF/directory/config/openldap/setup3/security-spi-ldap.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/JETSPEED-INF/directory/config/openldap/setup4/security-spi-ldap.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/JETSPEED-INF/directory/config/sunds/setup1/security-spi-ldap.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/JETSPEED-INF/spring/TestCredentialPasswordEncoder.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/JETSPEED-INF/spring/TestPasswordCredentialProvider.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/JETSPEED-INF/spring/TestPasswordExpirationAndMaxAuthenticationFailuresInterceptor.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/JETSPEED-INF/spring/TestPasswordHistoryInterceptor.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/resources/boot/datasource.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/resources/security-spi-ldap-atn.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/resources/security-spi-ldap-atz.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/resources/security-spi-ldap.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-sso/src/test/resources/boot/datasource.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/test/resources/boot/datasource.xml
portals/jetspeed-2/portal/trunk/etc/apacheds/apacheds-server.xml
portals/jetspeed-2/portal/trunk/etc/import/assembly/import-page-manager.xml
portals/jetspeed-2/portal/trunk/etc/import/assembly/repository-datasource-spring.xml
portals/jetspeed-2/portal/trunk/etc/ldif/server.xml
portals/jetspeed-2/portal/trunk/etc/registration/assembly/registry.xml
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/import/assembly/import-page-manager.xml
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/import/assembly/repository-datasource-spring.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/administration.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/aggregation.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/ajax-layout.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/ajax.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/db-page-manager.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/extended-pipelines.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/interceptors.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/jetty-override.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/request-context.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/seed-registry.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/deployment.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/jetspeed-services.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/boot/datasource.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/cache.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/capabilities.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/cluster-node.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/desktop.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/headtag.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/hierarchical-principal-names.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/importer-page-manager.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-base.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-production.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-services.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-spring.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/multiple-action.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/page-manager.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pluto-factories.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/portal-url-generation.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/prefs.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/profiler.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/registry.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/request-context-objects.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/search.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-atn.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-atz.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-providers.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-spi-atn.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-spi-atz.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-spi.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/serializer.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/sso.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/statistics.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/theme-engine.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/transaction.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/userinfo.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/wps.xml
portals/jetspeed-2/portal/trunk/pom.xml
Modified: portals/jetspeed-2/portal/trunk/app-servers/security/jboss/src/java/META-INF/jboss-secsvc/jboss-security-service.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/app-servers/security/jboss/src/java/META-INF/jboss-secsvc/jboss-security-service.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/app-servers/security/jboss/src/java/META-INF/jboss-secsvc/jboss-security-service.xml (original)
+++ portals/jetspeed-2/portal/trunk/app-servers/security/jboss/src/java/META-INF/jboss-secsvc/jboss-security-service.xml Wed Mar 26 18:18:18 2008
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -16,8 +15,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<beans>
-
+<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">
+
<import resource="security-providers.xml" />
<import resource="security-spi-atn.xml" />
<import resource="security-spi-atz.xml" />
Modified: portals/jetspeed-2/portal/trunk/app-servers/security/jboss/src/java/META-INF/jboss-secsvc/security-providers.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/app-servers/security/jboss/src/java/META-INF/jboss-secsvc/security-providers.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/app-servers/security/jboss/src/java/META-INF/jboss-secsvc/security-providers.xml (original)
+++ portals/jetspeed-2/portal/trunk/app-servers/security/jboss/src/java/META-INF/jboss-secsvc/security-providers.xml Wed Mar 26 18:18:18 2008
@@ -1,55 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<beans>
-
- <!-- ************** Security Providers ************** -->
- <!-- 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>
-
- <!-- Security: Authentication Provider Proxy -->
- <bean id="org.apache.jetspeed.security.AuthenticationProviderProxy"
- class="org.apache.jetspeed.security.impl.AuthenticationProviderProxyImpl"
- >
- <constructor-arg >
- <list>
- <ref bean="org.apache.jetspeed.security.AuthenticationProvider"/>
- </list>
- </constructor-arg>
- <constructor-arg ><value>DefaultAuthenticator</value></constructor-arg>
- </bean>
-
- <!-- Security: Security Provider -->
- <bean id="org.apache.jetspeed.security.SecurityProvider"
- class="org.apache.jetspeed.security.impl.SecurityProviderImpl"
- >
- <constructor-arg ><ref bean="org.apache.jetspeed.security.AuthenticationProviderProxy"/></constructor-arg>
- <constructor-arg ><ref bean="org.apache.jetspeed.security.spi.RoleSecurityHandler"/></constructor-arg>
- <constructor-arg ><ref bean="org.apache.jetspeed.security.spi.GroupSecurityHandler"/></constructor-arg>
- <constructor-arg ><ref bean="org.apache.jetspeed.security.spi.SecurityMappingHandler"/></constructor-arg>
- </bean>
-
-</beans>
+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 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">
+
+ <!-- ************** Security Providers ************** -->
+ <!-- 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>
+
+ <!-- Security: Authentication Provider Proxy -->
+ <bean id="org.apache.jetspeed.security.AuthenticationProviderProxy"
+ class="org.apache.jetspeed.security.impl.AuthenticationProviderProxyImpl"
+ >
+ <constructor-arg >
+ <list>
+ <ref bean="org.apache.jetspeed.security.AuthenticationProvider"/>
+ </list>
+ </constructor-arg>
+ <constructor-arg ><value>DefaultAuthenticator</value></constructor-arg>
+ </bean>
+
+ <!-- Security: Security Provider -->
+ <bean id="org.apache.jetspeed.security.SecurityProvider"
+ class="org.apache.jetspeed.security.impl.SecurityProviderImpl"
+ >
+ <constructor-arg ><ref bean="org.apache.jetspeed.security.AuthenticationProviderProxy"/></constructor-arg>
+ <constructor-arg ><ref bean="org.apache.jetspeed.security.spi.RoleSecurityHandler"/></constructor-arg>
+ <constructor-arg ><ref bean="org.apache.jetspeed.security.spi.GroupSecurityHandler"/></constructor-arg>
+ <constructor-arg ><ref bean="org.apache.jetspeed.security.spi.SecurityMappingHandler"/></constructor-arg>
+ </bean>
+
+</beans>
Modified: portals/jetspeed-2/portal/trunk/app-servers/security/jboss/src/java/META-INF/jboss-secsvc/security-spi.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/app-servers/security/jboss/src/java/META-INF/jboss-secsvc/security-spi.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/app-servers/security/jboss/src/java/META-INF/jboss-secsvc/security-spi.xml (original)
+++ portals/jetspeed-2/portal/trunk/app-servers/security/jboss/src/java/META-INF/jboss-secsvc/security-spi.xml Wed Mar 26 18:18:18 2008
@@ -1,48 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<beans>
-
- <!-- ************** Security SPI Handlers ************** -->
- <!-- Security SPI: CommonQueries -->
- <bean id="org.apache.jetspeed.security.spi.impl.SecurityAccessImpl"
- class="org.apache.jetspeed.security.spi.impl.SecurityAccessImpl"
- init-method="init"
- >
- <constructor-arg ><value>JETSPEED-INF/ojb/security_repository.xml</value></constructor-arg>
- <property name="jcdAlias"><value>JetspeedSecurityServiceDS</value></property>
- </bean>
-
- <bean id="org.apache.jetspeed.security.spi.SecurityAccess" parent="baseTransactionProxy"
- name="SecurityCommonQueries" >
- <property name="proxyInterfaces">
- <value>org.apache.jetspeed.security.spi.SecurityAccess</value>
- </property>
- <property name="target">
- <ref bean="org.apache.jetspeed.security.spi.impl.SecurityAccessImpl"/>
- </property>
- <property name="transactionAttributes">
- <props>
- <prop key="remove*">PROPAGATION_REQUIRED</prop>
- <prop key="set*">PROPAGATION_REQUIRED</prop>
- <prop key="*">PROPAGATION_SUPPORTS</prop>
- </props>
- </property>
- </bean>
-
-</beans>
+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 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">
+
+ <!-- ************** Security SPI Handlers ************** -->
+ <!-- Security SPI: CommonQueries -->
+ <bean id="org.apache.jetspeed.security.spi.impl.SecurityAccessImpl"
+ class="org.apache.jetspeed.security.spi.impl.SecurityAccessImpl"
+ init-method="init"
+ >
+ <constructor-arg ><value>JETSPEED-INF/ojb/security_repository.xml</value></constructor-arg>
+ <property name="jcdAlias"><value>JetspeedSecurityServiceDS</value></property>
+ </bean>
+
+ <bean id="org.apache.jetspeed.security.spi.SecurityAccess" parent="baseTransactionProxy"
+ name="SecurityCommonQueries" >
+ <property name="proxyInterfaces">
+ <value>org.apache.jetspeed.security.spi.SecurityAccess</value>
+ </property>
+ <property name="target">
+ <ref bean="org.apache.jetspeed.security.spi.impl.SecurityAccessImpl"/>
+ </property>
+ <property name="transactionAttributes">
+ <props>
+ <prop key="remove*">PROPAGATION_REQUIRED</prop>
+ <prop key="set*">PROPAGATION_REQUIRED</prop>
+ <prop key="*">PROPAGATION_SUPPORTS</prop>
+ </props>
+ </property>
+ </bean>
+
+</beans>
Modified: portals/jetspeed-2/portal/trunk/app-servers/security/jboss/src/java/META-INF/jboss-secsvc/transaction.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/app-servers/security/jboss/src/java/META-INF/jboss-secsvc/transaction.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/app-servers/security/jboss/src/java/META-INF/jboss-secsvc/transaction.xml (original)
+++ portals/jetspeed-2/portal/trunk/app-servers/security/jboss/src/java/META-INF/jboss-secsvc/transaction.xml Wed Mar 26 18:18:18 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -15,39 +15,40 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-
-<!--
- - Application context definition for PortletRegistry using Apache OJB.
- -->
-<beans>
-
- <!-- Transaction manager for a single OJB PersistenceBroker (alternative to JTA) -->
- <bean id="transactionManager" class="org.springframework.orm.ojb.PersistenceBrokerTransactionManager">
- <property name="jcdAlias"><value>JetspeedSecurityServiceDS</value></property>
- </bean>
-
- <!-- Transaction manager that delegates to JTA (for a transactional JNDI DataSource) -->
- <!--
- <bean id="transactionManager" class="org.springframework.transaction.jta.JtaTransactionManager"/>
- -->
-
-
-
- <!--
- - A parent bean definition which is a base definition for transaction proxies.
- - It is markes as abstract, since it is never supposed to be instantiated itself.
- - We set shared transaction attributes here, following our naming patterns.
- - The attributes can still be overridden in child bean definitions.
- -->
- <bean id="baseTransactionProxy" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean"
- abstract="true">
- <property name="transactionManager"><ref bean="transactionManager"/></property>
- <property name="transactionAttributes">
- <props>
- <prop key="*">PROPAGATION_REQUIRED</prop>
- </props>
- </property>
- </bean>
-
-</beans>
+<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">
+
+ <!--
+ - Application context definition for PortletRegistry using Apache OJB.
+ -->
+
+ <!-- Transaction manager for a single OJB PersistenceBroker (alternative to JTA) -->
+ <bean id="transactionManager" class="org.springframework.orm.ojb.PersistenceBrokerTransactionManager">
+ <property name="jcdAlias"><value>JetspeedSecurityServiceDS</value></property>
+ </bean>
+
+ <!-- Transaction manager that delegates to JTA (for a transactional JNDI DataSource) -->
+ <!--
+ <bean id="transactionManager" class="org.springframework.transaction.jta.JtaTransactionManager"/>
+ -->
+
+
+
+ <!--
+ - A parent bean definition which is a base definition for transaction proxies.
+ - It is markes as abstract, since it is never supposed to be instantiated itself.
+ - We set shared transaction attributes here, following our naming patterns.
+ - The attributes can still be overridden in child bean definitions.
+ -->
+ <bean id="baseTransactionProxy" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean"
+ abstract="true">
+ <property name="transactionManager"><ref bean="transactionManager"/></property>
+ <property name="transactionAttributes">
+ <props>
+ <prop key="*">PROPAGATION_REQUIRED</prop>
+ </props>
+ </property>
+ </bean>
+
+</beans>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-capability/src/test/resources/boot/datasource.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-capability/src/test/resources/boot/datasource.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-capability/src/test/resources/boot/datasource.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-capability/src/test/resources/boot/datasource.xml Wed Mar 26 18:18:18 2008
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
-
+<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="ojbConfigurer" class="org.springframework.orm.ojb.support.LocalOjbConfigurer"/>
<bean id="PlatformConfigurator" class="org.apache.jetspeed.components.rdbms.ojb.DatabasePlatformConfigurator" init-method="init">
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-capability/src/test/resources/serializer.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-capability/src/test/resources/serializer.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-capability/src/test/resources/serializer.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-capability/src/test/resources/serializer.xml Wed Mar 26 18:18:18 2008
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-
-<beans>
-
+<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="serializer" class="org.apache.jetspeed.serializer.JetspeedSerializerImpl">
<constructor-arg index="0">
<list>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/test/java/org/apache/jetspeed/cache/general/cache-test.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/test/java/org/apache/jetspeed/cache/general/cache-test.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/test/java/org/apache/jetspeed/cache/general/cache-test.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/test/java/org/apache/jetspeed/cache/general/cache-test.xml Wed Mar 26 18:18:18 2008
@@ -15,12 +15,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-
-<!--
- - Application context definition for PortletEntity using Apache OJB.
+<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">
+
+ <!--
+ - Application context definition for PortletEntity using Apache OJB.
-->
-<beans>
<!-- define our caching service. This one uses a simple hashmap and counts method access
- for testing purposes
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/database-page-manager.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/database-page-manager.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/database-page-manager.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/database-page-manager.xml Wed Mar 26 18:18:18 2008
@@ -1,50 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<beans>
-
- <!-- Page Manager -->
- <bean id="org.apache.jetspeed.page.PageManagerImpl"
- name="pageManagerImpl"
- init-method="init"
- class="org.apache.jetspeed.page.impl.DatabasePageManager">
- <!-- OJB configuration file resource path -->
- <constructor-arg index="0"><value>JETSPEED-INF/ojb/page-manager-repository.xml</value></constructor-arg>
- <!-- folder/page/link cache size, default=128, min=128 -->
- <constructor-arg index="1"><value>128</value></constructor-arg>
- <!-- folder/page/link cache expires seconds, default=150, infinite=0, min=30 -->
- <constructor-arg index="2"><value>0</value></constructor-arg>
- <!-- permissions security enabled flag, default=false -->
- <constructor-arg index="3"><value>false</value></constructor-arg>
- <!-- constraints security enabled flag, default=true -->
- <constructor-arg index="4"><value>false</value></constructor-arg>
- </bean>
-
- <!-- Transaction Proxying -->
- <bean id="org.apache.jetspeed.page.PageManager" name="pageManager" parent="baseTransactionProxy">
- <property name="proxyInterfaces">
- <value>org.apache.jetspeed.page.PageManager</value>
- </property>
- <property name="target">
- <ref bean="pageManagerImpl" />
- </property>
- <property name="transactionAttributes">
- <props>
+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 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">
+
+ <!-- Page Manager -->
+ <bean id="org.apache.jetspeed.page.PageManagerImpl"
+ name="pageManagerImpl"
+ init-method="init"
+ class="org.apache.jetspeed.page.impl.DatabasePageManager">
+ <!-- OJB configuration file resource path -->
+ <constructor-arg index="0"><value>JETSPEED-INF/ojb/page-manager-repository.xml</value></constructor-arg>
+ <!-- folder/page/link cache size, default=128, min=128 -->
+ <constructor-arg index="1"><value>128</value></constructor-arg>
+ <!-- folder/page/link cache expires seconds, default=150, infinite=0, min=30 -->
+ <constructor-arg index="2"><value>0</value></constructor-arg>
+ <!-- permissions security enabled flag, default=false -->
+ <constructor-arg index="3"><value>false</value></constructor-arg>
+ <!-- constraints security enabled flag, default=true -->
+ <constructor-arg index="4"><value>false</value></constructor-arg>
+ </bean>
+
+ <!-- Transaction Proxying -->
+ <bean id="org.apache.jetspeed.page.PageManager" name="pageManager" parent="baseTransactionProxy">
+ <property name="proxyInterfaces">
+ <value>org.apache.jetspeed.page.PageManager</value>
+ </property>
+ <property name="target">
+ <ref bean="pageManagerImpl" />
+ </property>
+ <property name="transactionAttributes">
+ <props>
<prop key="getPage*">PROPAGATION_SUPPORTS</prop>
<prop key="getLink*">PROPAGATION_SUPPORTS</prop>
<prop key="getFolder*">PROPAGATION_SUPPORTS</prop>
@@ -64,19 +65,19 @@
<prop key="linkExists">PROPAGATION_SUPPORTS</prop>
<prop key="userFolderExists">PROPAGATION_SUPPORTS</prop>
<prop key="userPageExists">PROPAGATION_SUPPORTS</prop>
- </props>
- </property>
- </bean>
-
- <!-- Inject Page Manager Proxy into Page Manager -->
- <bean id="injectPageManagerProxy" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
- <property name="targetObject"><ref bean="pageManagerImpl"/></property>
- <property name="targetMethod"><value>setPageManagerProxy</value></property>
- <property name="arguments">
- <list>
- <ref bean="pageManager"/>
- </list>
- </property>
- </bean>
-
-</beans>
+ </props>
+ </property>
+ </bean>
+
+ <!-- Inject Page Manager Proxy into Page Manager -->
+ <bean id="injectPageManagerProxy" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+ <property name="targetObject"><ref bean="pageManagerImpl"/></property>
+ <property name="targetMethod"><value>setPageManagerProxy</value></property>
+ <property name="arguments">
+ <list>
+ <ref bean="pageManager"/>
+ </list>
+ </property>
+ </bean>
+
+</beans>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/interceptors.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/interceptors.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/interceptors.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/interceptors.xml Wed Mar 26 18:18:18 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -15,69 +15,71 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
- Database PSML Manager Interception for handling Cache Rollback
- We also have examples here of replay interception for failover to
- a second database on update failures
- -->
-<beans>
-
- <bean id="pageManagerInterceptor" class="org.apache.jetspeed.util.interceptors.PageManagerInterceptor">
- </bean>
-
-
- <bean id="PageManagerTransactionProxy" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean"
- abstract="true">
- <property name="transactionManager"><ref bean="transactionManager"/></property>
- <property name="transactionAttributes">
- <props>
- <prop key="*">PROPAGATION_REQUIRED</prop>
- </props>
- </property>
- <property name="preInterceptors">
- <list>
- <ref local="pageManagerInterceptor" />
- </list>
- </property>
- </bean>
-
- <!--
- Replay support:
-
- <bean id="replayTransactionProxy" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean"
- abstract="true">
- <property name="transactionManager"><ref bean="transactionManager"/></property>
- <property name="transactionAttributes">
- <props>
- <prop key="*">PROPAGATION_REQUIRED</prop>
- </props>
- </property>
- <property name="preInterceptors">
- <list>
- <ref local="methodReplayInterceptor" />
- </list>
- </property>
- </bean>
-
- <bean id="replayDecisionMakerBean"
- class="org.apache.jetspeed.util.interceptors.TransactionalMethodReplayDecisionMaker">
- <property name="sqlErrorCodes">
- <value>9999, 400, -80</value>
- <value>9999</value>
- </property>
- </bean>
-
- <bean id="methodReplayInterceptor" class="org.apache.jetspeed.util.interceptors.MethodReplayInterceptor">
- <property name="retryCount">
- <value>3</value>
- </property>
- <property name="retryInterval">
- <value>500</value></property> retry every 500 milliseconds
- <property name="replayDecisionMaker">
- <ref bean="replayDecisionMakerBean"/>
- </property>
- </bean>
- -->
-
-</beans>
+<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">
+
+ <!--
+ Database PSML Manager Interception for handling Cache Rollback
+ We also have examples here of replay interception for failover to
+ a second database on update failures
+ -->
+
+ <bean id="pageManagerInterceptor" class="org.apache.jetspeed.util.interceptors.PageManagerInterceptor">
+ </bean>
+
+
+ <bean id="PageManagerTransactionProxy" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean"
+ abstract="true">
+ <property name="transactionManager"><ref bean="transactionManager"/></property>
+ <property name="transactionAttributes">
+ <props>
+ <prop key="*">PROPAGATION_REQUIRED</prop>
+ </props>
+ </property>
+ <property name="preInterceptors">
+ <list>
+ <ref local="pageManagerInterceptor" />
+ </list>
+ </property>
+ </bean>
+
+ <!--
+ Replay support:
+
+ <bean id="replayTransactionProxy" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean"
+ abstract="true">
+ <property name="transactionManager"><ref bean="transactionManager"/></property>
+ <property name="transactionAttributes">
+ <props>
+ <prop key="*">PROPAGATION_REQUIRED</prop>
+ </props>
+ </property>
+ <property name="preInterceptors">
+ <list>
+ <ref local="methodReplayInterceptor" />
+ </list>
+ </property>
+ </bean>
+
+ <bean id="replayDecisionMakerBean"
+ class="org.apache.jetspeed.util.interceptors.TransactionalMethodReplayDecisionMaker">
+ <property name="sqlErrorCodes">
+ <value>9999, 400, -80</value>
+ <value>9999</value>
+ </property>
+ </bean>
+
+ <bean id="methodReplayInterceptor" class="org.apache.jetspeed.util.interceptors.MethodReplayInterceptor">
+ <property name="retryCount">
+ <value>3</value>
+ </property>
+ <property name="retryInterval">
+ <value>500</value></property> retry every 500 milliseconds
+ <property name="replayDecisionMaker">
+ <ref bean="replayDecisionMakerBean"/>
+ </property>
+ </bean>
+ -->
+
+</beans>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/secure-database-page-manager.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/secure-database-page-manager.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/secure-database-page-manager.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/secure-database-page-manager.xml Wed Mar 26 18:18:18 2008
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -16,8 +15,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<beans>
-
+<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">
+
<!-- Page Manager -->
<bean id="org.apache.jetspeed.page.PageManagerImpl"
name="securePageManagerImpl"
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/secure-permissions-database-page-manager.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/secure-permissions-database-page-manager.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/secure-permissions-database-page-manager.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/secure-permissions-database-page-manager.xml Wed Mar 26 18:18:18 2008
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -16,8 +15,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<beans>
-
+<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">
+
<!-- Page Manager -->
<bean id="org.apache.jetspeed.page.PageManagerImpl"
name="securePermissionsPageManagerImpl"
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/tx-page-manager.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/tx-page-manager.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/tx-page-manager.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/tx-page-manager.xml Wed Mar 26 18:18:18 2008
@@ -1,50 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<beans>
-
- <!-- Page Manager -->
- <bean id="org.apache.jetspeed.page.PageManagerImpl"
- name="securePageManagerImpl"
- init-method="init"
- class="org.apache.jetspeed.page.impl.DatabasePageManager">
- <!-- OJB configuration file resource path -->
- <constructor-arg index="0"><value>JETSPEED-INF/ojb/page-manager-repository.xml</value></constructor-arg>
- <!-- folder/page/link cache size, default=128, min=128 -->
- <constructor-arg index="1"><value>128</value></constructor-arg>
- <!-- folder/page/link cache expires seconds, default=150, infinite=0, min=30 -->
- <constructor-arg index="2"><value>0</value></constructor-arg>
- <!-- permissions security enabled flag, default=false -->
- <constructor-arg index="3"><value>false</value></constructor-arg>
- <!-- constraints security enabled flag, default=true -->
- <constructor-arg index="4"><value>false</value></constructor-arg>
- </bean>
-
- <!-- Transaction Proxying -->
- <bean id="org.apache.jetspeed.page.PageManager" name="pageManager" parent="PageManagerTransactionProxy">
- <property name="proxyInterfaces">
- <value>org.apache.jetspeed.page.PageManager</value>
- </property>
- <property name="target">
- <ref bean="securePageManagerImpl" />
- </property>
- <property name="transactionAttributes">
- <props>
+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 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">
+
+ <!-- Page Manager -->
+ <bean id="org.apache.jetspeed.page.PageManagerImpl"
+ name="securePageManagerImpl"
+ init-method="init"
+ class="org.apache.jetspeed.page.impl.DatabasePageManager">
+ <!-- OJB configuration file resource path -->
+ <constructor-arg index="0"><value>JETSPEED-INF/ojb/page-manager-repository.xml</value></constructor-arg>
+ <!-- folder/page/link cache size, default=128, min=128 -->
+ <constructor-arg index="1"><value>128</value></constructor-arg>
+ <!-- folder/page/link cache expires seconds, default=150, infinite=0, min=30 -->
+ <constructor-arg index="2"><value>0</value></constructor-arg>
+ <!-- permissions security enabled flag, default=false -->
+ <constructor-arg index="3"><value>false</value></constructor-arg>
+ <!-- constraints security enabled flag, default=true -->
+ <constructor-arg index="4"><value>false</value></constructor-arg>
+ </bean>
+
+ <!-- Transaction Proxying -->
+ <bean id="org.apache.jetspeed.page.PageManager" name="pageManager" parent="PageManagerTransactionProxy">
+ <property name="proxyInterfaces">
+ <value>org.apache.jetspeed.page.PageManager</value>
+ </property>
+ <property name="target">
+ <ref bean="securePageManagerImpl" />
+ </property>
+ <property name="transactionAttributes">
+ <props>
<prop key="getPage*">PROPAGATION_SUPPORTS</prop>
<prop key="getLink*">PROPAGATION_SUPPORTS</prop>
<prop key="getFolder*">PROPAGATION_SUPPORTS</prop>
@@ -64,19 +65,19 @@
<prop key="linkExists">PROPAGATION_SUPPORTS</prop>
<prop key="userFolderExists">PROPAGATION_SUPPORTS</prop>
<prop key="userPageExists">PROPAGATION_SUPPORTS</prop>
- </props>
- </property>
- </bean>
-
- <!-- Inject Page Manager Proxy into Page Manager -->
- <bean id="injectPageManagerProxy" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
- <property name="targetObject"><ref bean="securePageManagerImpl"/></property>
- <property name="targetMethod"><value>setPageManagerProxy</value></property>
- <property name="arguments">
- <list>
- <ref bean="pageManager"/>
- </list>
- </property>
- </bean>
-
-</beans>
+ </props>
+ </property>
+ </bean>
+
+ <!-- Inject Page Manager Proxy into Page Manager -->
+ <bean id="injectPageManagerProxy" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+ <property name="targetObject"><ref bean="securePageManagerImpl"/></property>
+ <property name="targetMethod"><value>setPageManagerProxy</value></property>
+ <property name="arguments">
+ <list>
+ <ref bean="pageManager"/>
+ </list>
+ </property>
+ </bean>
+
+</beans>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/boot/datasource.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/boot/datasource.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/boot/datasource.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/boot/datasource.xml Wed Mar 26 18:18:18 2008
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
-
+<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="ojbConfigurer" class="org.springframework.orm.ojb.support.LocalOjbConfigurer"/>
<bean id="PlatformConfigurator" class="org.apache.jetspeed.components.rdbms.ojb.DatabasePlatformConfigurator" init-method="init">
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/java/JETSPEED-INF/spring/test-spring.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/java/JETSPEED-INF/spring/test-spring.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/java/JETSPEED-INF/spring/test-spring.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/java/JETSPEED-INF/spring/test-spring.xml Wed Mar 26 18:18:18 2008
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -17,9 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<!-- Portal Site Test Spring Configuration-->
-<beans>
+<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">
+
+ <!-- Portal Site Test Spring Configuration-->
<!-- IDGenerator -->
<bean id="IdGenerator"
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/assembly/page-manager.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/assembly/page-manager.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/assembly/page-manager.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/assembly/page-manager.xml Wed Mar 26 18:18:18 2008
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -16,7 +15,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<beans>
+<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">
<!-- PageManager -->
<bean id="PsmlDocumentHandler"
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/assembly/test-layout-api.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/assembly/test-layout-api.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/assembly/test-layout-api.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/assembly/test-layout-api.xml Wed Mar 26 18:18:18 2008
@@ -15,8 +15,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+<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">
<!-- AJAX Actions
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/assembly/test-layout-constraints-api.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/assembly/test-layout-constraints-api.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/assembly/test-layout-constraints-api.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/assembly/test-layout-constraints-api.xml Wed Mar 26 18:18:18 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -15,71 +15,72 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
-
-<!-- AJAX Actions
-
- == Constructor Arguments ==
- index 0 = render response VM template, generates XML NORMAL response
- index 1 = render response VM template, generates XML ERROR response
- index 1 = action name from AJAX Request
-
- -->
-
-<!--bean id="PortletActionSecurityBehavior"
- class="org.apache.jetspeed.layout.impl.PortletActionSecurityPathBehavior">
- <constructor-arg index='0'>
- <ref bean="org.apache.jetspeed.page.PageManager"/>
- </constructor-arg>
-</bean-->
-
-<bean id="AjaxSecurityConstraints"
- class="org.apache.jetspeed.layout.impl.SecurityConstraintsAction">
- <constructor-arg index="0">
- <value>org/apache/jetspeed/layout/ajax-xml/constraints.vm</value>
- </constructor-arg>
- <constructor-arg index="1">
- <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
- </constructor-arg>
- <constructor-arg index='2'>
- <ref bean="org.apache.jetspeed.page.PageManager"/>
- </constructor-arg>
-</bean>
-
-
-
-<bean id="AjaxRequestService" class="org.apache.jetspeed.ajax.AjaxRequestServiceImpl">
- <constructor-arg index="0">
- <map>
- <entry key="constraints">
- <ref bean="AjaxSecurityConstraints"/>
- </entry>
- </map>
- </constructor-arg>
- <constructor-arg index="1">
- <ref bean="AjaxVelocityEngine"/>
- </constructor-arg>
-</bean>
-
-<bean id="AjaxVelocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean">
- <property name="velocityProperties">
- <props>
- <prop key="resource.loader">class</prop>
- <prop key="class.resource.loader.class">
- org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
- </prop>
- </props>
- </property>
- </bean>
-
- <bean id="layoutValve"
- class="org.apache.jetspeed.layout.impl.LayoutValve"
- init-method="initialize">
- <constructor-arg index="0">
- <ref bean="AjaxRequestService"/>
- </constructor-arg>
- </bean>
-
-
+<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">
+
+<!-- AJAX Actions
+
+ == Constructor Arguments ==
+ index 0 = render response VM template, generates XML NORMAL response
+ index 1 = render response VM template, generates XML ERROR response
+ index 1 = action name from AJAX Request
+
+ -->
+
+<!--bean id="PortletActionSecurityBehavior"
+ class="org.apache.jetspeed.layout.impl.PortletActionSecurityPathBehavior">
+ <constructor-arg index='0'>
+ <ref bean="org.apache.jetspeed.page.PageManager"/>
+ </constructor-arg>
+</bean-->
+
+<bean id="AjaxSecurityConstraints"
+ class="org.apache.jetspeed.layout.impl.SecurityConstraintsAction">
+ <constructor-arg index="0">
+ <value>org/apache/jetspeed/layout/ajax-xml/constraints.vm</value>
+ </constructor-arg>
+ <constructor-arg index="1">
+ <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+ </constructor-arg>
+ <constructor-arg index='2'>
+ <ref bean="org.apache.jetspeed.page.PageManager"/>
+ </constructor-arg>
+</bean>
+
+
+
+<bean id="AjaxRequestService" class="org.apache.jetspeed.ajax.AjaxRequestServiceImpl">
+ <constructor-arg index="0">
+ <map>
+ <entry key="constraints">
+ <ref bean="AjaxSecurityConstraints"/>
+ </entry>
+ </map>
+ </constructor-arg>
+ <constructor-arg index="1">
+ <ref bean="AjaxVelocityEngine"/>
+ </constructor-arg>
+</bean>
+
+<bean id="AjaxVelocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean">
+ <property name="velocityProperties">
+ <props>
+ <prop key="resource.loader">class</prop>
+ <prop key="class.resource.loader.class">
+ org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+ </prop>
+ </props>
+ </property>
+ </bean>
+
+ <bean id="layoutValve"
+ class="org.apache.jetspeed.layout.impl.LayoutValve"
+ init-method="initialize">
+ <constructor-arg index="0">
+ <ref bean="AjaxRequestService"/>
+ </constructor-arg>
+ </bean>
+
+
</beans>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/JETSPEED-INF/spring/user-info.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/JETSPEED-INF/spring/user-info.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/JETSPEED-INF/spring/user-info.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/JETSPEED-INF/spring/user-info.xml Wed Mar 26 18:18:18 2008
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -16,8 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<beans>
- <!-- User Info -->
+<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">
+
+ <!-- User Info -->
<bean id="org.apache.jetspeed.userinfo.UserInfoManager"
class="org.apache.jetspeed.userinfo.impl.UserInfoManagerImpl"
>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/boot/datasource.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/boot/datasource.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/boot/datasource.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/boot/datasource.xml Wed Mar 26 18:18:18 2008
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
-
+<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="ojbConfigurer" class="org.springframework.orm.ojb.support.LocalOjbConfigurer"/>
<bean id="PlatformConfigurator" class="org.apache.jetspeed.components.rdbms.ojb.DatabasePlatformConfigurator" init-method="init">
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/rc2.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/rc2.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/rc2.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/rc2.xml Wed Mar 26 18:18:18 2008
@@ -1,35 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<beans>
-
- <bean id="org.apache.jetspeed.userinfo.UserInfoManager"
- class="org.apache.jetspeed.userinfo.MockUserInfoManager"
- >
- </bean>
-
- <bean id="org.apache.jetspeed.request.RequestContextComponent" class="org.apache.jetspeed.request.JetspeedRequestContextComponent">
- <constructor-arg>
- <value>org.apache.jetspeed.request.JetspeedRequestContext</value>
- </constructor-arg>
- <constructor-arg>
- <ref bean="org.apache.jetspeed.userinfo.UserInfoManager" />
- </constructor-arg>
- </bean>
-
-</beans>
+ 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 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="org.apache.jetspeed.userinfo.UserInfoManager"
+ class="org.apache.jetspeed.userinfo.MockUserInfoManager"
+ >
+ </bean>
+
+ <bean id="org.apache.jetspeed.request.RequestContextComponent" class="org.apache.jetspeed.request.JetspeedRequestContextComponent">
+ <constructor-arg>
+ <value>org.apache.jetspeed.request.JetspeedRequestContext</value>
+ </constructor-arg>
+ <constructor-arg>
+ <ref bean="org.apache.jetspeed.userinfo.UserInfoManager" />
+ </constructor-arg>
+ </bean>
+
+</beans>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/rc3.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/rc3.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/rc3.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/rc3.xml Wed Mar 26 18:18:18 2008
@@ -1,30 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<beans>
-
- <bean id="org.apache.jetspeed.request.RequestContextComponent" class="org.apache.jetspeed.request.JetspeedRequestContextComponent">
- <constructor-arg>
- <value>org.apache.jetspeed.request.JetspeedRequestContext</value>
- </constructor-arg>
- <constructor-arg>
- <ref bean="org.apache.jetspeed.userinfo.UserInfoManager" />
- </constructor-arg>
- </bean>
-
-</beans>
+ 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 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="org.apache.jetspeed.request.RequestContextComponent" class="org.apache.jetspeed.request.JetspeedRequestContextComponent">
+ <constructor-arg>
+ <value>org.apache.jetspeed.request.JetspeedRequestContext</value>
+ </constructor-arg>
+ <constructor-arg>
+ <ref bean="org.apache.jetspeed.userinfo.UserInfoManager" />
+ </constructor-arg>
+ </bean>
+
+</beans>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/system-properties.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/system-properties.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/system-properties.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/system-properties.xml Wed Mar 26 18:18:18 2008
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -16,8 +15,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<beans>
-
+<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="placeholderConfig" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
</beans>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-prefs/src/test/resources/boot/datasource.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-prefs/src/test/resources/boot/datasource.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-prefs/src/test/resources/boot/datasource.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-prefs/src/test/resources/boot/datasource.xml Wed Mar 26 18:18:18 2008
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
-
+<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="ojbConfigurer" class="org.springframework.orm.ojb.support.LocalOjbConfigurer"/>
<bean id="PlatformConfigurator" class="org.apache.jetspeed.components.rdbms.ojb.DatabasePlatformConfigurator" init-method="init">
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/resources/boot/datasource.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/resources/boot/datasource.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/resources/boot/datasource.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/resources/boot/datasource.xml Wed Mar 26 18:18:18 2008
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
-
+<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="ojbConfigurer" class="org.springframework.orm.ojb.support.LocalOjbConfigurer"/>
<bean id="PlatformConfigurator" class="org.apache.jetspeed.components.rdbms.ojb.DatabasePlatformConfigurator" init-method="init">
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/resources/serializer.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/resources/serializer.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/resources/serializer.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/resources/serializer.xml Wed Mar 26 18:18:18 2008
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-
-<beans>
-
+<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="serializer" class="org.apache.jetspeed.serializer.JetspeedSerializerImpl">
<constructor-arg index="0">
<list>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/resources/boot/datasource.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/resources/boot/datasource.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/resources/boot/datasource.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/resources/boot/datasource.xml Wed Mar 26 18:18:18 2008
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
-
+<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="ojbConfigurer" class="org.springframework.orm.ojb.support.LocalOjbConfigurer"/>
<bean id="PlatformConfigurator" class="org.apache.jetspeed.components.rdbms.ojb.DatabasePlatformConfigurator" init-method="init">
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/resources/registry-test.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/resources/registry-test.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/resources/registry-test.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/resources/registry-test.xml Wed Mar 26 18:18:18 2008
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -16,8 +15,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<beans>
-
+<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">
+
<!-- Portlet Factory -->
<bean id="portletFactory" class="org.apache.jetspeed.factory.JetspeedPortletFactory"></bean>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/JETSPEED-INF/directory/config/apacheds/setup1/security-spi-ldap.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/JETSPEED-INF/directory/config/apacheds/setup1/security-spi-ldap.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/JETSPEED-INF/directory/config/apacheds/setup1/security-spi-ldap.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/JETSPEED-INF/directory/config/apacheds/setup1/security-spi-ldap.xml Wed Mar 26 18:18:18 2008
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -16,9 +15,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<beans>
-
-
+<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">
+
<!-- ************** Ldap Configuration ************** -->
<bean id="org.apache.jetspeed.security.spi.impl.ldap.LdapBindingConfig"
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/JETSPEED-INF/directory/config/apacheds/setup2/security-spi-ldap.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/JETSPEED-INF/directory/config/apacheds/setup2/security-spi-ldap.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/JETSPEED-INF/directory/config/apacheds/setup2/security-spi-ldap.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/JETSPEED-INF/directory/config/apacheds/setup2/security-spi-ldap.xml Wed Mar 26 18:18:18 2008
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -16,10 +15,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<beans>
-
-
-
+<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">
+
<!-- ************** Ldap Configuration ************** -->
<bean id="org.apache.jetspeed.security.spi.impl.ldap.LdapBindingConfig"
class="org.apache.jetspeed.security.spi.impl.ldap.LdapBindingConfig">
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/JETSPEED-INF/directory/config/apacheds/setup3/security-spi-ldap.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/JETSPEED-INF/directory/config/apacheds/setup3/security-spi-ldap.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/JETSPEED-INF/directory/config/apacheds/setup3/security-spi-ldap.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/JETSPEED-INF/directory/config/apacheds/setup3/security-spi-ldap.xml Wed Mar 26 18:18:18 2008
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -16,10 +15,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<beans>
-
-
-
+<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">
+
<!-- ************** Ldap Configuration ************** -->
<bean id="org.apache.jetspeed.security.spi.impl.ldap.LdapBindingConfig"
class="org.apache.jetspeed.security.spi.impl.ldap.LdapBindingConfig">
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org