portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r646449 [7/7] - in /portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly: ./ alternate/ alternate/versioned-deployment/ boot/
Date Wed, 09 Apr 2008 17:55:05 GMT
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=646449&r1=646448&r2=646449&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 Wed Apr  9 10:54:56 2008
@@ -1,65 +1,84 @@
 <?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.
+  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 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">
-    
+<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 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 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 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>
-  
+
   <!-- Security: Authorization Provider -->
-  <bean id="org.apache.jetspeed.security.AuthorizationProvider" 
-  	   class="org.apache.jetspeed.security.impl.AuthorizationProviderImpl"
-  >  	   
-  	   <constructor-arg index="0"><ref bean="org.apache.jetspeed.security.impl.RdbmsPolicy"/></constructor-arg>
-  	   <!-- Does not use the default policy as a default behavior -->
-  	   <constructor-arg index="1"><value>false</value></constructor-arg>   
+  <bean id="org.apache.jetspeed.security.AuthorizationProvider"
+    class="org.apache.jetspeed.security.impl.AuthorizationProviderImpl">
+    <constructor-arg index="0">
+      <ref bean="org.apache.jetspeed.security.impl.RdbmsPolicy" />
+    </constructor-arg>
+    <!-- Does not use the default policy as a default behavior -->
+    <constructor-arg index="1">
+      <value>false</value>
+    </constructor-arg>
   </bean>
 
 </beans>

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=646449&r1=646448&r2=646449&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 Wed Apr  9 10:54:56 2008
@@ -1,140 +1,151 @@
 <?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.
+  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 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">
-    
+<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 ************** -->
 
   <!-- 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>       
-    -->       
+  <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>       
+  -->
 
   <!-- MessageDigest encode passwords using SHA-1 -->
-  <bean id="org.apache.jetspeed.security.spi.CredentialPasswordEncoder" 
-       class="org.apache.jetspeed.security.spi.impl.MessageDigestCredentialPasswordEncoder">
-       <constructor-arg index="0"><value>SHA-1</value></constructor-arg>       
-  </bean>       
+  <bean id="org.apache.jetspeed.security.spi.CredentialPasswordEncoder"
+    class="org.apache.jetspeed.security.spi.impl.MessageDigestCredentialPasswordEncoder">
+    <constructor-arg index="0">
+      <value>SHA-1</value>
+    </constructor-arg>
+  </bean>
 
   <!-- Alternate Password Encoder with Jetspeed-1 algorithm -->
   <!--
-  <bean id="org.apache.jetspeed.security.spi.CredentialPasswordEncoder" 
-       class="org.apache.jetspeed.security.spi.impl.Jetspeed1CredentialPasswordEncoder">
-       <constructor-arg index="0"><value>SHA</value></constructor-arg>
-       <constructor-arg index="1"><value>base64</value></constructor-arg>
-  </bean>       
+    <bean id="org.apache.jetspeed.security.spi.CredentialPasswordEncoder" 
+    class="org.apache.jetspeed.security.spi.impl.Jetspeed1CredentialPasswordEncoder">
+    <constructor-arg index="0"><value>SHA</value></constructor-arg>
+    <constructor-arg index="1"><value>base64</value></constructor-arg>
+    </bean>       
   -->
-  
-  <bean id="org.apache.jetspeed.security.spi.PasswordCredentialProvider" 
-       class="org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialProvider">
-       <constructor-arg index="0"><ref bean="org.apache.jetspeed.security.spi.CredentialPasswordValidator"/></constructor-arg>       
-       <constructor-arg index="1"><ref bean="org.apache.jetspeed.security.spi.CredentialPasswordEncoder"/></constructor-arg>       
-  </bean>       
+
+  <bean id="org.apache.jetspeed.security.spi.PasswordCredentialProvider"
+    class="org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialProvider">
+    <constructor-arg index="0">
+      <ref bean="org.apache.jetspeed.security.spi.CredentialPasswordValidator" />
+    </constructor-arg>
+    <constructor-arg index="1">
+      <ref bean="org.apache.jetspeed.security.spi.CredentialPasswordEncoder" />
+    </constructor-arg>
+  </bean>
 
   <!-- A Two-way encoding password service which also implements CredentialPasswordEncoder
