Add equinox support in server and agent

git-svn-id: https://svn.argeo.org/slc/trunk@2535 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/dep/org.argeo.slc.dep.agent/pom.xml b/dep/org.argeo.slc.dep.agent/pom.xml
index 3f6f3e7f3c4f88d97a70311a950d54386a67e6dc..c2e53e2734daa1989a1e0ea48a69e3287f16179d 100644 (file)
--- a/dep/org.argeo.slc.dep.agent/pom.xml
+++ b/dep/org.argeo.slc.dep.agent/pom.xml
@@ -28,5 +28,9 @@
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.castor</artifactId>
                </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc.runtime</groupId>
+                       <artifactId>org.argeo.slc.support.equinox</artifactId>
+               </dependency>
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/dep/org.argeo.slc.dep.server/pom.xml b/dep/org.argeo.slc.dep.server/pom.xml
index 0efce604d6b085c2071ee6eee59ea50976c8be35..83811fff6528d083ef9da33f537a896316b24010 100644 (file)
--- a/dep/org.argeo.slc.dep.server/pom.xml
+++ b/dep/org.argeo.slc.dep.server/pom.xml
@@ -29,6 +29,10 @@
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.hibernate</artifactId>
                </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc.runtime</groupId>
+                       <artifactId>org.argeo.slc.support.equinox</artifactId>
+               </dependency>
 
                <!-- OSGi integration -->
                <dependency>

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/MANIFEST.MF
index 3e5adbe484a546ca67d38b1c9df85347a31395ac..bfc9281af6e60386f5bc6e809a9c1ca713e09b68 100644 (file)
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/MANIFEST.MF
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/MANIFEST.MF
@@ -1,12 +1,21 @@
 Manifest-Version: 1.0\r
-Require-Bundle: org.argeo.slc.support.activemq,org.argeo.slc.specs,org\r
- .argeo.slc.support.simple,com.springsource.org.castor\r
+Require-Bundle: org.argeo.slc.support.activemq,\r
+ org.argeo.slc.specs,\r
+ org.argeo.slc.support.simple,\r
+ com.springsource.org.castor,\r
+ org.argeo.slc.support.equinox\r
 Bundle-Version: 0.11.4.SNAPSHOT\r
 Bundle-Name: Argeo SLC Agent\r
 Bundle-SymbolicName: org.argeo.slc.agent\r
-Import-Package: javax.jms,org.apache.activemq,org.apache.activemq.comm\r
- and,org.apache.activemq.pool,org.apache.commons.pool,org.springframew\r
- ork.beans.factory.config,org.springframework.jms.connection,org.sprin\r
- gframework.jms.core,org.springframework.jms.listener,org.springframew\r
- ork.jms.listener.adapter,org.springframework.oxm.castor\r
+Import-Package: javax.jms,\r
+ org.apache.activemq,\r
+ org.apache.activemq.comm and,\r
+ org.apache.activemq.pool,\r
+ org.apache.commons.pool,\r
+ org.springframework.beans.factory.config,\r
+ org.springframework.jms.connection,\r
+ org.springframework.jms.core,\r
+ org.springframework.jms.listener,\r
+ org.springframework.jms.listener.adapter,\r
+ org.springframework.oxm.castor\r
 \r