From 6ecfa0541f191d01cb366e4bd755c5936504d4da Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Thu, 1 May 2008 17:11:31 +0000
Subject: [PATCH] SEC-806: Osgi-ified more modules

---
 acl/pom.xml    | 26 ++++++++++++++++++++++++++
 cas/pom.xml    |  2 +-
 core/pom.xml   |  2 +-
 openid/pom.xml | 23 ++++++++++++++++++++++-
 4 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/acl/pom.xml b/acl/pom.xml
index 9c9a657bec..34141bf68a 100644
--- a/acl/pom.xml
+++ b/acl/pom.xml
@@ -10,6 +10,7 @@
     <artifactId>spring-security-acl</artifactId>
     <name>Spring Security - ACL module</name>
     <version>2.0.1-SNAPSHOT</version>
+    <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>
@@ -44,4 +45,29 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+    
+    <properties>
+        <spring.osgi.export>
+            org.springframework.security.*;version=${pom.version}
+        </spring.osgi.export>
+            
+        <spring.osgi.import>
+            net.sf.ehcache.*;version="[1.4.1, 2.0.0)";resolution:=optional,
+            org.springframework.security.*;version="[${pom.version},${pom.version}]",
+            org.springframework.context.*;version="${spring.version.osgi}",
+            org.springframework.dao.*;version="${spring.version.osgi}";resolution:=optional,
+            org.springframework.jdbc.*;version="${spring.version.osgi}";resolution:=optional,
+            org.springframework.transaction.support.*;version="${spring.version.osgi}";resolution:=optional,
+            org.springframework.util.*;version="${spring.version.osgi}",
+            org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
+            javax.sql.*
+        </spring.osgi.import>
+
+        <spring.osgi.private.pkg>
+            !org.springframework.security.*
+        </spring.osgi.private.pkg>
+
+        <spring.osgi.symbolic.name>org.springframework.security.acls</spring.osgi.symbolic.name>        
+    </properties>    
+    
 </project>
\ No newline at end of file
diff --git a/cas/pom.xml b/cas/pom.xml
index 103c5f5590..8504597be8 100644
--- a/cas/pom.xml
+++ b/cas/pom.xml
@@ -61,7 +61,7 @@
     	    !org.springframework.security.*
     	</spring.osgi.private.pkg>
 
-    	<spring.osgi.symbolic.name>org.springframework.security.annotation</spring.osgi.symbolic.name>        
+    	<spring.osgi.symbolic.name>org.springframework.security.cas</spring.osgi.symbolic.name>        
     </properties>    
     
 </project>
\ No newline at end of file
diff --git a/core/pom.xml b/core/pom.xml
index 9f4c47b3e3..5dcfc6e329 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -192,7 +192,7 @@
     	    src/main/resources
     	</spring.osgi.include.res>
 -->
-    	<spring.osgi.symbolic.name>org.springframework.security</spring.osgi.symbolic.name>        
+    	<spring.osgi.symbolic.name>org.springframework.security.core</spring.osgi.symbolic.name>        
     </properties>
 
 </project>
diff --git a/openid/pom.xml b/openid/pom.xml
index 24405f09db..8841b99505 100644
--- a/openid/pom.xml
+++ b/openid/pom.xml
@@ -9,7 +9,7 @@
     <name>Spring Security - OpenID support</name>
     <description>Spring Security - Support for OpenID</description>
     <version>2.0.1-SNAPSHOT</version>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>
@@ -39,4 +39,25 @@
         </dependency>
     </dependencies>
 
+    <properties>
+        <spring.osgi.export>
+            org.springframework.security.*;version=${pom.version}
+        </spring.osgi.export>
+            
+        <spring.osgi.import>
+            javax.servlet.*;version="[2.4.0, 3.0.0)",
+            org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
+            org.openid4java.*;version="[0.9.3, 1.0.0)",
+            org.springframework.security.*;version="[${pom.version},${pom.version}]",
+            org.springframework.beans.*;version="${spring.version.osgi}",
+            org.springframework.util.*;version="${spring.version.osgi}"
+        </spring.osgi.import>
+
+        <spring.osgi.private.pkg>
+            !org.springframework.security.*
+        </spring.osgi.private.pkg>
+
+        <spring.osgi.symbolic.name>org.springframework.security.openid</spring.osgi.symbolic.name>        
+    </properties>    
+
 </project>
\ No newline at end of file