-         this Service can be used instead of for example the default provided MessageDigestCredentialPasswordEncoder
-  <bean id="org.apache.jetspeed.security.PasswordEncodingService"
-        name="org.apache.jetspeed.security.spi.CredentialPasswordEncoder"
-        class="org.apache.jetspeed.security.spi.impl.PBEPasswordService">
+    this Service can be used instead of for example the default provided MessageDigestCredentialPasswordEncoder
+    <bean id="org.apache.jetspeed.security.PasswordEncodingService"
+    name="org.apache.jetspeed.security.spi.CredentialPasswordEncoder"
+    class="org.apache.jetspeed.security.spi.impl.PBEPasswordService">
     <constructor-arg index="0">
-      <!- secret PBE key password ->
-      <value>********</value>
+    <!- secret PBE key password ->
+    <value>********</value>
     </constructor-arg>       
-  </bean>       
--->
+    </bean>       
+  -->
 
- <!-- A Two-way encoding password service which also implements CredentialPasswordEncoder
-       Furthermore, this extension of the PBEPasswordService supports lazy upgrading from an old CredentialPasswordEncoder
-       like the default provided MessageDigestCredentialPasswordEncoder
-  ->
-  <bean id="org.apache.jetspeed.security.PasswordEncodingService"
-        name="org.apache.jetspeed.security.spi.CredentialPasswordEncoder"
-        class="org.apache.jetspeed.security.spi.impl.AlgorithmUpgradePBEPasswordService">
+  <!-- A Two-way encoding password service which also implements CredentialPasswordEncoder
+    Furthermore, this extension of the PBEPasswordService supports lazy upgrading from an old CredentialPasswordEncoder
+    like the default provided MessageDigestCredentialPasswordEncoder
+    ->
+    <bean id="org.apache.jetspeed.security.PasswordEncodingService"
+    name="org.apache.jetspeed.security.spi.CredentialPasswordEncoder"
+    class="org.apache.jetspeed.security.spi.impl.AlgorithmUpgradePBEPasswordService">
     <constructor-arg index="0">
-      <!- secret PBE key password ->
-      <value>********</value>
+    <!- secret PBE key password ->
+    <value>********</value>
     </constructor-arg>
     <constructor-arg index="1">
-      <!- old MessageDigestCredentialPasswordEncoder to be upgrading from, using SHA-1 ->
-      <bean class="org.apache.jetspeed.security.spi.impl.MessageDigestCredentialPasswordEncoder">
-       <constructor-arg index="0"><value>SHA-1</value></constructor-arg>       
-      </bean>       
+    <!- old MessageDigestCredentialPasswordEncoder to be upgrading from, using SHA-1 ->
+    <bean class="org.apache.jetspeed.security.spi.impl.MessageDigestCredentialPasswordEncoder">
+    <constructor-arg index="0"><value>SHA-1</value></constructor-arg>       
+    </bean>       
     </constructor-arg>
     <constructor-arg index="2">
-      <!- startPBEPasswordEncodingService: date before which old encoded passwords need to be recoded (on authentication)
-           (SimpleDateFormat) format: yyyy-MM-dd HH:mm:ss
-      ->
-      <value>2006-07-02 15:00:00</value>
+    <!- startPBEPasswordEncodingService: date before which old encoded passwords need to be recoded (on authentication)
+    (SimpleDateFormat) format: yyyy-MM-dd HH:mm:ss
+    ->
+    <value>2006-07-02 15:00:00</value>
     </constructor-arg>
-  </bean>
--->
+    </bean>
+  -->
 
-  <!-- allow multiple InternalPasswordCredentialInterceptors to be used for DefaultCredentialHandler --> 
+  <!-- allow multiple InternalPasswordCredentialInterceptors to be used for DefaultCredentialHandler -->
   <bean id="org.apache.jetspeed.security.spi.InternalPasswordCredentialInterceptor"
