浏览代码

SEC-806: Osgi-ified more modules

Luke Taylor 17 年之前
父节点
当前提交
6ecfa0541f
共有 4 个文件被更改,包括 50 次插入3 次删除
  1. 26 0
      acl/pom.xml
  2. 1 1
      cas/pom.xml
  3. 1 1
      core/pom.xml
  4. 22 1
      openid/pom.xml

+ 26 - 0
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>

+ 1 - 1
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>

+ 1 - 1
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>

+ 22 - 1
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>