Improve JCR and security dependencies

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

diff --git a/pom.xml b/pom.xml
index de428292ffc11dd6e153a3383c4b45e114152d11..5f6feca0c244927e7276e2014c26c490ef4531a8 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
                <version.argeo-commons>0.2.2-SNAPSHOT</version.argeo-commons>
                <version.argeo-ria>0.12.5</version.argeo-ria>
                <version.equinox>3.6.1</version.equinox>
-               <version.maven-argeo-osgi>0.1.29</version.maven-argeo-osgi>
+               <version.maven-argeo-osgi>0.1.30-SNAPSHOT</version.maven-argeo-osgi>
                <version.maven-bundle-plugin>2.0.1</version.maven-bundle-plugin>
                <version.maven-argeo-qooxdoo>1.1.0</version.maven-argeo-qooxdoo>
                <site.repoBase>file:///srv/projects/www/commons/site</site.repoBase>

diff --git a/security/runtime/org.argeo.security.core/pom.xml b/security/runtime/org.argeo.security.core/pom.xml
index 388d5c35171b1afc3cb4a5653e91a8e05e6e74e6..37c7390ec2d5bf182bb560a41694a0be02995c83 100644 (file)
--- a/security/runtime/org.argeo.security.core/pom.xml
+++ b/security/runtime/org.argeo.security.core/pom.xml
@@ -34,6 +34,13 @@
                                                <Import-Package>*,
                                                        org.springframework.context,
                                                        org.argeo.server.json;resolution:=optional,
+                                                       javax.jms;resolution:=optional,
+                                                       org.apache.activemq;resolution:=optional,
+                                                       org.apache.activemq.broker;resolution:=optional,
+                                                       org.apache.activemq.command;resolution:=optional,
+                                                       org.apache.activemq.security;resolution:=optional,
+                                                       org.springframework.jms.connection;resolution:=optional,
+                                                       org.springframework.ldap.core;resolution:=optional,
                                                        org.springframework.ldap.core.support;resolution:=optional,
                                                </Import-Package>
                                        </instructions>
@@ -66,10 +73,6 @@
                        <groupId>org.springframework</groupId>
                        <artifactId>org.springframework.transaction</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>org.springframework.jms</artifactId>
-               </dependency>
                <dependency>
                        <groupId>org.springframework.security</groupId>
                        <artifactId>org.springframework.security.core</artifactId>
@@ -108,10 +111,17 @@
                <dependency>
                        <groupId>org.argeo.dep.osgi</groupId>
                        <artifactId>org.argeo.dep.osgi.activemq</artifactId>
+                       <optional>true</optional>
                </dependency>
                <dependency>
                        <groupId>javax.jms</groupId>
                        <artifactId>com.springsource.javax.jms</artifactId>
+                       <optional>true</optional>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>org.springframework.jms</artifactId>
+                       <optional>true</optional>
                </dependency>
 
                <!-- TEST -->

diff --git a/server/dep/org.argeo.server.dep.jackrabbit.server/pom.xml b/server/dep/org.argeo.server.dep.jackrabbit.server/pom.xml
index 11e658918d5638d1212bc573ebd21e78a61cc19b..e848092753ac1d50a75264a0ce054667589e3dac 100644 (file)
--- a/server/dep/org.argeo.server.dep.jackrabbit.server/pom.xml
+++ b/server/dep/org.argeo.server.dep.jackrabbit.server/pom.xml
@@ -44,6 +44,11 @@
                        <groupId>org.argeo.dep.osgi</groupId>
                        <artifactId>org.argeo.dep.osgi.jackrabbit</artifactId>
                </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.server.tika.jackrabbit</artifactId>
+                       <version>0.2.2-SNAPSHOT</version>
+               </dependency>
                <dependency>
                        <groupId>org.apache.xalan</groupId>
                        <artifactId>com.springsource.org.apache.xalan</artifactId>

diff --git a/server/modules/org.argeo.server.tika.jackrabbit/.project b/server/modules/org.argeo.server.tika.jackrabbit/.project
new file mode 100644 (file)
index 0000000..315771f
--- /dev/null
+++ b/server/modules/org.argeo.server.tika.jackrabbit/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>org.argeo.server.tika.jackrabbit</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.pde.PluginNature</nature>
+       </natures>
+</projectDescription>

diff --git a/server/modules/org.argeo.server.tika.jackrabbit/.settings/org.eclipse.pde.core.prefs b/server/modules/org.argeo.server.tika.jackrabbit/.settings/org.eclipse.pde.core.prefs
new file mode 100644 (file)
index 0000000..c8bc6bc
--- /dev/null
+++ b/server/modules/org.argeo.server.tika.jackrabbit/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,4 @@
+#Mon Jan 10 13:35:52 CET 2011
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false

diff --git a/server/modules/org.argeo.server.tika.jackrabbit/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.tika.jackrabbit/META-INF/MANIFEST.MF
new file mode 100644 (file)
index 0000000..7e3970d
--- /dev/null
+++ b/server/modules/org.argeo.server.tika.jackrabbit/META-INF/MANIFEST.MF
@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Tika Jackrabbit extension
+Bundle-SymbolicName: org.argeo.server.tika.jackrabbit
+Bundle-Version: 0.2.2.SNAPSHOT
+Fragment-Host: org.argeo.dep.osgi.tika
+Import-Package: org.apache.jackrabbit.core.query.pdf

diff --git a/server/modules/org.argeo.server.tika.jackrabbit/build.properties b/server/modules/org.argeo.server.tika.jackrabbit/build.properties
new file mode 100644 (file)
index 0000000..5f22cdd
--- /dev/null
+++ b/server/modules/org.argeo.server.tika.jackrabbit/build.properties
@@ -0,0 +1 @@
+bin.includes = META-INF/

diff --git a/server/modules/pom.xml b/server/modules/pom.xml
index b12b0105cec47b4272c7456eb6a5683254dae094..4b86df727bc34766a46289935eec90b6dda537ba 100644 (file)
--- a/server/modules/pom.xml
+++ b/server/modules/pom.xml
@@ -22,20 +22,4 @@
                        </plugin>
                </plugins>
        </build>
-       <dependencies>
-               <dependency>
-                       <groupId>org.argeo.commons.server</groupId>
-                       <artifactId>org.argeo.server.dep.jackrabbit.server</artifactId>
-                       <version>0.2.2-SNAPSHOT</version>
-                       <type>pom</type>
-               </dependency>
-
-               <!-- Used to start the Apache Directory server -->
-               <dependency>
-                       <groupId>org.argeo.commons.server</groupId>
-                       <artifactId>org.argeo.server.ads</artifactId>
-                       <version>0.2.2-SNAPSHOT</version>
-               </dependency>
-
-       </dependencies>
 </project>
\ No newline at end of file

diff --git a/server/pom.xml b/server/pom.xml
index ae364575b99301d5a4df3a1ea432e2cf60e806af..3d435aaa1b81a27a76281c9de2d0cf62a1ba6ee3 100644 (file)
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -11,8 +11,8 @@
        <name>Commons Server</name>
        <packaging>pom</packaging>
        <modules>
-               <module>runtime</module>
                <module>modules</module>
+               <module>runtime</module>
                <module>dep</module>
                <module>demo</module>
        </modules>