-       class="org.apache.jetspeed.security.spi.impl.InternalPasswordCredentialInterceptorsProxy">
-       <constructor-arg index="0">
-         <list>
-           <!-- enforce an invalid preset password value in the persisent store is required to be changed -->
-           <bean class="org.apache.jetspeed.security.spi.impl.ValidatePasswordOnLoadInterceptor"/>
-
-           <!-- ensure preset cleartext passwords in the persistent store  will be encoded on first use -->
-           <bean class="org.apache.jetspeed.security.spi.impl.EncodePasswordOnFirstLoadInterceptor"/>
-         </list>
-       </constructor-arg>
+    class="org.apache.jetspeed.security.spi.impl.InternalPasswordCredentialInterceptorsProxy">
+    <constructor-arg index="0">
+      <list>
+        <!-- enforce an invalid preset password value in the persisent store is required to be changed -->
+        <bean class="org.apache.jetspeed.security.spi.impl.ValidatePasswordOnLoadInterceptor" />
+
+        <!-- ensure preset cleartext passwords in the persistent store  will be encoded on first use -->
+        <bean class="org.apache.jetspeed.security.spi.impl.EncodePasswordOnFirstLoadInterceptor" />
+      </list>
+    </constructor-arg>
   </bean>
 
   <!-- Security SPI: CredentialHandler -->
-  <bean id="org.apache.jetspeed.security.spi.CredentialHandler" 
-       class="org.apache.jetspeed.security.spi.impl.DefaultCredentialHandler"
-  >       
-       <constructor-arg index="0"><ref bean="org.apache.jetspeed.security.spi.SecurityAccess"/></constructor-arg>       
-       <constructor-arg index="1"><ref bean="org.apache.jetspeed.security.spi.PasswordCredentialProvider"/></constructor-arg>       
-       <constructor-arg index="2"><ref bean="org.apache.jetspeed.security.spi.InternalPasswordCredentialInterceptor"/></constructor-arg>       
+  <bean id="org.apache.jetspeed.security.spi.CredentialHandler"
+    class="org.apache.jetspeed.security.spi.impl.DefaultCredentialHandler">
+    <constructor-arg index="0">
+      <ref bean="org.apache.jetspeed.security.spi.SecurityAccess" />
+    </constructor-arg>
+    <constructor-arg index="1">
+      <ref bean="org.apache.jetspeed.security.spi.PasswordCredentialProvider" />
+    </constructor-arg>
+    <constructor-arg index="2">
+      <ref bean="org.apache.jetspeed.security.spi.InternalPasswordCredentialInterceptor" />
+    </constructor-arg>
   </bean>
-  
+
   <!-- Security SPI: UserSecurityHandler -->
   <!-- The DefaultUSerSecurityHandler uses the raw SecurityAccessImpl so that it
-  	   may demarcate its own transactions -->
-  <bean id="org.apache.jetspeed.security.spi.UserSecurityHandlerImpl" 
-  	   class="org.apache.jetspeed.security.spi.impl.DefaultUserSecurityHandler"
-  >  	   
-  	   <constructor-arg ><ref bean="org.apache.jetspeed.security.spi.SecurityAccess"/></constructor-arg>  	   
+    may demarcate its own transactions -->
+  <bean id="org.apache.jetspeed.security.spi.UserSecurityHandlerImpl"
+    class="org.apache.jetspeed.security.spi.impl.DefaultUserSecurityHandler">
+    <constructor-arg>
+      <ref bean="org.apache.jetspeed.security.spi.SecurityAccess" />
+    </constructor-arg>
+  </bean>
+
+  <bean id="org.apache.jetspeed.security.spi.UserSecurityHandler" parent="baseTransactionProxy"
+    name="userSecurityHandler">
+    <property name="proxyInterfaces">
+      <value>org.apache.jetspeed.security.spi.UserSecurityHandler</value>
+    </property>
+    <property name="target">
+      <ref bean="org.apache.jetspeed.security.spi.UserSecurityHandlerImpl" />
+    </property>
+    <property name="transactionAttributes">
+      <props>
+        <prop key="*">PROPAGATION_REQUIRED</prop>
+      </props>
+    </property>
   </bean>
