From graffito-commits-return-720-apmail-incubator-graffito-commits-archive=www.apache.org@incubator.apache.org Fri Jun 16 21:27:51 2006
Return-Path: <graffito-commits-return-720-apmail-incubator-graffito-commits-archive=www.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-graffito-commits-archive@www.apache.org
Received: (qmail 95741 invoked from network); 16 Jun 2006 21:27:50 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 16 Jun 2006 21:27:50 -0000
Received: (qmail 48477 invoked by uid 500); 16 Jun 2006 21:27:50 -0000
Mailing-List: contact graffito-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:graffito-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:graffito-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:graffito-commits@incubator.apache.org>
List-Id: <graffito-commits.incubator.apache.org>
Reply-To: graffito-dev@incubator.apache.org
Delivered-To: mailing list graffito-commits@incubator.apache.org
Received: (qmail 48461 invoked by uid 99); 16 Jun 2006 21:27:50 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Jun 2006 14:27:50 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Jun 2006 14:27:47 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 1DFFF1A983A; Fri, 16 Jun 2006 14:27:27 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r414920 - in /incubator/graffito/trunk/jetspeed2-deploy:
 maven.xml src/assembly_head/ src/assembly_head/graffito.xml
 src/assembly_head/jetspeed-services.xml src/assembly_head/pipelines.xml
 src/assembly_head/security-managers.xml
Date: Fri, 16 Jun 2006 21:27:26 -0000
To: graffito-commits@incubator.apache.org
From: clombart@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060616212727.1DFFF1A983A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: clombart
Date: Fri Jun 16 14:27:25 2006
New Revision: 414920

URL: http://svn.apache.org/viewvc?rev=414920&view=rev
Log:
Commit patch provided by Adam in order to support J2 HEAD.
From the Graffito trunk, use "maven allDeployHead"

Added:
    incubator/graffito/trunk/jetspeed2-deploy/src/assembly_head/
    incubator/graffito/trunk/jetspeed2-deploy/src/assembly_head/graffito.xml
    incubator/graffito/trunk/jetspeed2-deploy/src/assembly_head/jetspeed-services.xml
    incubator/graffito/trunk/jetspeed2-deploy/src/assembly_head/pipelines.xml
    incubator/graffito/trunk/jetspeed2-deploy/src/assembly_head/security-managers.xml
Modified:
    incubator/graffito/trunk/jetspeed2-deploy/maven.xml

Modified: incubator/graffito/trunk/jetspeed2-deploy/maven.xml
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/jetspeed2-deploy/maven.xml?rev=414920&r1=414919&r2=414920&view=diff
==============================================================================
--- incubator/graffito/trunk/jetspeed2-deploy/maven.xml (original)
+++ incubator/graffito/trunk/jetspeed2-deploy/maven.xml Fri Jun 16 14:27:25 2006
@@ -23,9 +23,27 @@
 			<fileset file="${basedir}/target/${maven.final.name}.jar" />
 		</copy>
 		
-		<copy todir="${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF" overwrite="true">
-			<fileset dir="${maven.src.dir}" />
+		<copy todir="${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF/assembly" overwrite="true">
+			<fileset dir="${maven.src.dir}/assembly" />
+		</copy>		
+		<copy todir="${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF/pages" overwrite="true">
+			<fileset dir="${maven.src.dir}/pages" />
+		</copy>		
+		
+	</goal>
+		
+	<goal name="deployHead">
+	        <attainGoal name="jar:install"/>
+		<copy todir="${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF/lib" overwrite="true">
+			<fileset file="${basedir}/target/${maven.final.name}.jar" />
 		</copy>
 		
+		<copy todir="${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF/assembly" overwrite="true">
+			<fileset dir="${maven.src.dir}/assembly_head" />
+		</copy>		
+		<copy todir="${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF/pages" overwrite="true">
+			<fileset dir="${maven.src.dir}/pages" />
+		</copy>		
 	</goal>
+		
 </project>

