Return-Path: 
 <jetspeed-dev-return-31821-apmail-portals-jetspeed-dev-archive=portals.apache.org@portals.apache.org>
Delivered-To: apmail-portals-jetspeed-dev-archive@www.apache.org
Received: (qmail 47717 invoked from network); 9 Apr 2008 17:56:17 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 9 Apr 2008 17:56:17 -0000
Received: (qmail 25710 invoked by uid 500); 9 Apr 2008 17:56:16 -0000
Delivered-To: apmail-portals-jetspeed-dev-archive@portals.apache.org
Received: (qmail 25670 invoked by uid 500); 9 Apr 2008 17:56:16 -0000
Mailing-List: contact jetspeed-dev-help@portals.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:jetspeed-dev-help@portals.apache.org>
List-Unsubscribe: <mailto:jetspeed-dev-unsubscribe@portals.apache.org>
List-Post: <mailto:jetspeed-dev@portals.apache.org>
List-Id: <jetspeed-dev.portals.apache.org>
Reply-To: "Jetspeed Developers List" <jetspeed-dev@portals.apache.org>
Delivered-To: mailing list jetspeed-dev@portals.apache.org
Received: (qmail 25656 invoked by uid 99); 9 Apr 2008 17:56:15 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Apr 2008 10:56:15 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Apr 2008 17:55:20 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 844FF1A983A; Wed,  9 Apr 2008 10:55:38 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r646449 [2/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 -0000
To: jetspeed-dev@portals.apache.org
From: ate@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080409175538.844FF1A983A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/ajax.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/ajax.xml?rev=646449&r1=646448&r2=646449&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/ajax.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/ajax.xml Wed Apr  9 10:54:56 2008
@@ -1,81 +1,75 @@
 <?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">
-    
-  <bean id="AJAXService"
-      class="org.apache.jetspeed.ajax.AJAXServiceImpl">
+<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="AJAXService" class="org.apache.jetspeed.ajax.AJAXServiceImpl">
     <constructor-arg>
       <map>
-		<entry key="portletRegistry.getPortletApplications">
-			<value>
-			  org.apache.jetspeed.components.portletregistry.PortletRegistry	
-			</value>
-		</entry>
-		<entry key="portletRegistry.getPortletApplication">
-			<value>
-			  org.apache.jetspeed.components.portletregistry.PortletRegistry	
-			</value>
-		</entry>
-		<entry key="entityAccess.getPortletEntities">
-			<value>
-			  org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent
-			</value>
-		</entry>
-		<entry key="entityAccess.getPortletEntity">
-			<value>
-			  org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent
-			</value>
-		</entry>
-	  </map>
+        <entry key="portletRegistry.getPortletApplications">
+          <value>org.apache.jetspeed.components.portletregistry.PortletRegistry</value>
+        </entry>
+        <entry key="portletRegistry.getPortletApplication">
+          <value>org.apache.jetspeed.components.portletregistry.PortletRegistry</value>
+        </entry>
+        <entry key="entityAccess.getPortletEntities">
+          <value>org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent</value>
+        </entry>
+        <entry key="entityAccess.getPortletEntity">
+          <value>org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent</value>
+        </entry>
+      </map>
     </constructor-arg>
     <constructor-arg>
       <bean class="org.springframework.ui.velocity.VelocityEngineFactoryBean">
         <property name="velocityProperties">
-           <props>
-           <!-- use webapp-logging CommonsLoggingLog4JLogSystem for logging through IsolatedLog4JLogger -->
-           <prop key="runtime.log.logsystem.class">org.apache.jetspeed.webapp.logging.velocity.CommonsLoggingLog4JLogSystem</prop>
-           <prop key="runtime.log.logsystem.log4j.category">velocity</prop>
-           <!-- clear out default global VM_global_library.vm leading to ERROR logging because its not available -->
-           <prop key="velocimacro.library"></prop>
+          <props>
+            <!-- use webapp-logging CommonsLoggingLog4JLogSystem for logging through IsolatedLog4JLogger -->
+            <prop key="runtime.log.logsystem.class">
+              org.apache.jetspeed.webapp.logging.velocity.CommonsLoggingLog4JLogSystem
+            </prop>
+            <prop key="runtime.log.logsystem.log4j.category">velocity</prop>
+            <!-- clear out default global VM_global_library.vm leading to ERROR logging because its not available -->
+            <prop key="velocimacro.library"></prop>
           </props>
         </property>
         <!--  use our own CommonsLoggingLog4JLogSystem specified above, not the default one provided by Spring -->
-        <property name="overrideLogging"><value>false</value></property>
+        <property name="overrideLogging">
+          <value>false</value>
+        </property>
       </bean>
     </constructor-arg>
-  <constructor-arg>
+    <constructor-arg>
       <map>
-		<entry key="portletRegistry.getPortletApplications">
-			<value>/ajax/portlet_apps.ajax</value>
-		</entry>
-		<entry key="portletRegistry.getPortletApplication">
-			<value>/ajax/portlet_definitions.ajax</value>
-		</entry>
-		<entry key="entityAccess.getPortletEntities">
-			<value>/ajax/portlet_entities.ajax</value>
-		</entry>
-		<entry key="entityAccess.getPortletEntity">
-			<value>/ajax/portlet_entity.ajax</value>
-		</entry>
-	  </map>
-    </constructor-arg>    
-  </bean>  
-	
+        <entry key="portletRegistry.getPortletApplications">
+          <value>/ajax/portlet_apps.ajax</value>
+        </entry>
+        <entry key="portletRegistry.getPortletApplication">
+          <value>/ajax/portlet_definitions.ajax</value>
+        </entry>
+        <entry key="entityAccess.getPortletEntities">
+          <value>/ajax/portlet_entities.ajax</value>
+        </entry>
+        <entry key="entityAccess.getPortletEntity">
+          <value>/ajax/portlet_entity.ajax</value>
+        </entry>
+      </map>
+    </constructor-arg>
+  </bean>
+
 </beans>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/db-page-manager.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/db-page-manager.xml?rev=646449&r1=646448&r2=646449&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/db-page-manager.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/db-page-manager.xml Wed Apr  9 10:54:56 2008
@@ -1,91 +1,105 @@
 <?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">
+
   <!-- DB PageManager -->
-  <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=-1, infinite=0, min=30 -->
-      <!--                                         (default is 150 seconds) -->
-      <constructor-arg index="2"><value>-1</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>true</value></constructor-arg>
+  <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=-1, infinite=0, min=30 -->
+    <!--                                         (default is 150 seconds) -->
+    <constructor-arg index="2">
+      <value>-1</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>true</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="pageManagerImpl" />
-      </property>
-      <property name="transactionAttributes">
-          <props>
-              <prop key="getPage*">PROPAGATION_SUPPORTS</prop>  
-              <prop key="getLink*">PROPAGATION_SUPPORTS</prop>  
-              <prop key="getFolder*">PROPAGATION_SUPPORTS</prop>  
-              <prop key="getContentPage">PROPAGATION_SUPPORTS</prop>  
-              <prop key="getAll">PROPAGATION_SUPPORTS</prop>  
-              <prop key="getUserFolder">PROPAGATION_SUPPORTS</prop>  
-              <prop key="update*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
-              <prop key="removePage">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
-              <prop key="removeFolder">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
-              <prop key="removeLink">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
-              <prop key="removePageSecurity">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>                            
-              <prop key="createUserHomePagesFromRoles">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
-              <prop key="deepCopy*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
-              <prop key="addPages">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>              
-              <prop key="folderExists">PROPAGATION_SUPPORTS</prop>  
-              <prop key="pageExists">PROPAGATION_SUPPORTS</prop>  
-              <prop key="linkExists">PROPAGATION_SUPPORTS</prop>  
-              <prop key="userFolderExists">PROPAGATION_SUPPORTS</prop>  
-              <prop key="userPageExists">PROPAGATION_SUPPORTS</prop>  
-          </props>
-      </property>
+    <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>
+        <prop key="getContentPage">PROPAGATION_SUPPORTS</prop>
+        <prop key="getAll">PROPAGATION_SUPPORTS</prop>
+        <prop key="getUserFolder">PROPAGATION_SUPPORTS</prop>
+        <prop key="update*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+        <prop key="removePage">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+        <prop key="removeFolder">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+        <prop key="removeLink">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+        <prop key="removePageSecurity">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+        <prop key="createUserHomePagesFromRoles">
+          PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException
+        </prop>
+        <prop key="deepCopy*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+        <prop key="addPages">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+        <prop key="folderExists">PROPAGATION_SUPPORTS</prop>
+        <prop key="pageExists">PROPAGATION_SUPPORTS</prop>
+        <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>
+    <property name="targetObject">
+      <ref bean="pageManagerImpl" />
+    </property>
+    <property name="targetMethod">
+      <value>setPageManagerProxy</value>
+    </property>
+    <property name="arguments">
+      <list>
+        <ref bean="pageManager" />
+      </list>
+    </property>
   </bean>
 
   <!-- PortalSite -->
-  <bean id="org.apache.jetspeed.portalsite.PortalSite" 
-       name="portalSite"
-       class="org.apache.jetspeed.portalsite.impl.PortalSiteImpl">         
-       <constructor-arg index="0"><ref bean="pageManager"/></constructor-arg>
+  <bean id="org.apache.jetspeed.portalsite.PortalSite" name="portalSite"
+    class="org.apache.jetspeed.portalsite.impl.PortalSiteImpl">
+    <constructor-arg index="0">
+      <ref bean="pageManager" />
+    </constructor-arg>
   </bean>
 
 </beans>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/extended-pipelines.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/extended-pipelines.xml?rev=646449&r1=646448&r2=646449&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/extended-pipelines.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/extended-pipelines.xml Wed Apr  9 10:54:56 2008
@@ -1,54 +1,46 @@
 <?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">
+
   <!-- the three beans below are examples only -->
-  <bean id="propertyLoaderValve_1"
-        class="com.fmr.portal.pipeline.impl.PropertyLoaderValve"
-        init-method="initialize"> 
-      <constructor-arg index="0"> 
-          <value>php-properties</value>
-      </constructor-arg> 
-      <constructor-arg index="1"
-       type="org.apache.commons.configuration.PropertiesConfiguration"> 
-          <ref bean="ProductionConfiguration"/> 
-      </constructor-arg> 
+  <bean id="propertyLoaderValve_1" class="com.fmr.portal.pipeline.impl.PropertyLoaderValve" init-method="initialize">
+    <constructor-arg index="0">
+      <value>php-properties</value>
+    </constructor-arg>
+    <constructor-arg index="1" type="org.apache.commons.configuration.PropertiesConfiguration">
+      <ref bean="ProductionConfiguration" />
+    </constructor-arg>
   </bean>
-  
-  <bean id="propertyLoaderValve_2"
-        class="com.fmr.portal.pipeline.impl.PropertyLoaderValve"
-        init-method="initialize"> 
-      <constructor-arg index="0"> 
-          <value>php-properties</value>
-      </constructor-arg>  
-      <constructor-arg index="1">
-          <value>/apps/jetspeed/etc/jetspeed-production.properties</value>
-      </constructor-arg> 
+
+  <bean id="propertyLoaderValve_2" class="com.fmr.portal.pipeline.impl.PropertyLoaderValve" init-method="initialize">
+    <constructor-arg index="0">
+      <value>php-properties</value>
+    </constructor-arg>
+    <constructor-arg index="1">
+      <value>/apps/jetspeed/etc/jetspeed-production.properties</value>
+    </constructor-arg>
   </bean>
-  
-  <bean id="propertyLoaderValve_3"
-        class="com.fmr.portal.pipeline.impl.PropertyLoaderValve"
-         init-method="initialize"> 
-      <constructor-arg index="0"> 
-          <value>app.props</value>
-      </constructor-arg> 
+
+  <bean id="propertyLoaderValve_3" class="com.fmr.portal.pipeline.impl.PropertyLoaderValve" init-method="initialize">
+    <constructor-arg index="0">
+      <value>app.props</value>
+    </constructor-arg>
   </bean>
-    
+
 </beans>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/interceptors.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/interceptors.xml?rev=646449&r1=646448&r2=646449&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/interceptors.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/interceptors.xml Wed Apr  9 10:54:56 2008
@@ -6,80 +6,80 @@
   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">
-    
+<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="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>
+  <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:
-        
+  <!--    
+    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>
+    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 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>
+    <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/jetspeed-portal-resources/src/main/resources/assembly/alternate/jetty-override.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/jetty-override.xml?rev=646449&r1=646448&r2=646449&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/jetty-override.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/jetty-override.xml Wed Apr  9 10:54:56 2008
@@ -1,41 +1,56 @@
 <?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">
+
   <!-- Portlet Application and Decorator deployment event listeners -->
-  <bean id="portletAppDeploymentListener" 
-  	   class="org.apache.jetspeed.deployment.impl.JettyDeployPortletAppEventListener"   	   
-  > 	
-  	   <constructor-arg index="0"><ref bean="PAM"/></constructor-arg>
-  	   <constructor-arg index="1"><ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/></constructor-arg>
-       <constructor-arg index="2"><value>${autodeployment.target.dir}</value></constructor-arg>
-       <constructor-arg index="3"><value>${applicationRoot}/WEB-INF/apps</value></constructor-arg>
-       <constructor-arg index="4"><value>${autodeployment.staging.dir}/local</value></constructor-arg>
-       <!-- strip commons-logging and/or log4j jars from war files: for JBoss set this to true -->
-       <constructor-arg index="5"><value>false</value></constructor-arg>
-       <constructor-arg index="6"><value>${applicationRoot}/../../contexts</value></constructor-arg>
+  <bean id="portletAppDeploymentListener"
+    class="org.apache.jetspeed.deployment.impl.JettyDeployPortletAppEventListener">
+    <constructor-arg index="0">
+      <ref bean="PAM" />
+    </constructor-arg>
+    <constructor-arg index="1">
+      <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
+    </constructor-arg>
+    <constructor-arg index="2">
+      <value>${autodeployment.target.dir}</value>
+    </constructor-arg>
+    <constructor-arg index="3">
+      <value>${applicationRoot}/WEB-INF/apps</value>
+    </constructor-arg>
+    <constructor-arg index="4">
+      <value>${autodeployment.staging.dir}/local</value>
+    </constructor-arg>
+    <!-- strip commons-logging and/or log4j jars from war files: for JBoss set this to true -->
+    <constructor-arg index="5">
+      <value>false</value>
+    </constructor-arg>
+    <constructor-arg index="6">
+      <value>${applicationRoot}/../../contexts</value>
+    </constructor-arg>
   </bean>
 
-    <!-- Security: Session Manager -->
-    <bean id="org.apache.jetspeed.container.session.PortalSessionsManager" class="org.apache.jetspeed.container.session.PortalSessionsManagerImpl">
-  	  <constructor-arg><value type="boolean">false</value></constructor-arg>
-  	</bean>
+  <!-- Security: Session Manager -->
+  <bean id="org.apache.jetspeed.container.session.PortalSessionsManager"
+    class="org.apache.jetspeed.container.session.PortalSessionsManagerImpl">
+    <constructor-arg>
+      <value type="boolean">false</value>
+    </constructor-arg>
+  </bean>
 
 </beans>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/request-context.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/request-context.xml?rev=646449&r1=646448&r2=646449&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/request-context.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/request-context.xml Wed Apr  9 10:54:56 2008
@@ -1,39 +1,42 @@
 <?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">
-    
-    <!-- Request Context -->
-    <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>
-	<!-- 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>
+<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">
+
+  <!-- Request Context -->
+  <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>
+  <!-- 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>
 
 

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/seed-registry.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/seed-registry.xml?rev=646449&r1=646448&r2=646449&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/seed-registry.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/seed-registry.xml Wed Apr  9 10:54:56 2008
@@ -1,146 +1,161 @@
 <?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">
-    
-    <!-- Portlet Factory -->
-    <bean id="portletFactory" class="org.apache.jetspeed.factory.JetspeedPortletFactory">
-        <!-- If the following constructor-arg is set to true, 
-        proxy instances will switch config mode to built-in custom config mode portlet. -->
-        <constructor-arg index="0">
-            <value>false</value>
-        </constructor-arg>
-        <!-- If the following constructor-arg is set to true, 
-        proxy instances will switch edit_defaults mode to edit mode automatically for portlets not supporting edit_defaults mode. -->
-        <constructor-arg index="1">
-            <value>false</value>
-        </constructor-arg>
-        <!-- Surrogate portlet for config modes. -->
-        <property name="customConfigModePortletUniqueName">
-            <value>j2-admin::CustomConfigModePortlet</value>
-        </property>
-    </bean>
-
-    <!-- Portlet Registry DAO-->
-    <bean id="portletRegistryImpl" class="org.apache.jetspeed.components.portletregistry.PersistenceBrokerPortletRegistry" init-method="init">
-
-        <constructor-arg index="0">
-            <value>JETSPEED-INF/ojb/registry_repository.xml</value>
-        </constructor-arg>
-        <constructor-arg index="1">
-            <ref bean="portletFactory" />
-        </constructor-arg>
-        <constructor-arg index="2">
-            <ref bean="portletApplicationOidCache" />
-        </constructor-arg>
-        <constructor-arg index="3">
-            <ref bean="portletDefinitionOidCache" />
-        </constructor-arg>
-        <constructor-arg index="4">
-            <ref bean="portletApplicationNameCache" />
-        </constructor-arg>
-        <constructor-arg index="5">
-            <ref bean="portletDefinitionNameCache" />
-        </constructor-arg>        
-    </bean>
-
-    <bean id="org.apache.jetspeed.components.portletregistry.PortletRegistry" name="portletRegistry" parent="baseTransactionProxy">
-        <property name="proxyInterfaces">
-            <value>org.apache.jetspeed.components.portletregistry.PortletRegistry</value>
-        </property>
-
-        <property name="target">
-            <ref bean="portletRegistryImpl" />
-        </property>
-        <property name="transactionAttributes">
-            <props>
-                <prop key="register*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
-                <prop key="remove*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
-                <prop key="update*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
-                <prop key="save*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
-                <prop key="*">PROPAGATION_SUPPORTS</prop>
-            </props>
-        </property>
-    </bean>
+<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">
+    <!-- If the following constructor-arg is set to true, 
+      proxy instances will switch config mode to built-in custom config mode portlet. -->
+    <constructor-arg index="0">
+      <value>false</value>
+    </constructor-arg>
+    <!-- If the following constructor-arg is set to true, 
+      proxy instances will switch edit_defaults mode to edit mode automatically for portlets not supporting edit_defaults mode. -->
+    <constructor-arg index="1">
+      <value>false</value>
+    </constructor-arg>
+    <!-- Surrogate portlet for config modes. -->
+    <property name="customConfigModePortletUniqueName">
+      <value>j2-admin::CustomConfigModePortlet</value>
+    </property>
+  </bean>
+
+  <!-- Portlet Registry DAO-->
+  <bean id="portletRegistryImpl" class="org.apache.jetspeed.components.portletregistry.PersistenceBrokerPortletRegistry"
+    init-method="init">
+
+    <constructor-arg index="0">
+      <value>JETSPEED-INF/ojb/registry_repository.xml</value>
+    </constructor-arg>
+    <constructor-arg index="1">
+      <ref bean="portletFactory" />
+    </constructor-arg>
+    <constructor-arg index="2">
+      <ref bean="portletApplicationOidCache" />
+    </constructor-arg>
+    <constructor-arg index="3">
+      <ref bean="portletDefinitionOidCache" />
+    </constructor-arg>
+    <constructor-arg index="4">
+      <ref bean="portletApplicationNameCache" />
+    </constructor-arg>
+    <constructor-arg index="5">
+      <ref bean="portletDefinitionNameCache" />
+    </constructor-arg>
+  </bean>
+
+  <bean id="org.apache.jetspeed.components.portletregistry.PortletRegistry" name="portletRegistry"
+    parent="baseTransactionProxy">
+    <property name="proxyInterfaces">
+      <value>org.apache.jetspeed.components.portletregistry.PortletRegistry</value>
+    </property>
+
+    <property name="target">
+      <ref bean="portletRegistryImpl" />
+    </property>
+    <property name="transactionAttributes">
+      <props>
+        <prop key="register*">
+          PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException
+        </prop>
+        <prop key="remove*">
+          PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException
+        </prop>
+        <prop key="update*">
+          PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException
+        </prop>
+        <prop key="save*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
+        <prop key="*">PROPAGATION_SUPPORTS</prop>
+      </props>
+    </property>
+  </bean>
+
+  <!--
+    - PortletEntity business object: OJB implementation, as an inner bean wrapped
+    - by an outer transactional proxy. The two bean definitions could have been separate,
+    - but this is cleaner as there is no need to ever access the unwrapped object.
+  -->
+
+  <bean id="portletEntityAccessImpl"
+    class="org.apache.jetspeed.components.portletentity.PersistenceBrokerPortletEntityAccess">
+    <constructor-arg>
+      <ref bean="portletRegistry" />
+    </constructor-arg>
+    <constructor-arg>
+      <ref bean="org.apache.jetspeed.request.RequestContextComponent" />
+    </constructor-arg>
+    <!-- 
+      All preferences were shared. With JS2-449, preferences are now
+      stored 'per user'. The username is stored in the preferences FULL_PATH
+      To turn on mergeSharedPreferences configure this property to true 
+      This will NOT turn off per user prefs, 
+      but instead merge with them, where user prefs override.
+      boolean
+    -->
+    <constructor-arg>
+      <ref bean="org.apache.jetspeed.page.PageManager" />
+    </constructor-arg>
+    <constructor-arg type="boolean">
+      <value>false</value>
+    </constructor-arg>
+  </bean>
+
+  <bean id="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent" parent="baseTransactionProxy"
+    name="portletEntityAccess">
+    <property name="proxyInterfaces">
+      <value>org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent</value>
+    </property>
+    <property name="target">
+      <ref bean="portletEntityAccessImpl" />
+    </property>
     <!--
-        - PortletEntity business object: OJB implementation, as an inner bean wrapped
-        - by an outer transactional proxy. The two bean definitions could have been separate,
-        - but this is cleaner as there is no need to ever access the unwrapped object.
+      <property name="preInterceptors">
+      <list>
+      <ref bean="portletEntityCachingAdvisor"/>
+      <ref bean="portletEntityRemoveFromCacheAdvisor"/>
+      </list>
+      </property>
     -->
+    <property name="transactionAttributes">
+      <props>
+        <prop key="remove*">PROPAGATION_REQUIRED</prop>
+        <prop key="store*">
+          PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletentity.PortletEntityNotStoredException
+        </prop>
+        <prop key="*">PROPAGATION_SUPPORTS</prop>
+      </props>
+    </property>
+  </bean>
 
-    <bean id="portletEntityAccessImpl" class="org.apache.jetspeed.components.portletentity.PersistenceBrokerPortletEntityAccess">
-        <constructor-arg>
-            <ref bean="portletRegistry" />
-        </constructor-arg>
-        <constructor-arg>
-            <ref bean="org.apache.jetspeed.request.RequestContextComponent" />
-        </constructor-arg>    
-        <!-- 
-            All preferences were shared. With JS2-449, preferences are now
-            stored 'per user'. The username is stored in the preferences FULL_PATH
-            To turn on mergeSharedPreferences configure this property to true 
-            This will NOT turn off per user prefs, 
-             but instead merge with them, where user prefs override.
-            boolean
-          -->    
-        <constructor-arg>
-            <ref bean="org.apache.jetspeed.page.PageManager" />
-        </constructor-arg>
-        <constructor-arg type="boolean">
-            <value>false</value>
-        </constructor-arg>        
-    </bean>
-
-    <bean id="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent" parent="baseTransactionProxy" name="portletEntityAccess">
-        <property name="proxyInterfaces">
-            <value>org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent</value>
-        </property>
-        <property name="target">
-            <ref bean="portletEntityAccessImpl" />
-        </property>
-        <!--
-            <property name="preInterceptors">
-            <list>
-            <ref bean="portletEntityCachingAdvisor"/>
-            <ref bean="portletEntityRemoveFromCacheAdvisor"/>
-            </list>
-            </property>
-        -->
-        <property name="transactionAttributes">
-            <props>
-                <prop key="remove*">PROPAGATION_REQUIRED</prop>
-                <prop key="store*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletentity.PortletEntityNotStoredException</prop>
-                <prop key="*">PROPAGATION_SUPPORTS</prop>
-            </props>
-        </property>
-    </bean>
-    
   <!-- Inject Portlet Entity Proxy into Portlet Entity impl -->
   <bean id="injectEntityAccessProxy" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
-      <property name="targetObject"><ref bean="portletEntityAccessImpl"/></property>
-      <property name="targetMethod"><value>setEntityAccessProxy</value></property>
-      <property name="arguments">
-          <list>
-              <ref bean="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent"/>
-          </list>
-      </property>
+    <property name="targetObject">
+      <ref bean="portletEntityAccessImpl" />
+    </property>
+    <property name="targetMethod">
+      <value>setEntityAccessProxy</value>
+    </property>
+    <property name="arguments">
+      <list>
+        <ref bean="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent" />
+      </list>
+    </property>
   </bean>
-    
+
 </beans>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/deployment.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/deployment.xml?rev=646449&r1=646448&r2=646449&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/deployment.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/deployment.xml Wed Apr  9 10:54:56 2008
@@ -1,101 +1,124 @@
 <?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">
-    
-  <bean id="deployFactory" class="org.apache.jetspeed.tools.deploy.JetspeedDeployFactory"/>
-  <bean id="PAM" 
-  	   class="org.apache.jetspeed.tools.pamanager.VersionedPortletApplicationManager" init-method="start" destroy-method="stop"
-  >  	   
-  	   <constructor-arg><ref bean="portletFactory"/></constructor-arg>
-  	   <constructor-arg><ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/></constructor-arg>
-  	   <constructor-arg><ref bean="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent"/></constructor-arg>
-  	   <constructor-arg><ref bean="org.apache.jetspeed.container.window.PortletWindowAccessor"/></constructor-arg>
-  	   <constructor-arg><ref bean="org.apache.jetspeed.security.PermissionManager"/></constructor-arg>       
-  	   <constructor-arg><ref bean="org.apache.jetspeed.search.SearchEngine"/></constructor-arg>              
-  	   <constructor-arg><ref bean="org.apache.jetspeed.security.RoleManager"/></constructor-arg>                     
-       <!-- role principals to assign a default permission(s) during deployment of a Portlet Application -->
-       <constructor-arg >
-         <list>
-            <value>user</value>
-         </list>
-       </constructor-arg>
-
-       <!--  application root -->
-        <constructor-arg>
-            <value>${applicationRoot}</value>
-        </constructor-arg>
-
-
-   <!-- optional configuration for automatic creation of not yet existing roles as defined in the deployed web.xml:
-       <property name="autoCreateRoles"><value>true</value></property>
-   -->      
-   <!-- optional descriptor change monitor check interval in seconds (0: disabled, default: 10):
-       <property name="descriptorChangeMonitorInterval"><value>10</value></property>
-   -->
-   <!-- optional max PA start retries in case of an error registering ths PA (0: do not retry, default: 10):
-   		this was introduced because of DB constraint validation errors in clustered environments
-   		see https://issues.apache.org/jira/browse/JS2-666
-       <property name="maxRetriedStarts"><value>10</value></property>
-   -->
-   
-   		
+<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="deployFactory" class="org.apache.jetspeed.tools.deploy.JetspeedDeployFactory" />
+  <bean id="PAM" class="org.apache.jetspeed.tools.pamanager.VersionedPortletApplicationManager" init-method="start"
+    destroy-method="stop">
+    <constructor-arg>
+      <ref bean="portletFactory" />
+    </constructor-arg>
+    <constructor-arg>
+      <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
+    </constructor-arg>
+    <constructor-arg>
+      <ref bean="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent" />
+    </constructor-arg>
+    <constructor-arg>
+      <ref bean="org.apache.jetspeed.container.window.PortletWindowAccessor" />
+    </constructor-arg>
+    <constructor-arg>
+      <ref bean="org.apache.jetspeed.security.PermissionManager" />
+    </constructor-arg>
+    <constructor-arg>
+      <ref bean="org.apache.jetspeed.search.SearchEngine" />
+    </constructor-arg>
+    <constructor-arg>
+      <ref bean="org.apache.jetspeed.security.RoleManager" />
+    </constructor-arg>
+    <!-- role principals to assign a default permission(s) during deployment of a Portlet Application -->
+    <constructor-arg>
+      <list>
+        <value>user</value>
+      </list>
+    </constructor-arg>
+
+    <!--  application root -->
+    <constructor-arg>
+      <value>${applicationRoot}</value>
+    </constructor-arg>
+
+
+    <!-- optional configuration for automatic creation of not yet existing roles as defined in the deployed web.xml:
+      <property name="autoCreateRoles"><value>true</value></property>
+    -->
+    <!-- optional descriptor change monitor check interval in seconds (0: disabled, default: 10):
+      <property name="descriptorChangeMonitorInterval"><value>10</value></property>
+    -->
+    <!-- optional max PA start retries in case of an error registering ths PA (0: do not retry, default: 10):
+      this was introduced because of DB constraint validation errors in clustered environments
+      see https://issues.apache.org/jira/browse/JS2-666
+      <property name="maxRetriedStarts"><value>10</value></property>
+    -->
+
+
   </bean>
 
   <!-- Portlet Application and Decorator deployment event listeners -->
-  <bean id="portletAppDeploymentListener" 
-  	   class="org.apache.jetspeed.deployment.impl.DeployPortletAppEventListener"   	   
-  > 	
-  	   <constructor-arg index="0"><ref bean="PAM"/></constructor-arg>
-  	   <constructor-arg index="1"><ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/></constructor-arg>
-       <constructor-arg index="2"><value>${autodeployment.target.dir}</value></constructor-arg>
-       <constructor-arg index="3"><value>${applicationRoot}/WEB-INF/apps</value></constructor-arg>
-       <constructor-arg index="4"><value>${autodeployment.staging.dir}/local</value></constructor-arg>
-       <!-- strip commons-logging and/or log4j jars from war files: for JBoss set this to true -->
-       <constructor-arg index="5"><value>false</value></constructor-arg>
+  <bean id="portletAppDeploymentListener" class="org.apache.jetspeed.deployment.impl.DeployPortletAppEventListener">
+    <constructor-arg index="0">
+      <ref bean="PAM" />
+    </constructor-arg>
+    <constructor-arg index="1">
+      <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
+    </constructor-arg>
+    <constructor-arg index="2">
+      <value>${autodeployment.target.dir}</value>
+    </constructor-arg>
+    <constructor-arg index="3">
+      <value>${applicationRoot}/WEB-INF/apps</value>
+    </constructor-arg>
+    <constructor-arg index="4">
+      <value>${autodeployment.staging.dir}/local</value>
+    </constructor-arg>
+    <!-- strip commons-logging and/or log4j jars from war files: for JBoss set this to true -->
+    <constructor-arg index="5">
+      <value>false</value>
+    </constructor-arg>
   </bean>
-  <bean id="decoratorDeploymentRegistry" 
-  	   class="org.apache.jetspeed.deployment.simpleregistry.impl.InMemoryRegistryImpl"
-  >  	   
+  <bean id="decoratorDeploymentRegistry"
+    class="org.apache.jetspeed.deployment.simpleregistry.impl.InMemoryRegistryImpl">
   </bean>
-  <bean id="decoratorDeploymentListener" 
-  	   class="org.apache.jetspeed.deployment.impl.DeployDecoratorEventListener"   	   
-  > 	
-       <constructor-arg ><value>${applicationRoot}/decorations</value></constructor-arg>
+  <bean id="decoratorDeploymentListener" class="org.apache.jetspeed.deployment.impl.DeployDecoratorEventListener">
+    <constructor-arg>
+      <value>${applicationRoot}/decorations</value>
+    </constructor-arg>
   </bean>
 
   <!-- The deployment manager watches a specific staging directory for
-  	   deploying components.  What components get deployed depend of
-  	   DeploymentEventListeners registered to it.
-   -->
-  <bean id="deploymentManager" 
-  	   class="org.apache.jetspeed.deployment.impl.StandardDeploymentManager" 
-  	   init-method="start" destroy-method="stop"
-  >  	   
-       <constructor-arg ><value>${autodeployment.staging.dir}/local</value></constructor-arg>
-       <constructor-arg type="long" ><value>${autodeployment.delay}</value></constructor-arg>
-       <constructor-arg >
-         <list>
-            <ref bean="portletAppDeploymentListener"/>      
-            <ref bean="decoratorDeploymentListener"/>      
-         </list>
-       </constructor-arg>
-  </bean>    
+    deploying components.  What components get deployed depend of
+    DeploymentEventListeners registered to it.
+  -->
+  <bean id="deploymentManager" class="org.apache.jetspeed.deployment.impl.StandardDeploymentManager" init-method="start"
+    destroy-method="stop">
+    <constructor-arg>
+      <value>${autodeployment.staging.dir}/local</value>
+    </constructor-arg>
+    <constructor-arg type="long">
+      <value>${autodeployment.delay}</value>
+    </constructor-arg>
+    <constructor-arg>
+      <list>
+        <ref bean="portletAppDeploymentListener" />
+        <ref bean="decoratorDeploymentListener" />
+      </list>
+    </constructor-arg>
+  </bean>
 
 </beans>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/jetspeed-services.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/jetspeed-services.xml?rev=646449&r1=646448&r2=646449&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/jetspeed-services.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/jetspeed-services.xml Wed Apr  9 10:54:56 2008
@@ -1,137 +1,135 @@
 <?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">
+
   <!-- Portlet Services  -->
-  <bean id="PortalServices" 
-  	   class="org.apache.jetspeed.services.JetspeedPortletServices" >
-  	   <constructor-arg>
-  	   	<map>
-  	   	  <entry key="PortletRegistryComponent">
-  	   	  	<ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
-  	   	  </entry>
-  	   	  <entry key="SearchComponent">
-  	   	  	<ref bean="org.apache.jetspeed.search.SearchEngine"/>
-  	   	  </entry>
-  	   	  <entry key="PAM">
-  	   	  	<ref bean="PAM" />
-  	   	  </entry>		  
-  	   	  <entry key="UserManager">
-  	   	    <ref bean="org.apache.jetspeed.security.UserManager"/>
-  	   	  </entry>
-  	   	  <entry key="PageManager">
-  	   	    <ref bean="org.apache.jetspeed.page.PageManager"/>
-  	   	  </entry>
-  	   	  <entry key="RoleManager">
-  	   	    <ref bean="org.apache.jetspeed.security.RoleManager"/>
-  	   	  </entry>
-  	   	  <entry key="GroupManager">
-  	   	    <ref bean="org.apache.jetspeed.security.GroupManager"/>
-  	   	  </entry>  	
-  	   	  <entry key="Profiler">
-  	   	  	<ref bean="org.apache.jetspeed.profiler.Profiler"/>
-  	   	  </entry>   	  
-  	   	  <entry key="SSO">
-  	   	  	<ref bean="org.apache.jetspeed.sso.SSOProvider"/>
-  	   	  </entry>   	  
-  	   	  <entry key="EntityAccessor">
-  	   	  	 <ref bean='org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent'/>
-  	   	  </entry>
-  	   	  <entry key="WindowAccessor">
-  	   	  	 <ref bean='org.apache.jetspeed.container.window.PortletWindowAccessor'/>
-  	   	  </entry>
-          <entry key="PortletFactory">
-            <ref bean="portletFactory"/>
-          </entry>
-          <entry key="DeploymentManager">
-            <ref bean="deploymentManager"/>
-          </entry>
-          <entry key='IdGenerator'>
-            <ref bean='IdGenerator'/>
-          </entry>
-          <entry key='Powertools'>
-            <ref bean='Powertools'/>
-          </entry>
-          <entry key="HeaderResource">
-            <ref bean="org.apache.jetspeed.headerresource.HeaderResourceFactory"/>
-          </entry>
-		  <entry key="TemplateLocator">
-            <ref bean="TemplateLocator"/>
-          </entry>
-		  <entry key="DecorationLocator">
-            <ref bean="DecorationLocator"/>
-          </entry>		  
-		  <entry key="DecorationFactory">
-            <ref bean="DecorationFactory"/>
-          </entry>
-		  <entry key="Desktop">
-            <ref bean="JetspeedDesktop"/>
-          </entry>
-		  <entry key="PermissionManager">
-            <ref bean="org.apache.jetspeed.security.PermissionManager"/>
-          </entry>		            
-		  <entry key="PortalStatistics">
-            <ref bean="PortalStatistics"/>
-          </entry>		            
-		  <entry key="PortalAdministration">
-            <ref bean="PortalAdministration"/>
-          </entry>		            
-          <entry key="PreferencesProvider">
-            <ref bean="org.apache.jetspeed.prefs.PreferencesProvider"/>
-          </entry>
-          <entry key="org.apache.jetspeed.container.session.PortalSessionsManager">
-            <ref bean="org.apache.jetspeed.container.session.PortalSessionsManager"/>
-          </entry>
-          <entry key="SecurityAccessController">
-            <ref bean="org.apache.jetspeed.security.SecurityAccessController"/>
-          </entry>
-          <entry key="PortletTrackingManager">
-            <ref bean="org.apache.jetspeed.aggregator.PortletTrackingManager"/>
-          </entry>
-          <entry key ="PortalAuthenticationConfiguration">
-          	<ref bean="org.apache.jetspeed.administration.PortalAuthenticationConfiguration"/>
-          </entry>
-          <entry key ="PortalConfiguration">
-          	<ref bean="PortalConfiguration"/>
-          </entry>
-          <entry key="ImporterManager">
-            <ref bean="importerCastorPageManager"/>
-          </entry>          
-          <entry key="decorationContentCache">
-          	<ref bean="decorationContentCache"/>
-          </entry>
-          <entry key="portletContentCache">
-          	<ref bean="portletContentCache"/>
-          </entry>          
-          <entry key="AuditActivity">
-          	<ref bean="org.apache.jetspeed.audit.AuditActivity"/>
-          </entry>          
-          <entry key="JetspeedSerializerFactory">
-          	<ref bean="org.apache.jetspeed.serializer.JetspeedSerializerFactory"/>
-          </entry>
-<!-- first uncomment the below service bean in security-spi-atn.xml
-         <entry key="PasswordEncodingService">
-           <ref bean="org.apache.jetspeed.security.PasswordEncodingService" />
-         </entry>
--->          
-  	   	</map>
-  	   </constructor-arg>
+  <bean id="PortalServices" class="org.apache.jetspeed.services.JetspeedPortletServices">
+    <constructor-arg>
+      <map>
+        <entry key="PortletRegistryComponent">
+          <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
+        </entry>
+        <entry key="SearchComponent">
+          <ref bean="org.apache.jetspeed.search.SearchEngine" />
+        </entry>
+        <entry key="PAM">
+          <ref bean="PAM" />
+        </entry>
+        <entry key="UserManager">
+          <ref bean="org.apache.jetspeed.security.UserManager" />
+        </entry>
+        <entry key="PageManager">
+          <ref bean="org.apache.jetspeed.page.PageManager" />
+        </entry>
+        <entry key="RoleManager">
+          <ref bean="org.apache.jetspeed.security.RoleManager" />
+        </entry>
+        <entry key="GroupManager">
+          <ref bean="org.apache.jetspeed.security.GroupManager" />
+        </entry>
+        <entry key="Profiler">
+          <ref bean="org.apache.jetspeed.profiler.Profiler" />
+        </entry>
+        <entry key="SSO">
+          <ref bean="org.apache.jetspeed.sso.SSOProvider" />
+        </entry>
+        <entry key="EntityAccessor">
+          <ref bean='org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent' />
+        </entry>
+        <entry key="WindowAccessor">
+          <ref bean='org.apache.jetspeed.container.window.PortletWindowAccessor' />
+        </entry>
+        <entry key="PortletFactory">
+          <ref bean="portletFactory" />
+        </entry>
+        <entry key="DeploymentManager">
+          <ref bean="deploymentManager" />
+        </entry>
+        <entry key='IdGenerator'>
+          <ref bean='IdGenerator' />
+        </entry>
+        <entry key='Powertools'>
+          <ref bean='Powertools' />
+        </entry>
+        <entry key="HeaderResource">
+          <ref bean="org.apache.jetspeed.headerresource.HeaderResourceFactory" />
+        </entry>
+        <entry key="TemplateLocator">
+          <ref bean="TemplateLocator" />
+        </entry>
+        <entry key="DecorationLocator">
+          <ref bean="DecorationLocator" />
+        </entry>
+        <entry key="DecorationFactory">
+          <ref bean="DecorationFactory" />
+        </entry>
+        <entry key="Desktop">
+          <ref bean="JetspeedDesktop" />
+        </entry>
+        <entry key="PermissionManager">
+          <ref bean="org.apache.jetspeed.security.PermissionManager" />
+        </entry>
+        <entry key="PortalStatistics">
+          <ref bean="PortalStatistics" />
+        </entry>
+        <entry key="PortalAdministration">
+          <ref bean="PortalAdministration" />
+        </entry>
+        <entry key="PreferencesProvider">
+          <ref bean="org.apache.jetspeed.prefs.PreferencesProvider" />
+        </entry>
+        <entry key="org.apache.jetspeed.container.session.PortalSessionsManager">
+          <ref bean="org.apache.jetspeed.container.session.PortalSessionsManager" />
+        </entry>
+        <entry key="SecurityAccessController">
+          <ref bean="org.apache.jetspeed.security.SecurityAccessController" />
+        </entry>
+        <entry key="PortletTrackingManager">
+          <ref bean="org.apache.jetspeed.aggregator.PortletTrackingManager" />
+        </entry>
+        <entry key="PortalAuthenticationConfiguration">
+          <ref bean="org.apache.jetspeed.administration.PortalAuthenticationConfiguration" />
+        </entry>
+        <entry key="PortalConfiguration">
+          <ref bean="PortalConfiguration" />
+        </entry>
+        <entry key="ImporterManager">
+          <ref bean="importerCastorPageManager" />
+        </entry>
+        <entry key="decorationContentCache">
+          <ref bean="decorationContentCache" />
+        </entry>
+        <entry key="portletContentCache">
+          <ref bean="portletContentCache" />
+        </entry>
+        <entry key="AuditActivity">
+          <ref bean="org.apache.jetspeed.audit.AuditActivity" />
+        </entry>
+        <entry key="JetspeedSerializerFactory">
+          <ref bean="org.apache.jetspeed.serializer.JetspeedSerializerFactory" />
+        </entry>
+        <!-- first uncomment the below service bean in security-spi-atn.xml
+          <entry key="PasswordEncodingService">
+          <ref bean="org.apache.jetspeed.security.PasswordEncodingService" />
+          </entry>
+        -->
+      </map>
+    </constructor-arg>
   </bean>
 </beans>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/boot/datasource.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/boot/datasource.xml?rev=646449&r1=646448&r2=646449&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/boot/datasource.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/boot/datasource.xml Wed Apr  9 10:54:56 2008
@@ -22,8 +22,8 @@
     Simply use the JNDI data source provided via Spring
   -->
   <bean id="JetspeedDS" class="org.springframework.jndi.JndiObjectFactoryBean">
-    <property name="resourceRef" value="false"/>
-    <property name="jndiName" value="java:comp/env/jdbc/jetspeed"/>
+    <property name="resourceRef" value="false" />
+    <property name="jndiName" value="java:comp/env/jdbc/jetspeed" />
   </bean>
 
   <bean id="ojbConfigurer" class="org.springframework.orm.ojb.support.LocalOjbConfigurer" />
@@ -34,10 +34,11 @@
     Its important to get this right otherwise you will be sending the wrong (most likely HSQL)
     flavor of SQL statements to the backend database.
   -->
-  <bean id="PlatformConfigurator" class="org.apache.jetspeed.components.rdbms.ojb.DatabasePlatformConfigurator" init-method="init">
-    <constructor-arg index='0' ref="JetspeedDS"/>
+  <bean id="PlatformConfigurator" class="org.apache.jetspeed.components.rdbms.ojb.DatabasePlatformConfigurator"
+    init-method="init">
+    <constructor-arg index='0' ref="JetspeedDS" />
     <!-- JNDI Name -->
-    <constructor-arg index='1' value="JetspeedDS"/>
+    <constructor-arg index='1' value="JetspeedDS" />
   </bean>
 
   <!-- 	
@@ -56,15 +57,17 @@
   <bean class="org.apache.jetspeed.components.datasource.SchemaAwareDataSourceProxy">
     <meta key="j2:cat" value="schemaAwareDS" />
     <meta key="j2:alias" value="JetspeedDS" />
-    <property name="targetDataSource" ref="dataSourceTarget"/>
-    <property name="schemaSql"><value>${org.apache.jetspeed.database.set.schema.sql}</value></property>
+    <property name="targetDataSource" ref="dataSourceTarget" />
+    <property name="schemaSql">
+      <value>${org.apache.jetspeed.database.set.schema.sql}</value>
+    </property>
   </bean>
 
   <bean class="org.springframework.jndi.JndiObjectFactoryBean">
     <meta key="j2:cat" value="schemaAwareDS" />
     <meta key="j2:alias" value="dataSourceTarget" />
-    <property name="resourceRef" value="false"/>
-    <property name="jndiName" value="java:comp/env/jdbc/jetspeed"/>
+    <property name="resourceRef" value="false" />
+    <property name="jndiName" value="java:comp/env/jdbc/jetspeed" />
   </bean>
 
 
@@ -92,7 +95,7 @@
   <bean class="org.apache.jetspeed.components.rdbms.ojb.ConnectionRepositoryEntry">
     <meta key="j2:cat" value="ojbConnectionRepositoryDS" />
     <meta key="j2:alias" value="JetspeedDS" />
-    <property name="jndiName" value="java:comp/env/jdbc/jetspeed"/>
+    <property name="jndiName" value="java:comp/env/jdbc/jetspeed" />
   </bean>
 
 
@@ -109,10 +112,16 @@
   <bean class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
     <meta key="j2:cat" value="jdbcDS" />
     <meta key="j2:alias" value="JetspeedDS" />
-    <property name="driverClassName" value="${org.apache.jetspeed.database.driver}"/>
-    <property name="url"><value>${org.apache.jetspeed.database.url}</value></property>
-    <property name="username"><value>${org.apache.jetspeed.database.user}</value></property>
-    <property name="password"><value>${org.apache.jetspeed.database.password}</value></property>
+    <property name="driverClassName" value="${org.apache.jetspeed.database.driver}" />
+    <property name="url">
+      <value>${org.apache.jetspeed.database.url}</value>
+    </property>
+    <property name="username">
+      <value>${org.apache.jetspeed.database.user}</value>
+    </property>
+    <property name="password">
+      <value>${org.apache.jetspeed.database.password}</value>
+    </property>
   </bean>
 
 </beans>



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