-  
-  <bean id="org.apache.jetspeed.security.spi.UserSecurityHandler" parent="baseTransactionProxy" 
-		name="userSecurityHandler" >
-		<property name="proxyInterfaces">
-			<value>org.apache.jetspeed.security.spi.UserSecurityHandler</value>
-		</property>
-		<property name="target">
-			<ref bean="org.apache.jetspeed.security.spi.UserSecurityHandlerImpl"/>
-		</property>
-		<property name="transactionAttributes">
-			<props>				
-				<prop key="*">PROPAGATION_REQUIRED</prop>
-			</props>
-		</property>
-   </bean>
 
 </beans>

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=646449&r1=646448&r2=646449&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 Wed Apr  9 10:54:56 2008
@@ -1,45 +1,47 @@
 <?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.
+  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 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 ************** -->  
+<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: RoleSecurityHandler -->
-  <bean id="org.apache.jetspeed.security.spi.RoleSecurityHandler" 
-  	   class="org.apache.jetspeed.security.spi.impl.DefaultRoleSecurityHandler"
-  >  	   
-  	   <constructor-arg ><ref bean="org.apache.jetspeed.security.spi.SecurityAccess"/></constructor-arg>
+  <bean id="org.apache.jetspeed.security.spi.RoleSecurityHandler"
+    class="org.apache.jetspeed.security.spi.impl.DefaultRoleSecurityHandler">
+    <constructor-arg>
+      <ref bean="org.apache.jetspeed.security.spi.SecurityAccess" />
+    </constructor-arg>
   </bean>
-  
+
   <!-- Security SPI: GroupSecurityHandler -->
-  <bean id="org.apache.jetspeed.security.spi.GroupSecurityHandler" 
-  	   class="org.apache.jetspeed.security.spi.impl.DefaultGroupSecurityHandler"
-  >  	   
-  	   <constructor-arg ><ref bean="org.apache.jetspeed.security.spi.SecurityAccess"/></constructor-arg>
+  <bean id="org.apache.jetspeed.security.spi.GroupSecurityHandler"
+    class="org.apache.jetspeed.security.spi.impl.DefaultGroupSecurityHandler">
+    <constructor-arg>
+      <ref bean="org.apache.jetspeed.security.spi.SecurityAccess" />
+    </constructor-arg>
   </bean>
-  
+
   <!-- Security SPI: SecurityMappingHandler -->
-  <bean id="org.apache.jetspeed.security.spi.SecurityMappingHandler" 
-  	   class="org.apache.jetspeed.security.spi.impl.DefaultSecurityMappingHandler"
-  >  	   
-  	   <constructor-arg ><ref bean="org.apache.jetspeed.security.spi.SecurityAccess"/></constructor-arg>
-  	   <!-- Default role hierarchy strategy is by generalization.  Add contructor-arg to change the strategy. -->
-  	   <!-- Default group hierarchy strategy is by generalization.  Add contructor-arg to change the strategy. -->
+  <bean id="org.apache.jetspeed.security.spi.SecurityMappingHandler"
+    class="org.apache.jetspeed.security.spi.impl.DefaultSecurityMappingHandler">
+    <constructor-arg>
+      <ref bean="org.apache.jetspeed.security.spi.SecurityAccess" />
+    </constructor-arg>
+    <!-- Default role hierarchy strategy is by generalization.  Add contructor-arg to change the strategy. -->
+    <!-- Default group hierarchy strategy is by generalization.  Add contructor-arg to change the strategy. -->
   </bean>
 </beans>

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=646449&r1=646448&r2=646449&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 Wed Apr  9 10:54:56 2008
@@ -1,48 +1,47 @@
 <?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.
+  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 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">
-    
+<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>  	   
+  <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>
+  </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>
-  
-  <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/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=646449&r1=646448&r2=646449&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 Wed Apr  9 10:54:56 2008
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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.serializer.JetspeedSerializer" name="JetspeedSerializer" class="org.apache.jetspeed.serializer.JetspeedSerializerImpl">
+<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.serializer.JetspeedSerializer" name="JetspeedSerializer"
+    class="org.apache.jetspeed.serializer.JetspeedSerializerImpl">
     <constructor-arg index="0">
       <list>
         <bean class="org.apache.jetspeed.serializer.JetspeedCapabilitiesSerializer">

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=646449&r1=646448&r2=646449&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 Wed Apr  9 10:54:56 2008
@@ -1,51 +1,51 @@
 <?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.