Added: incubator/graffito/trunk/jetspeed2-deploy/src/assembly_head/graffito.xml
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/jetspeed2-deploy/src/assembly_head/graffito.xml?rev=414920&view=auto
==============================================================================
--- incubator/graffito/trunk/jetspeed2-deploy/src/assembly_head/graffito.xml (added)
+++ incubator/graffito/trunk/jetspeed2-deploy/src/assembly_head/graffito.xml Fri Jun 16 14:27:25 2006
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed 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.
+-->
+
+<!--
+  - Application context definition for Graffito.
+	-->
+<beans>
+
+															    
+	
+<!--  
+		   Graffito MASTER STORE
+              The master store is the mandatory content store in Graffito. It contains all other content store references and if needed some cms objects.
+-->
+   
+   <!--The Graffito Master Store -->
+   <bean id="graffitoMasterStore"   class="org.apache.portals.graffito.model.server.impl.GraffitoServerImpl"  >  	   
+          <!-- Either Alias property has to match  datasource component & set into the OJB repository.xml  
+	       OR Uses the other Server attributes to init the connection -->
+	 <property name = "alias"><value>JetspeedDS</value></property>
+	  <property name = "description"><value>The Graffito Master Server contains information about all server references. It may also contains some CMS content like documents or folder. </value></property>
+	  <property name = "scope"><value>/graffito</value></property>
+	  <property name = "title"><value>Graffito Master Server</value></property>	  
+	  <property name = "storeClassName"><value>org.apache.portals.graffito.store.impl.ojb.GraffitoOJBStore</value></property>
+  </bean>
+
+   <!-- 
+		   CORE Graffito SERVICES 
+	   The main services used by the Graffito engine
+   -->
+   
+   <!-- Cms Request Context manager -->
+  <bean id="org.apache.portals.graffito.context.CmsRequestContextManager" class="org.apache.portals.graffito.context.impl.CmsRequestContextManagerImpl"  />  	   
+  
+  <!-- Access Controller -->
+  
+  <!-- Use the following access controller for JAAS & Jetspeed security components support-->
+  <bean id="org.apache.portals.graffito.security.CmsAccessController" class="org.apache.portals.graffito.security.impl.CmsAccessControllerImpl" >  	   
+  	   <constructor-arg ><ref bean="org.apache.portals.graffito.context.CmsRequestContextManager"/></constructor-arg>  	   	   
+  </bean>
+   
+  <!-- bean id="org.apache.portals.graffito.security.CmsAccessController" class="org.apache.portals.graffito.security.impl.EmptyCmsAccessControllerImpl"  /-->  	   
+  
+    
+    <!--Ojb Factory : used to access to the OJB Persistence Broker  -->  
+   <bean id="org.apache.portals.graffito.store.impl.ojb.OjbFactory" class="org.apache.portals.graffito.store.impl.ojb.SpringOjbFactory"   />  	   
+
+   <!-- Store service : manage the content stores plugged into Graffito -->
+   <bean id="org.apache.portals.graffito.persistence.impl.ContentStoreServiceImpl"  class="org.apache.portals.graffito.persistence.impl.ContentStoreServiceImpl"  >  	   
+  	   <constructor-arg ><ref bean="org.apache.portals.graffito.security.CmsAccessController"/></constructor-arg>  	     	     	     
+	   <constructor-arg ><ref bean="org.apache.portals.graffito.store.impl.ojb.OjbFactory"/></constructor-arg>  	     	     	     
+  </bean>
+   
+   <!-- Persistence Service -->
+   <bean id="org.apache.portals.graffito.persistence.impl.ContentPersistenceServiceImpl"   class="org.apache.portals.graffito.persistence.impl.ContentPersistenceServiceImpl"  >  	   
+  	   <constructor-arg ><ref bean="graffitoMasterStore"/></constructor-arg>  	     	     	     
+	   <constructor-arg ><ref bean="org.apache.portals.graffito.persistence.impl.ContentStoreServiceImpl"/></constructor-arg>
+  </bean>
+
+  <!-- Content Version Service -->
+  <bean id="org.apache.portals.graffito.services.core.impl.ContentVersionServiceImpl"  class="org.apache.portals.graffito.services.core.impl.ContentVersionServiceImpl"   >  	   
+  	   <constructor-arg ><ref bean="org.apache.portals.graffito.persistence.impl.ContentPersistenceServiceImpl"/></constructor-arg>  	   	   
+  </bean>
+  
+  <!-- Content Model Service -->
+  <bean id="org.apache.portals.graffito.services.core.impl.ContentModelServiceImpl"  class="org.apache.portals.graffito.services.core.impl.ContentModelServiceImpl"   >  	   
+  	   <constructor-arg ><ref bean="org.apache.portals.graffito.persistence.impl.ContentPersistenceServiceImpl"/></constructor-arg>  	   
+	   <constructor-arg ><ref bean="org.apache.portals.graffito.services.core.impl.ContentVersionServiceImpl"/></constructor-arg>  	   
+  </bean>
+
+  <!-- Content Model Service -->
+  <bean id="org.apache.portals.graffito.services.dm.impl.DocumentModelServiceImpl"  class="org.apache.portals.graffito.services.dm.impl.DocumentModelServiceImpl"   >  	   
+  	   <constructor-arg ><ref bean="org.apache.portals.graffito.persistence.impl.ContentPersistenceServiceImpl"/></constructor-arg>  	   
+	   <constructor-arg ><ref bean="org.apache.portals.graffito.services.core.impl.ContentVersionServiceImpl"/></constructor-arg>  	   
+  </bean>
+
+  <!-- Content Search Service -->
+  <bean id="org.apache.portals.graffito.services.search.impl.ContentSearchServiceImpl" 
+  	   class="org.apache.portals.graffito.services.search.impl.ContentSearchServiceImpl"   >  	   
+  	   <constructor-arg ><ref bean="org.apache.portals.graffito.persistence.impl.ContentPersistenceServiceImpl"/></constructor-arg>  	   
+	   <constructor-arg><value>./index</value></constructor-arg> 	   
+  </bean>
+
+  <!-- Content Server Service -->
+  <bean id="org.apache.portals.graffito.services.core.impl.ContentServerServiceImpl" 
+  	   class="org.apache.portals.graffito.services.core.impl.ContentServerServiceImpl"   >  	   
+  	   <constructor-arg ><ref bean="org.apache.portals.graffito.persistence.impl.ContentPersistenceServiceImpl"/></constructor-arg>  	   
+  </bean>
+ 
+
+ 
+  <!--
+	  SPRING TRANSACTIONNAL PROXIES
+	  Thoses spring proxies contains the declarative transaction management setting
+  -->
+
+ <bean id="org.apache.portals.graffito.persistence.ContentPersistenceService" parent="baseTransactionProxy" name="contentPersistence" abstract="false" singleton="true" lazy-init="default" autowire="default" dependency-check="default">
+ 		<property name="proxyInterfaces"><value>org.apache.portals.graffito.persistence.ContentPersistenceService</value></property>
+		<property name="target"><ref bean="org.apache.portals.graffito.persistence.impl.ContentPersistenceServiceImpl" /></property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="*">PROPAGATION_REQUIRED,-ContentManagementException</prop> 
+			  </props>
+		</property>
+  </bean>
+ 
+   
+ <bean id="org.apache.portals.graffito.services.core.ContentVersionService" parent="baseTransactionProxy" name="contentVersion" abstract="false" singleton="true" lazy-init="default" autowire="default" dependency-check="default">
+ 		<property name="proxyInterfaces"><value>org.apache.portals.graffito.services.core.ContentVersionService</value></property>
+		<property name="target"><ref bean="org.apache.portals.graffito.services.core.impl.ContentVersionServiceImpl" /></property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="*">PROPAGATION_REQUIRED,-ContentManagementException</prop> 
+			  </props>
+		</property>
+  </bean>
+  
+   <bean id="org.apache.portals.graffito.services.core.ContentModelService" parent="baseTransactionProxy" name="contentModel" abstract="false" singleton="true" lazy-init="default" autowire="default" dependency-check="default">
+ 		<property name="proxyInterfaces"><value>org.apache.portals.graffito.services.core.ContentModelService</value></property>
+		<property name="target"><ref bean="org.apache.portals.graffito.services.core.impl.ContentModelServiceImpl" /></property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="*">PROPAGATION_REQUIRED,-ContentManagementException</prop> 
+			  </props>
+		</property>
+  </bean>
+      
+   <bean id="org.apache.portals.graffito.services.dm.DocumentModelService" parent="baseTransactionProxy" name="documentModel" abstract="false" singleton="true" lazy-init="default" autowire="default" dependency-check="default">
+ 		<property name="proxyInterfaces"><value>org.apache.portals.graffito.services.dm.DocumentModelService</value></property>
+		<property name="target"><ref bean="org.apache.portals.graffito.services.dm.impl.DocumentModelServiceImpl" /></property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="*">PROPAGATION_REQUIRED,-ContentManagementException</prop> 
+			  </props>
+		</property>
+  </bean>
+  	  
+   <bean id="org.apache.portals.graffito.services.search.ContentSearchService" parent="baseTransactionProxy" name="contentSearch" abstract="false" singleton="true" lazy-init="default" autowire="default" dependency-check="default">
+ 		<property name="proxyInterfaces"><value>org.apache.portals.graffito.services.search.ContentSearchService</value></property>
+		<property name="target"><ref bean="org.apache.portals.graffito.services.search.impl.ContentSearchServiceImpl" /></property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="*">PROPAGATION_REQUIRED,-ContentManagementException</prop> 
+			  </props>
+		</property>
+  </bean>
+    
+
+   <bean id="org.apache.portals.graffito.services.core.ContentServerService" parent="baseTransactionProxy" name="contentServer" abstract="false" singleton="true" lazy-init="default" autowire="default" dependency-check="default">
+ 		<property name="proxyInterfaces"><value>org.apache.portals.graffito.services.core.ContentServerService</value></property>
+		<property name="target"><ref bean="org.apache.portals.graffito.services.core.impl.ContentServerServiceImpl" /></property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="*">PROPAGATION_REQUIRED,-ContentManagementException</prop> 
+			  </props>
+		</property>
+  </bean>
+
+  
+</beans>

