incubator-graffito-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clomb...@apache.org
Subject svn commit: r370614 - in /incubator/graffito/trunk/jetspeed2-deploy: locator.ent locator.path project.xml src/assembly/security-managers.xml
Date Thu, 19 Jan 2006 20:18:56 GMT
Author: clombart
Date: Thu Jan 19 12:18:49 2006
New Revision: 370614

URL: http://svn.apache.org/viewcvs?rev=370614&view=rev
Log:
* Add all dependency version in the project.properties (on the  project root level)
* The permission manager in the spring xml file was invalid

Removed:
    incubator/graffito/trunk/jetspeed2-deploy/locator.ent
    incubator/graffito/trunk/jetspeed2-deploy/locator.path
Modified:
    incubator/graffito/trunk/jetspeed2-deploy/project.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=370614&r1=370613&r2=370614&view=diff
==============================================================================
--- incubator/graffito/trunk/jetspeed2-deploy/project.xml (original)
+++ incubator/graffito/trunk/jetspeed2-deploy/project.xml Thu Jan 19 12:18:49 2006
@@ -1,7 +1,5 @@
 <?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
 
@@ -39,36 +37,36 @@
     <dependency>
       <id>jetspeed-portal</id>
       <groupId>org.apache.portals.jetspeed-2</groupId>
-      <version>&jetspeed-version;</version>
+      <version>${jetspeed.version}</version>
     </dependency>   
 	
      <dependency>
       <id>jetspeed-api</id>
       <groupId>org.apache.portals.jetspeed-2</groupId>
-      <version>&jetspeed-version;</version>
+      <version>${jetspeed.version}</version>
     </dependency> 
 
      <dependency>
       <id>jetspeed-components</id>
       <groupId>org.apache.portals.jetspeed-2</groupId>
-      <version>&jetspeed-version;</version>
+      <version>${jetspeed.version}</version>
     </dependency> 
 		
     <dependency>  
       <id>graffito-commons</id>
       <groupId>org.apache.portals.graffito</groupId>
-      <version>1.0-a1-dev</version>
+      <version>${graffito.version}</version>
     </dependency>
     <dependency>  
       <id>graffito-api</id>
       <groupId>org.apache.portals.graffito</groupId>
-      <version>1.0-a1-dev</version>
+      <version>${graffito.version}</version>
     </dependency>
 
     <dependency>  
       <id>graffito-components</id>
       <groupId>org.apache.portals.graffito</groupId>
-      <version>1.0-a1-dev</version>
+      <version>${graffito.version}</version>
     </dependency> 
   </dependencies>
 

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=370614&r1=370613&r2=370614&view=diff
==============================================================================
--- incubator/graffito/trunk/jetspeed2-deploy/src/assembly/security-managers.xml (original)
+++ incubator/graffito/trunk/jetspeed2-deploy/src/assembly/security-managers.xml Thu Jan 19
12:18:49 2006
@@ -41,28 +41,29 @@
   <!-- 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.jetspeed.security.PermissionManager</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 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