+  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 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">
-    
-    <!-- SSO Implementation -->
-    <bean id="PersistenceBrokerSSOProvider" class="org.apache.jetspeed.sso.impl.PersistenceBrokerSSOProvider" init-method="init">
-        <constructor-arg index="0">
-            <value>JETSPEED-INF/ojb/sso_repository.xml</value>
-        </constructor-arg>
-    </bean>
+<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.sso.SSOProvider" parent="baseTransactionProxy" name="ssoProvider">
-        <property name="proxyInterfaces">
-            <value>org.apache.jetspeed.sso.SSOProvider</value>
-        </property>
+  <!-- SSO Implementation -->
+  <bean id="PersistenceBrokerSSOProvider" class="org.apache.jetspeed.sso.impl.PersistenceBrokerSSOProvider"
+    init-method="init">
+    <constructor-arg index="0">
+      <value>JETSPEED-INF/ojb/sso_repository.xml</value>
+    </constructor-arg>
+  </bean>
 
-        <property name="target">
-            <ref bean="PersistenceBrokerSSOProvider" />
-        </property>
-        <property name="transactionAttributes">
-            <props>
-                <prop key="addSite*">PROPAGATION_REQUIRED</prop>
-                <prop key="updateSite*">PROPAGATION_REQUIRED</prop>
-                <prop key="removeSite">PROPAGATION_REQUIRED</prop>
-                <prop key="addCredentialsForSite">PROPAGATION_REQUIRED</prop>
-                <prop key="updateCredentialsForSite">PROPAGATION_REQUIRED</prop>
-                <prop key="removeCredentialsForSite">PROPAGATION_REQUIRED</prop>
-                <prop key="setRealmForSite">PROPAGATION_REQUIRED</prop>
-                <prop key="*">PROPAGATION_SUPPORTS</prop>
-            </props>
-        </property>
+  <bean id="org.apache.jetspeed.sso.SSOProvider" parent="baseTransactionProxy" name="ssoProvider">
+    <property name="proxyInterfaces">
+      <value>org.apache.jetspeed.sso.SSOProvider</value>
+    </property>
 
-    </bean>
+    <property name="target">
+      <ref bean="PersistenceBrokerSSOProvider" />
+    </property>
+    <property name="transactionAttributes">
+      <props>
+        <prop key="addSite*">PROPAGATION_REQUIRED</prop>
+        <prop key="updateSite*">PROPAGATION_REQUIRED</prop>
+        <prop key="removeSite">PROPAGATION_REQUIRED</prop>
+        <prop key="addCredentialsForSite">PROPAGATION_REQUIRED</prop>
+        <prop key="updateCredentialsForSite">PROPAGATION_REQUIRED</prop>
+        <prop key="removeCredentialsForSite">PROPAGATION_REQUIRED</prop>
+        <prop key="setRealmForSite">PROPAGATION_REQUIRED</prop>
+        <prop key="*">PROPAGATION_SUPPORTS</prop>
+      </props>
+    </property>
+
+  </bean>
 </beans>

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=646449&r1=646448&r2=646449&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 Wed Apr  9 10:54:56 2008
@@ -1,64 +1,80 @@
 <?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.