Added: incubator/graffito/trunk/jetspeed2-deploy/src/assembly_head/jetspeed-services.xml
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/jetspeed2-deploy/src/assembly_head/jetspeed-services.xml?rev=414920&view=auto
==============================================================================
--- incubator/graffito/trunk/jetspeed2-deploy/src/assembly_head/jetspeed-services.xml (added)
+++ incubator/graffito/trunk/jetspeed2-deploy/src/assembly_head/jetspeed-services.xml Fri Jun 16 14:27:25 2006
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed 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>
+
+  <!-- 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>
+          <!-- ApplicationServerManager currently only supported for Tomcat. Comment out for others like JBoss -->
+          <entry key="ApplicationServerManager">
+            <ref bean="org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager"/>
+          </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="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='ContentModel'>
+		  <ref bean='org.apache.portals.graffito.services.core.ContentModelService'/>
+	  </entry>          
+	  <entry key='DocumentModel'>
+		  <ref bean='org.apache.portals.graffito.services.dm.DocumentModelService'/>
+	  </entry>          		  
+	  <entry key='ContentServer'>
+		  <ref bean='org.apache.portals.graffito.services.core.ContentServerService'/>
+	  </entry>          
+	  <entry key='ContentSearch'>
+		  <ref bean='org.apache.portals.graffito.services.search.ContentSearchService'/>
+	  </entry>      	  
+  	   	</map>
+  	   </constructor-arg>
+  </bean>
+</beans>

