incubator-graffito-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clomb...@apache.org
Subject svn commit: r348298 - in /incubator/graffito/trunk/jetspeed2-deploy: project.xml src/assembly/graffito.xml src/assembly/jetspeed-spring.xml src/assembly/pipelines.xml src/assembly/security-managers.xml
Date Tue, 22 Nov 2005 23:51:45 GMT
Author: clombart
Date: Tue Nov 22 15:51:37 2005
New Revision: 348298

URL: http://svn.apache.org/viewcvs?rev=348298&view=rev
Log:
* Support Jetspeed2 - apply patch provided by Randy


Removed:
    incubator/graffito/trunk/jetspeed2-deploy/src/assembly/jetspeed-spring.xml
Modified:
    incubator/graffito/trunk/jetspeed2-deploy/project.xml
    incubator/graffito/trunk/jetspeed2-deploy/src/assembly/graffito.xml
    incubator/graffito/trunk/jetspeed2-deploy/src/assembly/pipelines.xml
    incubator/graffito/trunk/jetspeed2-deploy/src/assembly/security-managers.xml

Modified: incubator/graffito/trunk/jetspeed2-deploy/project.xml
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/jetspeed2-deploy/project.xml?rev=348298&r1=348297&r2=348298&view=diff
==============================================================================
--- incubator/graffito/trunk/jetspeed2-deploy/project.xml (original)
+++ incubator/graffito/trunk/jetspeed2-deploy/project.xml Tue Nov 22 15:51:37 2005
@@ -1,105 +1,105 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
-  <!ENTITY % locator-entities SYSTEM "file:locator.ent"> %locator-entities;
-]>
-<!-- 
- Copyright 2002-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.
- -->
-
-<!--
-  $Id: project.xml,v 1.1 2004/12/22 20:54:32 christophe Exp $
--->
-<project>
-  <extend>${basedir}/../project.xml</extend>
-  <id>graffito-jetspeed2-deploy</id>
-  <name>Graffito J2 deployemt</name>
-  <description>Deployment files used for running Graffito within Jetspeed2. Mainly PSML &amp; Spring assembly script</description>
-  <shortDescription>Graffito J2-Deploy</shortDescription>
-
-  <repository>
-    <connection>scm:subversion:https://svn.apache.org/repos/asf/incubator/graffito/trunk/jetspeed2-deploy</connection>
-    <developerConnection>scm:subversion:https://svn.apache.org/repos/asf/incubator/graffito/trunk/jetspeed2-deploy</developerConnection>
-    <url>http://svn.apache.org/viewcvs</url>
-  </repository>
-
-  <dependencies>
-  
-    <dependency>
-      <id>jetspeed</id>
-      <groupId>jetspeed2</groupId>
-      <version>&jetspeed-version;</version>
-    </dependency>   
-	
-     <dependency>
-      <id>jetspeed-api</id>
-      <groupId>jetspeed2</groupId>
-      <version>&jetspeed-version;</version>
-    </dependency> 
-
-     <dependency>
-      <id>jetspeed-components</id>
-      <groupId>jetspeed2</groupId>
-      <version>&jetspeed-version;</version>
-    </dependency> 
-		
-    <dependency>  
-      <id>graffito-commons</id>
-      <groupId>graffito</groupId>
-      <version>1.0-a1-dev</version>
-    </dependency>
-    <dependency>  
-      <id>graffito-api</id>
-      <groupId>graffito</groupId>
-      <version>1.0-a1-dev</version>
-    </dependency>
-
-    <dependency>  
-      <id>graffito-components</id>
-      <groupId>graffito</groupId>
-      <version>1.0-a1-dev</version>
-    </dependency> 
-  </dependencies>
-
-  <build>
-    <sourceDirectory>src/java</sourceDirectory>
-
-    <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
-    <unitTest>
-      <resources>
-        <resource>
-          <directory>${basedir}/src/test</directory>
-          <excludes>
-           <exclude>**/*.java</exclude>
-          </excludes>
-        </resource>
-      </resources>
-    </unitTest>
-    
-    <resources>
-      <resource>
-        <directory>${basedir}/src/java</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </resource>
-    </resources>
-
-  </build>
-  <reports>
-       <report>maven-javadoc-plugin</report>
-  </reports>
-
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project [
+  <!ENTITY % locator-entities SYSTEM "file:locator.ent"> %locator-entities;
+]>
+<!-- 
+ Copyright 2002-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.
+ -->
+
+<!--
+  $Id: project.xml,v 1.1 2004/12/22 20:54:32 christophe Exp $
+-->
+<project>
+  <extend>${basedir}/../project.xml</extend>
+  <id>graffito-jetspeed2-deploy</id>
+  <name>Graffito J2 deployemt</name>
+  <description>Deployment files used for running Graffito within Jetspeed2. Mainly PSML &amp; Spring assembly script</description>
+  <shortDescription>Graffito J2-Deploy</shortDescription>
+
+  <repository>
+    <connection>scm:subversion:https://svn.apache.org/repos/asf/incubator/graffito/trunk/jetspeed2-deploy</connection>
+    <developerConnection>scm:subversion:https://svn.apache.org/repos/asf/incubator/graffito/trunk/jetspeed2-deploy</developerConnection>
+    <url>http://svn.apache.org/viewcvs</url>
+  </repository>
+
+  <dependencies>
+  
+    <dependency>
+      <id>jetspeed-portal</id>
+      <groupId>jetspeed2</groupId>
+      <version>&jetspeed-version;</version>
+    </dependency>   
+	
+     <dependency>
+      <id>jetspeed-api</id>
+      <groupId>jetspeed2</groupId>
+      <version>&jetspeed-version;</version>
+    </dependency> 
+
+     <dependency>
+      <id>jetspeed-components</id>
+      <groupId>jetspeed2</groupId>
+      <version>&jetspeed-version;</version>
+    </dependency> 
+		
+    <dependency>  
+      <id>graffito-commons</id>
+      <groupId>graffito</groupId>
+      <version>1.0-a1-dev</version>
+    </dependency>
+    <dependency>  
+      <id>graffito-api</id>
+      <groupId>graffito</groupId>
+      <version>1.0-a1-dev</version>
+    </dependency>
+
+    <dependency>  
+      <id>graffito-components</id>
+      <groupId>graffito</groupId>
+      <version>1.0-a1-dev</version>
+    </dependency> 
+  </dependencies>
+
+  <build>
+    <sourceDirectory>src/java</sourceDirectory>
+
+    <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
+    <unitTest>
+      <resources>
+        <resource>
+          <directory>${basedir}/src/test</directory>
+          <excludes>
+           <exclude>**/*.java</exclude>
+          </excludes>
+        </resource>
+      </resources>
+    </unitTest>
+    
+    <resources>
+      <resource>
+        <directory>${basedir}/src/java</directory>
+        <excludes>
+          <exclude>**/*.java</exclude>
+        </excludes>
+      </resource>
+    </resources>
+
+  </build>
+  <reports>
+       <report>maven-javadoc-plugin</report>
+  </reports>
+
+
+</project>

Modified: incubator/graffito/trunk/jetspeed2-deploy/src/assembly/graffito.xml
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/jetspeed2-deploy/src/assembly/graffito.xml?rev=348298&r1=348297&r2=348298&view=diff
==============================================================================
--- incubator/graffito/trunk/jetspeed2-deploy/src/assembly/graffito.xml (original)
+++ incubator/graffito/trunk/jetspeed2-deploy/src/assembly/graffito.xml Tue Nov 22 15:51:37 2005
@@ -1,176 +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>jetspeed</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>
\ No newline at end of file
+<?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>

Modified: incubator/graffito/trunk/jetspeed2-deploy/src/assembly/pipelines.xml
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/jetspeed2-deploy/src/assembly/pipelines.xml?rev=348298&r1=348297&r2=348298&view=diff
==============================================================================
--- incubator/graffito/trunk/jetspeed2-deploy/src/assembly/pipelines.xml (original)
+++ incubator/graffito/trunk/jetspeed2-deploy/src/assembly/pipelines.xml Tue Nov 22 15:51:37 2005
@@ -1,208 +1,297 @@
-<?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"
-  /> 
-  
-  <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>
-  </bean> 
-  
-  <bean id="passwordCredentialValve"
-        class="org.apache.jetspeed.security.impl.PasswordCredentialValveImpl"
-        init-method="initialize"
-  >
-   <constructor-arg>
-     <!-- expirationWarningDays -->
-     <list>
-       <value>2</value>
-       <value>3</value>
-       <value>7</value>
-     </list>
-   </constructor-arg>
-  </bean> 
-  
-  <bean id="loginValidationValve"
-        class="org.apache.jetspeed.security.impl.LoginValidationValveImpl"
-        init-method="initialize"
-  >
-    <!-- maxNumberOfAuthenticationFailures
-         This value should be in sync with the value for
-         org.apache.jetspeed.security.spi.InternalPasswordCredentialInterceptor
-         (if used) to make sense.
-         Any value < 2 will suppress the LoginConststants.ERROR_FINAL_LOGIN_ATTEMPT
-         error code when one one last attempt is possible before the credential
-         will be disabled on failure.
-    -->
-    <constructor-arg index="0"><value>3</value></constructor-arg>  
-  </bean> 
-  
-  <bean id="profilerValve"
-        class="org.apache.jetspeed.profiler.impl.ProfilerValveImpl"
-        init-method="initialize"
-  >
-   <constructor-arg>
-   	<ref bean="org.apache.jetspeed.profiler.Profiler" />
-   </constructor-arg>
-   <constructor-arg>
-   	<ref bean="org.apache.jetspeed.page.PageManager" />
-   </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>
-  </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="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="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="localizationValve"/>
-    	<ref bean="capabilityValve"/>
-        <ref bean="portalURLValve"/>
-    	<ref bean="securityValve"/>
-        <ref bean="passwordCredentialValve"/>
-        <ref bean="loginValidationValve"/>        
-  		<ref bean="GraffitoContextValve"/>
-    	<ref bean="profilerValve"/>
-    	<ref bean="containerValve"/>
-    	<ref bean="actionValve"/>
-    	<ref bean="aggregatorValve"/>
-    	<ref bean="cleanUpValve"/>
-    </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="portlet-pipeline"
-        class="org.apache.jetspeed.pipeline.JetspeedPipeline"
-        init-method="initialize"
-  >
-   <constructor-arg>
-   	<value>PortletPipeline</value>
-   </constructor-arg>
-   <constructor-arg>
-    <list>
-    	<ref bean="localizationValve"/>
-        <ref bean="portalURLValve"/>    	    	
-    	<ref bean="capabilityValve"/>
-    	<ref bean="securityValve"/>    	    	
-        <ref bean="profilerValve"/>    	    	    	
-    	<ref bean="containerValve"/>
-    	<ref bean="portletValve"/>    
-    </list>
-    </constructor-arg>
-  </bean> 
-  
-  
-</beans>
\ No newline at end of file
+<?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"
+  /> 
+  
+  <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"
+  />
+  
+  <bean id="profilerValve"
+        class="org.apache.jetspeed.profiler.impl.ProfilerValveImpl"
+        init-method="initialize"
+  >
+   <constructor-arg>
+   	<ref bean="org.apache.jetspeed.profiler.Profiler" />
+   </constructor-arg>
+   <constructor-arg>
+   	<ref bean="org.apache.jetspeed.portalsite.PortalSite" />
+   </constructor-arg>
+   <constructor-arg>
+   	<ref bean="org.apache.jetspeed.page.PageManager" />
+   </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>   
+  </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="loginViewValve"
+        class="org.apache.jetspeed.login.impl.LoginJSPViewValve"
+        init-method="initialize"
+  >
+    <constructor-arg>
+      <value>/WEB-INF/templates/login</value>
+    </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="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="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="securityValve"/>    	    	-->
+    	<ref bean="AJAXValve"/>
+    </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='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='/ajax'>
+                <value>ajax-pipeline</value>
+            </entry>
+            <entry key='/login'>
+                <value>jetspeed-pipeline</value>
+            </entry>            
+            <entry key='/fileserver'>
+                <value>fileserver-pipeline</value>
+            </entry>                        
+        </map>        
+    </constructor-arg>        
+  </bean>
+  
+</beans>

Modified: incubator/graffito/trunk/jetspeed2-deploy/src/assembly/security-managers.xml
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/jetspeed2-deploy/src/assembly/security-managers.xml?rev=348298&r1=348297&r2=348298&view=diff
==============================================================================
--- incubator/graffito/trunk/jetspeed2-deploy/src/assembly/security-managers.xml (original)
+++ incubator/graffito/trunk/jetspeed2-deploy/src/assembly/security-managers.xml Tue Nov 22 15:51:37 2005
@@ -1,66 +1,66 @@
-<?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.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>
+<?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.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>



Mime
View raw message