+  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 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">
-    
-    <!-- Statistics Implementation -->
-    <bean id="PortalStatistics" 
-          class="org.apache.jetspeed.statistics.impl.PortalStatisticsImpl"
-          init-method="springInit"
-          destroy-method="springDestroy"
-          >
-        <!-- logToCLF -->
-      	<constructor-arg index='0' type="boolean"><value>false</value></constructor-arg>
-		
-		<!-- logToDatabase -->
-      	<constructor-arg  index='1'  type="boolean"><value>true</value></constructor-arg>
-		
-		<!-- maxRecordToFlush_Portal -->
-      	<constructor-arg   index='2' ><value>300</value></constructor-arg>
-		
-		<!-- maxRecordToFlush_User -->
-      	<constructor-arg   index='3'><value>50</value></constructor-arg>
-		
-		<!-- maxRecordToFlush_Page -->
-      	<constructor-arg   index='4' ><value>100</value></constructor-arg>
-		
-		<!-- maxTimeMsToFlush_Portal -->
-      	<constructor-arg  index='5'  ><value>300000</value></constructor-arg>
-		
-		<!-- maxTimeMsToFlush_User -->
-      	<constructor-arg  index='6'  ><value>5000</value></constructor-arg>
-		
-		<!-- maxTimeMsToFlush_Page -->
-      	<constructor-arg  index='7' ><value>60000</value></constructor-arg>
-		
-		<!-- jetspeedDSEntry -->
-      	<constructor-arg  index='8' ><ref bean="JetspeedDS" /></constructor-arg>
-	</bean>
-	
-    <!-- Audit Activity Implementation -->
-    <bean id="org.apache.jetspeed.audit.AuditActivity" 
-          class="org.apache.jetspeed.audit.impl.AuditActivityImpl"
-          >
-      	<constructor-arg  index='0' ><ref bean="JetspeedDS" /></constructor-arg>
-		<property name="enabled"><value type='boolean'>true</value></property>          
-	</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">
+
+  <!-- Statistics Implementation -->
+  <bean id="PortalStatistics" class="org.apache.jetspeed.statistics.impl.PortalStatisticsImpl" init-method="springInit"
+    destroy-method="springDestroy">
+    <!-- logToCLF -->
+    <constructor-arg index='0' type="boolean">
+      <value>false</value>
+    </constructor-arg>
+
+    <!-- logToDatabase -->
+    <constructor-arg index='1' type="boolean">
+      <value>true</value>
+    </constructor-arg>
+
+    <!-- maxRecordToFlush_Portal -->
+    <constructor-arg index='2'>
+      <value>300</value>
+    </constructor-arg>
+
+    <!-- maxRecordToFlush_User -->
+    <constructor-arg index='3'>
+      <value>50</value>
+    </constructor-arg>
+
+    <!-- maxRecordToFlush_Page -->
+    <constructor-arg index='4'>
+      <value>100</value>
+    </constructor-arg>
+
+    <!-- maxTimeMsToFlush_Portal -->
+    <constructor-arg index='5'>
+      <value>300000</value>
+    </constructor-arg>
+
+    <!-- maxTimeMsToFlush_User -->
+    <constructor-arg index='6'>
+      <value>5000</value>
+    </constructor-arg>
+
+    <!-- maxTimeMsToFlush_Page -->
+    <constructor-arg index='7'>
+      <value>60000</value>
+    </constructor-arg>
+
+    <!-- jetspeedDSEntry -->
+    <constructor-arg index='8'>
+      <ref bean="JetspeedDS" />
+    </constructor-arg>
+  </bean>
+
+  <!-- Audit Activity Implementation -->
+  <bean id="org.apache.jetspeed.audit.AuditActivity" class="org.apache.jetspeed.audit.impl.AuditActivityImpl">
+    <constructor-arg index='0'>
+      <ref bean="JetspeedDS" />
+    </constructor-arg>
+    <property name="enabled">
+      <value type='boolean'>true</value>
+    </property>
+  </bean>
+
 </beans>

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=646449&r1=646448&r2=646449&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 Wed Apr  9 10:54:56 2008
@@ -1,40 +1,38 @@
 <?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
+  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 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">
 
-    http://www.apache.org/licenses/LICENSE-2.0
+  <bean id="ResourceValidator" class="org.apache.jetspeed.decoration.validators.WebApplicationResourceValidator" />
 
-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="ResourceValidator" class="org.apache.jetspeed.decoration.validators.WebApplicationResourceValidator"/>
-  
-  <bean id="DecorationFactory"
-      class="org.apache.jetspeed.decoration.DecorationFactoryImpl">
-    <constructor-arg index="0">    
- 	 	<ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
-	</constructor-arg>	  	  
+  <bean id="DecorationFactory" class="org.apache.jetspeed.decoration.DecorationFactoryImpl">
+    <constructor-arg index="0">
+      <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
+    </constructor-arg>
     <constructor-arg index="1">
       <value>/decorations</value>
     </constructor-arg>
-	<constructor-arg index="2">
-		<ref bean="ResourceValidator" />
-	</constructor-arg>
+    <constructor-arg index="2">
+      <ref bean="ResourceValidator" />
+    </constructor-arg>
     <constructor-arg index="3">