Added: incubator/graffito/trunk/jetspeed2-deploy/src/assembly_head/pipelines.xml
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/jetspeed2-deploy/src/assembly_head/pipelines.xml?rev=414920&view=auto
==============================================================================
--- incubator/graffito/trunk/jetspeed2-deploy/src/assembly_head/pipelines.xml (added)
+++ incubator/graffito/trunk/jetspeed2-deploy/src/assembly_head/pipelines.xml Fri Jun 16 14:27:25 2006
@@ -0,0 +1,415 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<beans>
+  <bean id="localizationValve"
+        class="org.apache.jetspeed.localization.impl.LocalizationValveImpl"
+        init-method="initialize"
+  >
+    <constructor-arg>
+      <value><!--@defaultLanguage--><!--defaultLanguage@--></value>
+    </constructor-arg>
+  </bean> 
+  
+  <bean id="capabilityValve"
+        class="org.apache.jetspeed.capabilities.impl.CapabilityValveImpl"
+        init-method="initialize"
+  >
+   <constructor-arg>
+       <ref bean="org.apache.jetspeed.capabilities.Capabilities" />
+   </constructor-arg>
+  </bean> 
+  
+  <bean id="portalURLValve"
+        class="org.apache.jetspeed.container.url.impl.PortalURLValveImpl"
+        init-method="initialize"
+   >
+   <constructor-arg>
+       <ref bean="NavigationalStateComponent" />
+   </constructor-arg>            
+  </bean>
+          
+  <bean id="securityValve"
+        class="org.apache.jetspeed.security.impl.SecurityValveImpl"
+        init-method="initialize"
+  >
+   <constructor-arg>
+       <ref bean="org.apache.jetspeed.profiler.Profiler" />
+   </constructor-arg>
+   <constructor-arg>
+       <ref bean="org.apache.jetspeed.security.UserManager" />
+   </constructor-arg>
+   <constructor-arg>
+       <ref bean="PortalStatistics" />
+   </constructor-arg>   
+  </bean> 
+  
+  <bean id="passwordCredentialValve"
+        class="org.apache.jetspeed.security.impl.PasswordCredentialValveImpl"
+        init-method="initialize"
+  />
+  
+  <bean id="loginValidationValve"
+        class="org.apache.jetspeed.security.impl.LoginValidationValveImpl"
+        init-method="initialize">
+	  <!-- remove (from the session) the following list of session attributes upon login -->
+       <constructor-arg index="0">
+            <list>
+                <value>org.apache.jetspeed.powertool.actions</value>
+            </list>		   
+	   </constructor-arg>	  
+  </bean>
+  <bean id="profilerValve"
+        class="org.apache.jetspeed.profiler.impl.ProfilerValveImpl"
+        init-method="initialize"
+  >
+   <constructor-arg index="0">
+       <ref bean="org.apache.jetspeed.profiler.Profiler" />
+   </constructor-arg>
+   <constructor-arg index="1">
+       <ref bean="org.apache.jetspeed.portalsite.PortalSite" />
+   </constructor-arg>
+   <constructor-arg index="2">
+       <ref bean="org.apache.jetspeed.page.PageManager" />
+   </constructor-arg>
+   <!--
+       request fallback to root folder/page enabled by default;
+       if set to false, requests generate HTTP 403/404 errors
+       for access errors or missing pages
+   -->
+   <constructor-arg index="3"><value>true</value></constructor-arg>    
+   <!--
+       use last visited page histories to select default page
+       for folder navigational urls; if set to false, the
+       default page specified in PSML, (or the first page in
+       the folder), is always selected
+   -->
+   <constructor-arg index="4"><value>true</value></constructor-arg>    
+  </bean> 
+  
+  <bean id="containerValve"
+        class="org.apache.jetspeed.container.ContainerValve"
+        init-method="initialize"
+  /> 
+  
+  <bean id="actionValve"
+        class="org.apache.jetspeed.pipeline.valve.impl.ActionValveImpl"
+        init-method="initialize"
+  >
+   <constructor-arg>
+       <ref bean="org.apache.pluto.PortletContainer" />
+   </constructor-arg>
+   <constructor-arg>   
+       <ref bean="PortletWindowAccessor" />    
+   </constructor-arg>   
+    <!-- 
+         Setting to true will force Action response isCommitted to true
+         as there is a bug in Websphere 5 where request.isCommitted always returns false
+         Set this boolean to TRUE if running on Websphere 5 pre-cumulative fix 5.1.1.9  
+    <constructor-arg type="boolean">
+        <value>false</value>
+    </constructor-arg>                
+        -->       
+  </bean> 
+
+  <bean id="desktopActionValve"
+        class="org.apache.jetspeed.pipeline.valve.impl.ActionValveImpl"
+        init-method="initialize"
+  >
+   <constructor-arg>
+       <ref bean="org.apache.pluto.DesktopPortletContainer" />
+   </constructor-arg>
+   <constructor-arg>   
+       <ref bean="PortletWindowAccessor" />    
+   </constructor-arg>   
+  </bean> 
+      
+  <bean id="portletValve"
+        class="org.apache.jetspeed.aggregator.PortletValve"
+        init-method="initialize"
+  >
+   <constructor-arg>
+       <ref bean="org.apache.jetspeed.aggregator.PortletAggregator"/>
+   </constructor-arg>
+  </bean> 
+
+  <bean id="fileServerValve"
+        class="org.apache.jetspeed.aggregator.FileServerValve"
+        init-method="initialize"
+  >
+     <!-- portlet -->
+     <constructor-arg index="0"><value>demo::ContentViewer</value></constructor-arg>    
+     <!-- entity -->
+     <constructor-arg index="1"><value>public.content.21</value></constructor-arg>    
+  </bean> 
+  
+  <bean id="aggregatorValve"
+        class="org.apache.jetspeed.aggregator.AggregatorValve"
+        init-method="initialize"
+  >
+   <constructor-arg>
+       <ref bean="org.apache.jetspeed.aggregator.PageAggregator"/>
+   </constructor-arg>
+  </bean> 
+  
+  <bean id="cleanUpValve"
+        class="org.apache.jetspeed.pipeline.valve.impl.CleanupValveImpl"
+        init-method="initialize"
+  >
+  </bean> 
+
+  <bean id="AJAXValve"
+        class="org.apache.jetspeed.ajax.AJAXValve"
+        init-method="initialize"
+  >
+   <constructor-arg>
+       <ref bean="AJAXService"/>
+   </constructor-arg>
+  </bean> 
+  
+  <bean id="DecorationValve"
+        class="org.apache.jetspeed.decoration.DecorationValve"
+        init-method="initialize">
+        <constructor-arg>
+            <ref bean="DecorationFactory" />
+        </constructor-arg>
+		<constructor-arg>			
+			 <ref bean="PortletWindowAccessor" />
+		</constructor-arg>
+  </bean>
+
+  <bean id="loginViewValve"
+        class="org.apache.jetspeed.login.impl.LoginJSPViewValve"
+        init-method="initialize"
+  >
+    <constructor-arg>
+      <value>/WEB-INF/templates/login</value>
+    </constructor-arg>
+  </bean> 
+
+  <bean id="desktopValve"
+        class="org.apache.jetspeed.desktop.impl.DesktopValveImpl"
+  > 
+    <constructor-arg>
+        <ref bean="JetspeedDesktop" />
+    </constructor-arg>      
+  </bean>
+      
+  <bean id="GraffitoContextValve"
+	class="org.apache.portals.jetspeed.valve.GraffitoContextValve"
+	init-method="initialize"
+	>
+	  <constructor-arg>
+		  <ref bean="org.apache.portals.graffito.context.CmsRequestContextManager" />
+	  </constructor-arg>  
+  </bean>
+  
+  <bean id="jetspeed-pipeline"
+        class="org.apache.jetspeed.pipeline.JetspeedPipeline"
+        init-method="initialize"
+  >
+   <constructor-arg>
+       <value>JetspeedPipeline</value>
+   </constructor-arg>
+   <constructor-arg>
+    <list>
+      <ref bean="capabilityValve"/>
+      <ref bean="portalURLValve"/>
+      <ref bean="securityValve"/>
+      <ref bean="localizationValve"/>
+      <ref bean="passwordCredentialValve"/>
+      <ref bean="loginValidationValve"/>
+      <ref bean="GraffitoContextValve"/>      
+      <ref bean="profilerValve"/>
+      <ref bean="containerValve"/>
+      <ref bean="actionValve"/>
+      <ref bean="DecorationValve" />
+      <ref bean="aggregatorValve"/>
+      <ref bean="cleanUpValve"/>
+    </list>
+    </constructor-arg>
+  </bean> 
+  
+  <bean id="login-pipeline"
+        class="org.apache.jetspeed.pipeline.JetspeedPipeline"
+        init-method="initialize"
+  >
+   <constructor-arg>
+       <value>LoginPipeline</value>
+   </constructor-arg>
+   <constructor-arg>
+    <list>
+      <ref bean="capabilityValve"/>
+      <ref bean="localizationValve"/>
+      <ref bean="loginViewValve"/>
+    </list>
+    </constructor-arg>
+  </bean> 
+
+  <bean id="action-pipeline"
+        class="org.apache.jetspeed.pipeline.JetspeedPipeline"
+        init-method="initialize"
+  >
+   <constructor-arg>
+       <value>ActionPipeline</value>
+   </constructor-arg>
+   <constructor-arg>
+    <list>
+        <ref bean="localizationValve"/>
+        <ref bean="capabilityValve"/>
+        <ref bean="portalURLValve"/>
+        <ref bean="containerValve"/>
+        <ref bean="actionValve"/>
+    </list>
+    </constructor-arg>
+  </bean> 
+
+  <bean id="desktop-action-pipeline"
+        class="org.apache.jetspeed.pipeline.JetspeedPipeline"
+        init-method="initialize"
+  >
+   <constructor-arg>
+       <value>DesktopActionPipeline</value>
+   </constructor-arg>
+   <constructor-arg>
+    <list>
+        <ref bean="securityValve"/>                        
+        <ref bean="localizationValve"/>
+        <ref bean="capabilityValve"/>
+        <ref bean="portalURLValve"/>
+        <ref bean="profilerValve"/>        
+        <ref bean="containerValve"/>
+        <ref bean="desktopActionValve"/>
+    </list>
+    </constructor-arg>
+  </bean> 
+      
+  <bean id="portlet-pipeline"
+        class="org.apache.jetspeed.pipeline.JetspeedPipeline"
+        init-method="initialize"
+  >
+   <constructor-arg>
+       <value>PortletPipeline</value>
+   </constructor-arg>
+   <constructor-arg>
+    <list>
+        <ref bean="portalURLValve"/>                
+        <ref bean="capabilityValve"/>        
+        <ref bean="securityValve"/>                
+        <ref bean="localizationValve"/>
+        <ref bean="profilerValve"/>                        
+        <ref bean="containerValve"/>
+        <ref bean="portletValve"/>    
+    </list>
+    </constructor-arg>
+  </bean> 
+  
+  <bean id="ajax-pipeline"
+        class="org.apache.jetspeed.pipeline.JetspeedPipeline"
+        init-method="initialize"
+  >
+   <constructor-arg>
+       <value>AjaxPipeline</value>
+   </constructor-arg>
+   <constructor-arg>
+    <list>
+        <ref bean="capabilityValve"/>
+        <ref bean="portalURLValve"/>                
+        <ref bean="securityValve"/>                
+        <ref bean="localizationValve"/>
+        <ref bean="profilerValve"/>                        
+        <ref bean="containerValve"/>
+        <!-- TODO: replace layout valve with Ajax valve -->
+        <ref bean="layoutValve"/>
+    </list>
+    </constructor-arg>
+  </bean> 
+
+  <bean id="fileserver-pipeline"
+        class="org.apache.jetspeed.pipeline.JetspeedPipeline"
+        init-method="initialize"
+  >
+   <constructor-arg>
+       <value>FileServerPipeline</value>
+   </constructor-arg>
+   <constructor-arg>
+    <list>
+        <ref bean="portalURLValve"/>                
+        <ref bean="securityValve"/>                
+        <ref bean="localizationValve"/>
+        <ref bean="profilerValve"/>                        
+        <ref bean="containerValve"/>
+        <ref bean="fileServerValve"/>            
+        <ref bean="portletValve"/>    
+    </list>
+    </constructor-arg>
+  </bean> 
+
+  <bean id="desktop-pipeline"
+        class="org.apache.jetspeed.pipeline.JetspeedPipeline"
+        init-method="initialize"
+  >
+   <constructor-arg>
+       <value>DesktopPipeline</value>
+   </constructor-arg>
+   <constructor-arg>
+    <list>
+        <ref bean="capabilityValve"/>
+        <ref bean="portalURLValve"/>                
+        <ref bean="securityValve"/>                
+        <ref bean="localizationValve"/>
+        <ref bean="profilerValve"/>                        
+        <ref bean="desktopValve"/>
+    </list>
+    </constructor-arg>
+  </bean> 
+      
+  <bean id='pipeline-map'
+        class='java.util.HashMap'>
+    <constructor-arg>
+        <map>
+            <entry key='/portlet'>
+                <value>portlet-pipeline</value>
+            </entry>            
+            <entry key='/portal'>
+                <value>jetspeed-pipeline</value>
+            </entry>
+            <entry key='/ajaxapi'>
+                <value>ajax-pipeline</value>
+            </entry>
+            <entry key='/login'>
+                <value>jetspeed-pipeline</value>
+            </entry>            
+            <entry key='/fileserver'>
+                <value>fileserver-pipeline</value>
+            </entry>                        
+            <entry key='/desktop'>
+                <value>desktop-pipeline</value>
+            </entry>                                    
+            <entry key='/action'>
+                <value>desktop-action-pipeline</value>
+            </entry>                                                
+        </map>        
+    </constructor-arg>        
+  </bean>
+
+  <bean id="debugValve"
+        class="org.apache.jetspeed.pipeline.valve.impl.DebugValveImpl"
+  /> 
+
+          
+</beans>