-        <ref bean="decorationConfigurationCache" />
+      <ref bean="decorationConfigurationCache" />
     </constructor-arg>
-  </bean>  
-	
+  </bean>
+
 </beans>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/transaction.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/transaction.xml?rev=646449&r1=646448&r2=646449&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 Wed Apr  9 10:54:56 2008
@@ -6,45 +6,46 @@
   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
-
+  
+  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">
-    
-   <!--
-      - 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"/>
+<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" />
+
+  <!-- Transaction manager that delegates to JTA (for a transactional JNDI DataSource) -->
+  <!--
+    <bean id="transactionManager" class="org.springframework.transaction.jta.JtaTransactionManager"/>
+  -->
 
-	<!-- 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>
 
-	<!--
-		- 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/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=646449&r1=646448&r2=646449&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 Wed Apr  9 10:54:56 2008
@@ -1,53 +1,55 @@
 <?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.
+  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 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">
-    
-<!-- Single Source User Info -->
-  <bean id="org.apache.jetspeed.userinfo.UserInfoManager" 
-  	   class="org.apache.jetspeed.userinfo.impl.UserInfoManagerImpl"
-  >
-     <constructor-arg index="0"><ref bean="org.apache.jetspeed.security.UserManager"/></constructor-arg>  	     	   
-     <constructor-arg index="1"><ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/></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">
 
+  <!-- Single Source User Info -->
+  <bean id="org.apache.jetspeed.userinfo.UserInfoManager"
+    class="org.apache.jetspeed.userinfo.impl.UserInfoManagerImpl">
+    <constructor-arg index="0">
+      <ref bean="org.apache.jetspeed.security.UserManager" />
+    </constructor-arg>
+    <constructor-arg index="1">
+      <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
+    </constructor-arg>
+  </bean>
 
-<!-- Multi-source User Info Manager 
 
-  <bean id="org.apache.jetspeed.userinfo.UserInfoManager" 	
-         class="org.apache.jetspeed.userinfo.impl.MultiSourceUserInfoManagerImpl">
-		 <property name="portletRegistry">
-		    <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/>
-		  </property>
-		  <property name="sources">
-		     <list>
-		         <ref bean="org.apache.jetspeed.userinfo.impl.UserManagerUserAttributeSourceImpl"/>
-		     </list>
-	     </property>
-  </bean>
-  
-  <bean id="org.apache.jetspeed.userinfo.impl.UserManagerUserAttributeSourceImpl"	
+  <!-- Multi-source User Info Manager 
+    
+    <bean id="org.apache.jetspeed.userinfo.UserInfoManager" 	
+    class="org.apache.jetspeed.userinfo.impl.MultiSourceUserInfoManagerImpl">
+    <property name="portletRegistry">
+    <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/>
+    </property>
+    <property name="sources">
+    <list>
+    <ref bean="org.apache.jetspeed.userinfo.impl.UserManagerUserAttributeSourceImpl"/>
+    </list>
+    </property>
+    </bean>
+    
+    <bean id="org.apache.jetspeed.userinfo.impl.UserManagerUserAttributeSourceImpl"	
     class="org.apache.jetspeed.userinfo.impl.UserManagerUserAttributeSourceImpl">      
-      <property name="userManager">
-         <ref bean="org.apache.jetspeed.security.UserManager"/>
-      </property>
-  </bean>
+    <property name="userManager">
+    <ref bean="org.apache.jetspeed.security.UserManager"/>
+    </property>
+    </bean>
   -->
-  
+
 </beans>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/wps.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/wps.xml?rev=646449&r1=646448&r2=646449&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/wps.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/wps.xml Wed Apr  9 10:54:56 2008
@@ -6,22 +6,21 @@
   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
-
+  
+  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">
-    
-    <!-- required for websphere, uncomment if running under websphere
-         see:  http://issues.apache.org/jira/browse/JS2-355
+<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">
+
+  <!-- required for websphere, uncomment if running under websphere
+    see:  http://issues.apache.org/jira/browse/JS2-355
     <bean id="org.apache.jetspeed.request.PortalRequestFactory" class="org.apache.jetspeed.request.PortalRequestFactoryImpl"/>
-      -->
-    
+  -->
+
 </beans>



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


Mime
View raw message