Added: incubator/graffito/trunk/jetspeed2-deploy/src/assembly_head/security-managers.xml
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/jetspeed2-deploy/src/assembly_head/security-managers.xml?rev=414920&view=auto
==============================================================================
--- incubator/graffito/trunk/jetspeed2-deploy/src/assembly_head/security-managers.xml (added)
+++ incubator/graffito/trunk/jetspeed2-deploy/src/assembly_head/security-managers.xml Fri Jun 16 14:27:25 2006
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<beans>
+  
+  <!-- Security: User Manager -->
+  <bean id="org.apache.jetspeed.security.UserManager" 
+  	   class="org.apache.jetspeed.security.impl.UserManagerImpl"
+  >  	   
+  	   <constructor-arg ><ref bean="org.apache.jetspeed.security.SecurityProvider"/></constructor-arg>
+  </bean>
+  
+   <!-- Security: Group Manager -->
+  <bean id="org.apache.jetspeed.security.GroupManager" 
+  	   class="org.apache.jetspeed.security.impl.GroupManagerImpl"
+  >  	   
+  	   <constructor-arg ><ref bean="org.apache.jetspeed.security.SecurityProvider"/></constructor-arg>   
+  </bean>
+  
+  <!-- Security: Role Manager -->
+  <bean id="org.apache.jetspeed.security.RoleManager" 
+  	   class="org.apache.jetspeed.security.impl.RoleManagerImpl"
+  >  	   
+  	   <constructor-arg ><ref bean="org.apache.jetspeed.security.SecurityProvider"/></constructor-arg>   
+  </bean>
+  
+  <!-- Security: Permission Manager -->
+  <!--bean id="org.apache.jetspeed.security.impl.PermissionManagerImpl" 
+  	   class="org.apache.jetspeed.security.impl.PermissionManagerImpl"  / -->
+    
+   <bean id="org.apache.jetspeed.security.impl.PermissionManagerImpl" 
+	 class="org.apache.portals.graffito.services.core.impl.ContentPermissionServiceImpl"  />
+   
+   <bean id="org.apache.jetspeed.security.PermissionManager" parent="baseTransactionProxy" 
+	 name="permissionManager" >
+	   <property name="proxyInterfaces">
+		   <value>org.apache.portals.graffito.services.core.ContentPermissionService</value>			
+	   </property>
+	   <property name="target">
+		   <ref bean="org.apache.jetspeed.security.impl.PermissionManagerImpl"/>
+	   </property>
+	   <property name="transactionAttributes">
+		   <props>				
+			   <prop key="remove*">PROPAGATION_REQUIRED</prop>
+			   <prop key="grant*">PROPAGATION_REQUIRED</prop>
+			   <prop key="revoke*">PROPAGATION_REQUIRED</prop>
+			   <prop key="grant*">PROPAGATION_REQUIRED</prop>
+			   <prop key="add*">PROPAGATION_REQUIRED</prop>
+			   <prop key="*">PROPAGATION_SUPPORTS</prop>
+		   </props>
+	   </property>
+   </bean>
+   
+   
+</beans>