New Maven guidelines applied

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

diff --git a/dep/org.argeo.slc.dep.backend/pom.xml b/dep/org.argeo.slc.dep.backend/pom.xml
index 3c46f14cd57b00bccb5853c59a1c0315c551f2ad..6ee3373544a58c0dab905b2a461ba5739059c33a 100644 (file)
--- a/dep/org.argeo.slc.dep.backend/pom.xml
+++ b/dep/org.argeo.slc.dep.backend/pom.xml
@@ -92,17 +92,17 @@
                <dependency>
                        <groupId>org.argeo.slc.modules</groupId>
                        <artifactId>org.argeo.slc.agent</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.modules</groupId>
                        <artifactId>org.argeo.slc.agent.jcr</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.modules</groupId>
                        <artifactId>org.argeo.slc.node.jackrabbit</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
 
                <!-- SLC Repo -->
@@ -114,12 +114,12 @@
                <dependency>
                        <groupId>org.argeo.slc.modules</groupId>
                        <artifactId>org.argeo.slc.server.repo</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.modules</groupId>
                        <artifactId>org.argeo.slc.server.repo.webapp</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Launcher -->

diff --git a/dep/org.argeo.slc.dep.detached/pom.xml b/dep/org.argeo.slc.dep.detached/pom.xml
index a4b858a82f8e7b1b6741d8be349f7838205299a0..b5ab5d5268ccd00bbcc6fd7e9ba26c5a327ae809 100644 (file)
--- a/dep/org.argeo.slc.dep.detached/pom.xml
+++ b/dep/org.argeo.slc.dep.detached/pom.xml
@@ -15,12 +15,12 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.detached</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.jemmy</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
                <!-- For JDK 1.4 -->
                <dependency>

diff --git a/dist/slc-maven/pom.xml b/dist/slc-maven/pom.xml
index 42d7d13acee2359f7e59751f1f3e94a3ccfd73e9..187b944a060826224746d23cf79bb9564a39134b 100644 (file)
--- a/dist/slc-maven/pom.xml
+++ b/dist/slc-maven/pom.xml
@@ -14,6 +14,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.maven</artifactId>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
        </dependencies>
        <profiles>

diff --git a/eclipse/plugins/org.argeo.slc.client.rap/pom.xml b/eclipse/plugins/org.argeo.slc.client.rap/pom.xml
index de9dfecb74fb11dd8c9ec9d0d16cef487a363151..6a7e79d7f5906a67e6ad6830a695179116cb8c19 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.client.rap/pom.xml
+++ b/eclipse/plugins/org.argeo.slc.client.rap/pom.xml
@@ -16,7 +16,7 @@
                <dependency>
                        <groupId>org.argeo.slc.eclipse</groupId>
                        <artifactId>org.argeo.slc.client.ui</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo common distribution for RAP projects -->

diff --git a/eclipse/plugins/org.argeo.slc.client.rcp/pom.xml b/eclipse/plugins/org.argeo.slc.client.rcp/pom.xml
index f025ba72dd741485f24a419d4b0816395400944b..85040cbb3d96870280e16fbf2d7da144f543a2b7 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.client.rcp/pom.xml
+++ b/eclipse/plugins/org.argeo.slc.client.rcp/pom.xml
@@ -11,7 +11,6 @@
        <name>SLC Client RCP</name>
        <packaging>jar</packaging>
        <dependencies>
-
                <!-- SLC -->
                <dependency>
                        <groupId>org.argeo.slc.eclipse</groupId>
@@ -20,6 +19,17 @@
                </dependency>
 
                <!-- Bundles to start -->
+               <dependency>
+                       <groupId>org.argeo.slc.modules</groupId>
+                       <artifactId>org.argeo.slc.node.jackrabbit</artifactId>
+                       <version>0.13.1-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc.modules</groupId>
+                       <artifactId>org.argeo.slc.agent</artifactId>
+                       <version>0.13.1-SNAPSHOT</version>
+               </dependency>
+
                <dependency>
                        <groupId>org.argeo.commons.security</groupId>
                        <artifactId>org.argeo.security.dao.jackrabbit</artifactId>
@@ -36,53 +46,6 @@
                        <version>${version.argeo-commons}</version>
                </dependency>
 
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.slc.eclipse</groupId> -->
-<!--                   <artifactId>org.argeo.slc.client.agent</artifactId> -->
-<!--                   <version>${version.slc}</version> -->
-<!--           </dependency> -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.slc.eclipse</groupId> -->
-<!--                   <artifactId>org.argeo.slc.client.hibernate</artifactId> -->
-<!--                   <version>${version.slc}</version> -->
-<!--           </dependency> -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.slc.eclipse</groupId> -->
-<!--                   <artifactId>org.argeo.slc.client.oxm</artifactId> -->
-<!--                   <version>${version.slc}</version> -->
-<!--           </dependency> -->
-
-               <dependency>
-                       <groupId>org.argeo.slc.modules</groupId>
-                       <artifactId>org.argeo.slc.node.jackrabbit</artifactId>
-                       <version>${version.slc}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.modules</groupId>
-                       <artifactId>org.argeo.slc.agent</artifactId>
-                       <version>${version.slc}</version>
-               </dependency>
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.slc.modules</groupId> -->
-<!--                   <artifactId>org.argeo.slc.server.castor</artifactId> -->
-<!--                   <version>${version.slc}</version> -->
-<!--           </dependency> -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.slc.modules</groupId> -->
-<!--                   <artifactId>org.argeo.slc.server.h2</artifactId> -->
-<!--                   <version>${version.slc}</version> -->
-<!--           </dependency> -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.slc.modules</groupId> -->
-<!--                   <artifactId>org.argeo.slc.server.hibernate</artifactId> -->
-<!--                   <version>${version.slc}</version> -->
-<!--           </dependency> -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.slc.modules</groupId> -->
-<!--                   <artifactId>org.argeo.slc.server.services</artifactId> -->
-<!--                   <version>${version.slc}</version> -->
-<!--           </dependency> -->
-
                <!-- Security UI -->
                <dependency>
                        <groupId>org.argeo.commons.eclipse</groupId>
@@ -94,7 +57,5 @@
                        <artifactId>org.argeo.security.ui.rcp</artifactId>
                        <version>${version.argeo-commons}</version>
                </dependency>
-
-
        </dependencies>
 </project>

diff --git a/eclipse/plugins/org.argeo.slc.client.ui.dist/pom.xml b/eclipse/plugins/org.argeo.slc.client.ui.dist/pom.xml
index 6e0d789050c193d1e5837b2d48b1f12d6aa92b1c..1c16c65e0c3ef14b71231918393e059d6f5d23a2 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.client.ui.dist/pom.xml
+++ b/eclipse/plugins/org.argeo.slc.client.ui.dist/pom.xml
@@ -36,12 +36,12 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.repo</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.modules</groupId>
                        <artifactId>org.argeo.slc.server.repo</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
 
 

diff --git a/eclipse/plugins/org.argeo.slc.client.ui/pom.xml b/eclipse/plugins/org.argeo.slc.client.ui/pom.xml
index 2bf2f5c41a5d7334717fbdd74a43e349b132aa0a..2898f9e16c26f986549089dc943fcc7398ab7795 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.client.ui/pom.xml
+++ b/eclipse/plugins/org.argeo.slc.client.ui/pom.xml
@@ -29,18 +29,18 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.jcr</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
 
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.server</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Eclipse -->

diff --git a/modules/agent/org.argeo.slc.agent.ext.bsf/META-INF/MANIFEST.MF b/modules/agent/org.argeo.slc.agent.ext.bsf/META-INF/MANIFEST.MF
index e85e6fb1d547e11c80fdf05a3e50d6939260b3c2..ff66b0d955df7b4208494ebd110d49ca27a667ce 100644 (file)
--- a/modules/agent/org.argeo.slc.agent.ext.bsf/META-INF/MANIFEST.MF
+++ b/modules/agent/org.argeo.slc.agent.ext.bsf/META-INF/MANIFEST.MF
@@ -1,7 +1,17 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Fragment-Host: com.springsource.org.apache.bsf
-Bundle-Version: 0.13.1.SNAPSHOT
-Bundle-SymbolicName: org.argeo.slc.agent.ext.bsf
-Import-Package: bsh.util;resolution:=optional,
- org.codehaus.groovy.bsf;resolution:=optional
+Manifest-Version: 1.0\r
+Bnd-LastModified: 1330634569947\r
+Build-Jdk: 1.6.0_22\r
+Built-By: mbaudier\r
+Bundle-DocURL: http://www.argeo.org\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Bundle-ManifestVersion: 2\r
+Bundle-Name: SLC Agent BSF Extension\r
+Bundle-RequiredExecutionEnvironment: J2SE-1.5\r
+Bundle-SymbolicName: org.argeo.slc.agent.ext.bsf\r
+Bundle-Vendor: Argeo\r
+Bundle-Version: 0.13.1.SNAPSHOT-r120301_2142\r
+Created-By: Apache Maven Bundle Plugin\r
+Fragment-Host: com.springsource.org.apache.bsf\r
+Import-Package: bsh.util;resolution:=optional,org.codehaus.groovy.bsf;re\r
+ solution:=optional\r
+Tool: Bnd-1.50.0\r

diff --git a/modules/agent/org.argeo.slc.agent.ext.bsf/pom.xml b/modules/agent/org.argeo.slc.agent.ext.bsf/pom.xml
new file mode 100644 (file)
index 0000000..352e66a
--- /dev/null
+++ b/modules/agent/org.argeo.slc.agent.ext.bsf/pom.xml
@@ -0,0 +1,30 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.slc.modules</groupId>
+               <artifactId>agent</artifactId>
+               <version>0.13.1-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.slc.agent.ext.bsf</artifactId>
+       <name>SLC Agent BSF Extension</name>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <Fragment-Host>com.springsource.org.apache.bsf</Fragment-Host>
+                                               <Import-Package>
+                                                       *,
+                                                       bsh.util;resolution:=optional,
+                                                       org.codehaus.groovy.bsf;resolution:=optional
+                                               </Import-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+</project>
\ No newline at end of file

diff --git a/modules/agent/org.argeo.slc.agent.ext.jdbc/META-INF/MANIFEST.MF b/modules/agent/org.argeo.slc.agent.ext.jdbc/META-INF/MANIFEST.MF
index af128346c05906ef501f7f43cd0967ce3eb3617f..fde3e6e73cbe725bf7f017630c38f8cf8a901dd8 100644 (file)
--- a/modules/agent/org.argeo.slc.agent.ext.jdbc/META-INF/MANIFEST.MF
+++ b/modules/agent/org.argeo.slc.agent.ext.jdbc/META-INF/MANIFEST.MF
@@ -1,7 +1,17 @@
-Manifest-Version: 1.0
-Fragment-Host: org.springframework.jdbc
-Bundle-Version: 0.13.1.SNAPSHOT
-Bundle-SymbolicName: org.argeo.slc.agent.ext.jdbc
-Import-Package: com.mysql.jdbc;resolution:=optional,
- net.sourceforge.jtds.jdbc;resolution:=optional,
- org.hsqldb;resolution:=optional
+Manifest-Version: 1.0\r
+Bnd-LastModified: 1330634570312\r
+Build-Jdk: 1.6.0_22\r
+Built-By: mbaudier\r
+Bundle-DocURL: http://www.argeo.org\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Bundle-ManifestVersion: 2\r
+Bundle-Name: SLC Agent JDBC Extension\r
+Bundle-RequiredExecutionEnvironment: J2SE-1.5\r
+Bundle-SymbolicName: org.argeo.slc.agent.ext.jdbc\r
+Bundle-Vendor: Argeo\r
+Bundle-Version: 0.13.1.SNAPSHOT-r120301_2142\r
+Created-By: Apache Maven Bundle Plugin\r
+Fragment-Host: org.springframework.jdbc\r
+Import-Package: com.mysql.jdbc;resolution:=optional,net.sourceforge.jtds\r
+ .jdbc;resolution:=optional,org.hsqldb;resolution:=optional\r
+Tool: Bnd-1.50.0\r

diff --git a/modules/agent/org.argeo.slc.agent.ext.jdbc/pom.xml b/modules/agent/org.argeo.slc.agent.ext.jdbc/pom.xml
new file mode 100644 (file)
index 0000000..db7098d
--- /dev/null
+++ b/modules/agent/org.argeo.slc.agent.ext.jdbc/pom.xml
@@ -0,0 +1,31 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.slc.modules</groupId>
+               <artifactId>agent</artifactId>
+               <version>0.13.1-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.slc.agent.ext.jdbc</artifactId>
+       <name>SLC Agent JDBC Extension</name>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <Fragment-Host>org.springframework.jdbc</Fragment-Host>
+                                               <Import-Package>
+                                                       *,
+                                                       com.mysql.jdbc;resolution:=optional,
+                                                       net.sourceforge.jtds.jdbc;resolution:=optional,
+                                                       org.hsqldb;resolution:=optional
+                                               </Import-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+</project>
\ No newline at end of file

diff --git a/modules/agent/org.argeo.slc.agent.ext.xalan/META-INF/MANIFEST.MF b/modules/agent/org.argeo.slc.agent.ext.xalan/META-INF/MANIFEST.MF
index 4e7a4933e633baa6ff737f4878831277d12501b9..4aab50e1530fb289961c303111303788b186f567 100644 (file)
--- a/modules/agent/org.argeo.slc.agent.ext.xalan/META-INF/MANIFEST.MF
+++ b/modules/agent/org.argeo.slc.agent.ext.xalan/META-INF/MANIFEST.MF
@@ -1,7 +1,17 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Fragment-Host: com.springsource.org.apache.xalan
-Bundle-Version: 0.13.1.SNAPSHOT
-Bundle-SymbolicName: org.argeo.slc.agent.ext.xalan
-Import-Package: com.sun.org.apache.xml.internal.dtm;resolution:=optional,
- org.w3c.dom.traversal;resolution:=optional
+Manifest-Version: 1.0\r
+Bnd-LastModified: 1330634570659\r
+Build-Jdk: 1.6.0_22\r
+Built-By: mbaudier\r
+Bundle-DocURL: http://www.argeo.org\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Bundle-ManifestVersion: 2\r
+Bundle-Name: SLC Agent Xalan Extension\r
+Bundle-RequiredExecutionEnvironment: J2SE-1.5\r
+Bundle-SymbolicName: org.argeo.slc.agent.ext.xalan\r
+Bundle-Vendor: Argeo\r
+Bundle-Version: 0.13.1.SNAPSHOT-r120301_2142\r
+Created-By: Apache Maven Bundle Plugin\r
+Fragment-Host: org.argeo.slc.agent.ext.xalan\r
+Import-Package: com.sun.org.apache.xml.internal.dtm;resolution:=optional\r
+ ,org.w3c.dom.traversal;resolution:=optional\r
+Tool: Bnd-1.50.0\r

diff --git a/modules/agent/org.argeo.slc.agent.ext.xalan/pom.xml b/modules/agent/org.argeo.slc.agent.ext.xalan/pom.xml
new file mode 100644 (file)
index 0000000..0cf316b
--- /dev/null
+++ b/modules/agent/org.argeo.slc.agent.ext.xalan/pom.xml
@@ -0,0 +1,30 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.slc.modules</groupId>
+               <artifactId>agent</artifactId>
+               <version>0.13.1-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.slc.agent.ext.xalan</artifactId>
+       <name>SLC Agent Xalan Extension</name>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <Fragment-Host>org.argeo.slc.agent.ext.xalan</Fragment-Host>
+                                               <Import-Package>
+                                                       *,
+                                                       com.sun.org.apache.xml.internal.dtm;resolution:=optional,
+                                                       org.w3c.dom.traversal;resolution:=optional
+                                               </Import-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+</project>
\ No newline at end of file

diff --git a/modules/agent/org.argeo.slc.agent.jcr/META-INF/MANIFEST.MF b/modules/agent/org.argeo.slc.agent.jcr/META-INF/MANIFEST.MF
index 74d3b33a7e2d5950123e3d0dec0d669e313e962a..c956f5ca5e15cb4320c27be756f136fdd1910a99 100644 (file)
--- a/modules/agent/org.argeo.slc.agent.jcr/META-INF/MANIFEST.MF
+++ b/modules/agent/org.argeo.slc.agent.jcr/META-INF/MANIFEST.MF
@@ -1,18 +1,18 @@
-Manifest-Version: 1.0
-Bundle-Version: 0.13.1.SNAPSHOT
-Bundle-SymbolicName: org.argeo.slc.agent.jcr
-Bundle-Name: Server JCR
-Import-Package: javax.jcr,
- org.argeo.jcr,
- org.argeo.security,
- org.argeo.security.core,
- org.argeo.security.jcr,
- org.argeo.slc.core.attachment,
- org.argeo.slc.core.test.tree,
- org.argeo.slc.execution,
- org.argeo.slc.jcr,
- org.argeo.slc.jcr.execution,
- org.argeo.slc.process,
- org.argeo.slc.runtime,
- org.argeo.slc.test,
- org.springframework.security
+Manifest-Version: 1.0\r
+Bnd-LastModified: 1330634569194\r
+Build-Jdk: 1.6.0_22\r
+Built-By: mbaudier\r
+Bundle-DocURL: http://www.argeo.org\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Bundle-ManifestVersion: 2\r
+Bundle-Name: SLC Agent JCR\r
+Bundle-RequiredExecutionEnvironment: J2SE-1.5\r
+Bundle-SymbolicName: org.argeo.slc.agent.jcr\r
+Bundle-Vendor: Argeo\r
+Bundle-Version: 0.13.1.SNAPSHOT-r120301_2142\r
+Created-By: Apache Maven Bundle Plugin\r
+Import-Package: javax.jcr,org.argeo.security.core,org.argeo.security.jcr\r
+ ,org.argeo.slc.core.attachment,org.argeo.slc.core.test.tree,org.argeo.s\r
+ lc.execution,org.argeo.slc.jcr,org.argeo.slc.jcr.execution,org.argeo.sl\r
+ c.runtime,org.argeo.slc.test,org.springframework.security\r
+Tool: Bnd-1.50.0\r

diff --git a/modules/agent/org.argeo.slc.agent.jcr/pom.xml b/modules/agent/org.argeo.slc.agent.jcr/pom.xml
new file mode 100644 (file)
index 0000000..d57e93f
--- /dev/null
+++ b/modules/agent/org.argeo.slc.agent.jcr/pom.xml
@@ -0,0 +1,28 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.slc.modules</groupId>
+               <artifactId>agent</artifactId>
+               <version>0.13.1-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.slc.agent.jcr</artifactId>
+       <name>SLC Agent JCR</name>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <Import-Package>
+                                                       *,
+                                                       org.argeo.slc.jcr
+                                               </Import-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+</project>
\ No newline at end of file

diff --git a/modules/agent/org.argeo.slc.agent.jms/META-INF/MANIFEST.MF b/modules/agent/org.argeo.slc.agent.jms/META-INF/MANIFEST.MF
index 6fa6ee60c91141bc8558ad4cd90fb212d6cc495d..38dca9988a304a99108b6e149bc4232d2b4154a3 100644 (file)
--- a/modules/agent/org.argeo.slc.agent.jms/META-INF/MANIFEST.MF
+++ b/modules/agent/org.argeo.slc.agent.jms/META-INF/MANIFEST.MF
@@ -1,20 +1,19 @@
-Manifest-Version: 1.0
-Require-Bundle: org.argeo.slc.specs,
- org.argeo.slc.core,
- org.argeo.slc.support.activemq,
- com.springsource.org.castor;resolution:=optional
-Bundle-Version: 0.13.1.SNAPSHOT
-Bundle-Name: SLC Agent JMS
-Bundle-SymbolicName: org.argeo.slc.agent.jms
-Import-Package: bsh.util;resolution:=optional,
- javax.jms,
- org.apache.activemq,
- org.apache.activemq.command,
- org.apache.activemq.pool,
- org.apache.commons.pool,
- org.springframework.beans.factory.config,
- org.springframework.jms.connection,
- org.springframework.jms.core,
- org.springframework.jms.listener,
- org.springframework.jms.listener.adapter,
- org.springframework.oxm.castor
+Manifest-Version: 1.0\r
+Bnd-LastModified: 1330634569577\r
+Build-Jdk: 1.6.0_22\r
+Built-By: mbaudier\r
+Bundle-DocURL: http://www.argeo.org\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Bundle-ManifestVersion: 2\r
+Bundle-Name: SLC Agent JMS\r
+Bundle-RequiredExecutionEnvironment: J2SE-1.5\r
+Bundle-SymbolicName: org.argeo.slc.agent.jms\r
+Bundle-Vendor: Argeo\r
+Bundle-Version: 0.13.1.SNAPSHOT-r120301_2142\r
+Created-By: Apache Maven Bundle Plugin\r
+Import-Package: org.apache.activemq,org.argeo.slc.core.attachment,org.ar\r
+ geo.slc.core.test.tree,org.argeo.slc.execution,org.argeo.slc.jms,org.ar\r
+ geo.slc.process,org.argeo.slc.test,org.springframework.beans.factory.co\r
+ nfig,org.springframework.jms.connection,org.springframework.jms.core,or\r
+ g.springframework.jms.listener\r
+Tool: Bnd-1.50.0\r

diff --git a/modules/agent/org.argeo.slc.agent.jms/pom.xml b/modules/agent/org.argeo.slc.agent.jms/pom.xml
new file mode 100644 (file)
index 0000000..0c2bea5
--- /dev/null
+++ b/modules/agent/org.argeo.slc.agent.jms/pom.xml
@@ -0,0 +1,27 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.slc.modules</groupId>
+               <artifactId>agent</artifactId>
+               <version>0.13.1-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.slc.agent.jms</artifactId>
+       <name>SLC Agent JMS</name>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <Import-Package>
+                                                       *,
+                                               </Import-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+</project>
\ No newline at end of file

diff --git a/modules/agent/org.argeo.slc.agent/META-INF/MANIFEST.MF b/modules/agent/org.argeo.slc.agent/META-INF/MANIFEST.MF
index 0cdc2e5d0d48e5b0e064c16ee2650c04ca5f3a4d..bb3aa6cf33c781c3376b660e3030f512238dbdc5 100644 (file)
--- a/modules/agent/org.argeo.slc.agent/META-INF/MANIFEST.MF
+++ b/modules/agent/org.argeo.slc.agent/META-INF/MANIFEST.MF
@@ -1,11 +1,16 @@
-Manifest-Version: 1.0
-Require-Bundle: org.argeo.slc.specs,
- org.argeo.slc.core,
- org.argeo.slc.support.osgi
-Bundle-Version: 0.13.1.SNAPSHOT
-Bundle-Name: Argeo SLC Agent
-Bundle-SymbolicName: org.argeo.slc.agent
-Import-Package: org.apache.xalan.processor,
- org.apache.xerces.jaxp,
- org.argeo.slc.log4j,
- org.springframework.beans.factory.config;specification-version="2.5.6.SEC01"
+Manifest-Version: 1.0\r
+Bnd-LastModified: 1330634568374\r
+Build-Jdk: 1.6.0_22\r
+Built-By: mbaudier\r
+Bundle-DocURL: http://www.argeo.org\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Bundle-ManifestVersion: 2\r
+Bundle-Name: SLC Agent\r
+Bundle-RequiredExecutionEnvironment: J2SE-1.5\r
+Bundle-SymbolicName: org.argeo.slc.agent\r
+Bundle-Vendor: Argeo\r
+Bundle-Version: 0.13.1.SNAPSHOT-r120301_2142\r
+Created-By: Apache Maven Bundle Plugin\r
+Import-Package: org.argeo.slc.execution,org.argeo.slc.log4j,org.argeo.sl\r
+ c.osgi,org.argeo.slc.process,org.springframework.beans.factory.config\r
+Tool: Bnd-1.50.0\r

diff --git a/modules/agent/org.argeo.slc.agent/pom.xml b/modules/agent/org.argeo.slc.agent/pom.xml
new file mode 100644 (file)
index 0000000..ccd133c
--- /dev/null
+++ b/modules/agent/org.argeo.slc.agent/pom.xml
@@ -0,0 +1,12 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.slc.modules</groupId>
+               <artifactId>agent</artifactId>
+               <version>0.13.1-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.slc.agent</artifactId>
+       <name>SLC Agent</name>
+</project>
\ No newline at end of file

diff --git a/modules/agent/org.argeo.slc.ext.activemq/META-INF/MANIFEST.MF b/modules/agent/org.argeo.slc.ext.activemq/META-INF/MANIFEST.MF
index 1df9886abeabd10a8d69b481ebbc93a5341b5cd4..b48a21c4e01fa3b693f54f59297ce812031ca25b 100644 (file)
--- a/modules/agent/org.argeo.slc.ext.activemq/META-INF/MANIFEST.MF
+++ b/modules/agent/org.argeo.slc.ext.activemq/META-INF/MANIFEST.MF
@@ -1,31 +1,26 @@
-Manifest-Version: 1.0
-Bundle-Name: ActiveMQ Ext
-Bundle-SymbolicName: org.argeo.slc.ext.activemq
-Bundle-Version: 0.13.1.SNAPSHOT
-Fragment-Host: org.argeo.dep.osgi.activemq
-Import-Package: org.argeo.slc.runtime,
- org.argeo.slc.execution,
- org.argeo.slc.msg,
- org.argeo.slc.build,
- org.argeo.slc.core.execution,
- org.argeo.slc.core.attachment,
- org.argeo.slc.core.execution,
- org.argeo.slc.core.structure,
- org.argeo.slc.core.structure.tree,
- org.argeo.slc.core.test,
- org.argeo.slc.core.test.tree,
- org.argeo.slc.deploy,
- org.argeo.slc.detached;resolution:=optional,
- org.argeo.slc.execution,
- org.argeo.slc.msg,
- org.argeo.slc.msg.build,
- org.argeo.slc.msg.event,
- org.argeo.slc.msg.process,
- org.argeo.slc.msg.test.tree,
- org.argeo.slc.process,
- org.argeo.slc.runtime,
- org.argeo.slc.test,
- org.argeo.slc.xml.process;resolution:=optional,
- org.argeo.slc.xml.test.tree;resolution:=optional,
- org.hibernate.collection;resolution:=optional
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0\r
+Bnd-LastModified: 1330634570999\r
+Build-Jdk: 1.6.0_22\r
+Built-By: mbaudier\r
+Bundle-DocURL: http://www.argeo.org\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Bundle-ManifestVersion: 2\r
+Bundle-Name: SLC ActiveMQ Extension\r
+Bundle-RequiredExecutionEnvironment: J2SE-1.5\r
+Bundle-SymbolicName: org.argeo.slc.ext.activemq\r
+Bundle-Vendor: Argeo\r
+Bundle-Version: 0.13.1.SNAPSHOT-r120301_2142\r
+Created-By: Apache Maven Bundle Plugin\r
+Fragment-Host: org.argeo.dep.osgi.activemq\r
+Import-Package: org.argeo.slc.build,org.argeo.slc.core.attachment,org.ar\r
+ geo.slc.core.execution,org.argeo.slc.core.execution,org.argeo.slc.core.\r
+ structure,org.argeo.slc.core.structure.tree,org.argeo.slc.core.test,org\r
+ .argeo.slc.core.test.tree,org.argeo.slc.deploy,org.argeo.slc.detached;r\r
+ esolution:=optional,org.argeo.slc.execution,org.argeo.slc.execution,org\r
+ .argeo.slc.msg,org.argeo.slc.msg.build,org.argeo.slc.msg.event,org.arge\r
+ o.slc.msg.process,org.argeo.slc.msg.test.tree,org.argeo.slc.msg,org.arg\r
+ eo.slc.process,org.argeo.slc.runtime,org.argeo.slc.runtime,org.argeo.sl\r
+ c.test,org.argeo.slc.xml.process;resolution:=optional,org.argeo.slc.xml\r
+ .test.tree;resolution:=optional,org.hibernate.collection;resolution:=op\r
+ tional\r
+Tool: Bnd-1.50.0\r

diff --git a/modules/agent/org.argeo.slc.ext.activemq/pom.xml b/modules/agent/org.argeo.slc.ext.activemq/pom.xml
new file mode 100644 (file)
index 0000000..eaa33bc
--- /dev/null
+++ b/modules/agent/org.argeo.slc.ext.activemq/pom.xml
@@ -0,0 +1,53 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.slc.modules</groupId>
+               <artifactId>agent</artifactId>
+               <version>0.13.1-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.slc.ext.activemq</artifactId>
+       <name>SLC ActiveMQ Extension</name>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <Fragment-Host>org.argeo.dep.osgi.activemq</Fragment-Host>
+                                               <Import-Package>
+                                                       *,
+                                                       org.argeo.slc.runtime,
+                                                       org.argeo.slc.execution,
+                                                       org.argeo.slc.msg,
+                                                       org.argeo.slc.build,
+                                                       org.argeo.slc.core.execution,
+                                                       org.argeo.slc.core.attachment,
+                                                       org.argeo.slc.core.execution,
+                                                       org.argeo.slc.core.structure,
+                                                       org.argeo.slc.core.structure.tree,
+                                                       org.argeo.slc.core.test,
+                                                       org.argeo.slc.core.test.tree,
+                                                       org.argeo.slc.deploy,
+                                                       org.argeo.slc.detached;resolution:=optional,
+                                                       org.argeo.slc.execution,
+                                                       org.argeo.slc.msg,
+                                                       org.argeo.slc.msg.build,
+                                                       org.argeo.slc.msg.event,
+                                                       org.argeo.slc.msg.process,
+                                                       org.argeo.slc.msg.test.tree,
+                                                       org.argeo.slc.process,
+                                                       org.argeo.slc.runtime,
+                                                       org.argeo.slc.test,
+                                                       org.argeo.slc.xml.process;resolution:=optional,
+                                                       org.argeo.slc.xml.test.tree;resolution:=optional,
+                                                       org.hibernate.collection;resolution:=optional
+                                               </Import-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+</project>
\ No newline at end of file

diff --git a/modules/agent/pom.xml b/modules/agent/pom.xml
index db0c323a890d96430023f729f992dcb3588a4379..e56cdac8ef4ffe42914048aa9568be1091af374e 100644 (file)
--- a/modules/agent/pom.xml
+++ b/modules/agent/pom.xml
@@ -8,19 +8,53 @@
        </parent>
        <groupId>org.argeo.slc.modules</groupId>
        <artifactId>agent</artifactId>
-       <packaging>bundles</packaging>
+       <packaging>pom</packaging>
        <name>SLC Modules Agent</name>
+       <modules>
+               <module>org.argeo.slc.agent</module>
+               <module>org.argeo.slc.agent.jcr</module>
+               <module>org.argeo.slc.agent.jms</module>
+               <module>org.argeo.slc.agent.ext.bsf</module>
+               <module>org.argeo.slc.agent.ext.jdbc</module>
+               <module>org.argeo.slc.agent.ext.xalan</module>
+               <module>org.argeo.slc.ext.activemq</module>
+       </modules>
        <build>
+               <resources>
+                       <resource>
+                               <directory>.</directory>
+                               <includes>
+                                       <include>**</include>
+                               </includes>
+                               <excludes>
+                                       <exclude>.*</exclude>
+                                       <exclude>pom.xml</exclude>
+                                       <exclude>build.properties</exclude>
+                               </excludes>
+                       </resource>
+               </resources>
                <plugins>
                        <plugin>
-                               <groupId>org.argeo.maven.plugins</groupId>
-                               <artifactId>maven-argeo-osgi-plugin</artifactId>
-                               <extensions>true</extensions>
+                               <artifactId>maven-clean-plugin</artifactId>
                                <configuration>
-                                       <bundlesPomArtifactId>org.argeo.slc.modules.agent.bundles</bundlesPomArtifactId>
-                                       <buildNumber>${timestamp}</buildNumber>
+                                       <filesets>
+                                               <fileset>
+                                                       <directory>META-INF</directory>
+                                                       <includes>
+                                                               <include>MANIFEST.MF</include>
+                                                       </includes>
+                                               </fileset>
+                                       </filesets>
                                </configuration>
                        </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-jar-plugin</artifactId>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                       </plugin>
                </plugins>
        </build>
 </project>
\ No newline at end of file

diff --git a/modules/server/org.argeo.slc.node.jackrabbit/META-INF/MANIFEST.MF b/modules/server/org.argeo.slc.node.jackrabbit/META-INF/MANIFEST.MF
index e2da416a009936875ab4159bda5bf6711a546e69..79b70b4cc1da7052149d4dda6f5f3333989d9be1 100644 (file)
--- a/modules/server/org.argeo.slc.node.jackrabbit/META-INF/MANIFEST.MF
+++ b/modules/server/org.argeo.slc.node.jackrabbit/META-INF/MANIFEST.MF
@@ -1,15 +1,17 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Node Wrapper
-Bundle-SymbolicName: org.argeo.slc.node.jackrabbit
-Bundle-Version: 0.13.1.SNAPSHOT
-Bundle-Vendor: Argeo
-Import-Package: javax.jcr;version="[2.0.0,3.0.0)",
- org.argeo.jackrabbit,
- org.argeo.security.core,
- org.argeo.security.jackrabbit,
- org.argeo.slc.jcr,
- org.argeo.slc.repo,
- org.postgresql;version="[8.3.0,9.0.0)",
- org.springframework.beans.factory.config;version="2.5.6.SEC01",
- org.springframework.security;version="2.0.6.RELEASE"
+Manifest-Version: 1.0\r
+Bnd-LastModified: 1330634818721\r
+Build-Jdk: 1.6.0_22\r
+Built-By: mbaudier\r
+Bundle-DocURL: http://www.argeo.org\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Bundle-ManifestVersion: 2\r
+Bundle-Name: SLC Node Jackrabbit\r
+Bundle-RequiredExecutionEnvironment: J2SE-1.5\r
+Bundle-SymbolicName: org.argeo.slc.node.jackrabbit\r
+Bundle-Vendor: Argeo\r
+Bundle-Version: 0.13.1.SNAPSHOT-r120301_2146\r
+Created-By: Apache Maven Bundle Plugin\r
+Import-Package: javax.jcr,org.argeo.jackrabbit,org.argeo.security.core,o\r
+ rg.argeo.slc.jcr,org.springframework.beans.factory.config,org.springfra\r
+ mework.security\r
+Tool: Bnd-1.50.0\r

diff --git a/modules/server/org.argeo.slc.node.jackrabbit/pom.xml b/modules/server/org.argeo.slc.node.jackrabbit/pom.xml
new file mode 100644 (file)
index 0000000..6750976
--- /dev/null
+++ b/modules/server/org.argeo.slc.node.jackrabbit/pom.xml
@@ -0,0 +1,28 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.slc.modules</groupId>
+               <artifactId>server</artifactId>
+               <version>0.13.1-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.slc.node.jackrabbit</artifactId>
+       <name>SLC Node Jackrabbit</name>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <Import-Package>
+                                                       *,
+                                                       org.argeo.slc.jcr
+                                               </Import-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+</project>
\ No newline at end of file

diff --git a/modules/server/org.argeo.slc.server.repo.webapp/META-INF/MANIFEST.MF b/modules/server/org.argeo.slc.server.repo.webapp/META-INF/MANIFEST.MF
index 9a8c42a027d188927d726f0c4e65f30ac1cf0b65..dbe9db04d5c6b7dc221166ca4c35e4ce6c60d575 100644 (file)
--- a/modules/server/org.argeo.slc.server.repo.webapp/META-INF/MANIFEST.MF
+++ b/modules/server/org.argeo.slc.server.repo.webapp/META-INF/MANIFEST.MF
@@ -1,31 +1,25 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: SLC Repo Webapp
-Bundle-SymbolicName: org.argeo.slc.server.repo.webapp
-Bundle-Version: 0.13.1.SNAPSHOT
-Web-ContextPath: org.argeo.slc.repo.webapp
-Bundle-Vendor: Argeo
-Import-Package: javax.jcr;version="2.0.0",
- javax.servlet,
- javax.servlet.http,
- javax.servlet.resources,
- org.argeo.jcr.mvc,
- org.argeo.security.core,
- org.argeo.security.jcr,
- org.argeo.slc.aether.spring,
- org.argeo.slc.repo.maven.proxy,
- org.springframework.osgi.web.context.support;version="1.2.1",
- org.springframework.security;version="2.0.6.RELEASE",
- org.springframework.security.context;version="2.0.6.RELEASE",
- org.springframework.security.intercept.web;version="2.0.6.RELEASE",
- org.springframework.security.providers.anonymous;version="2.0.6.RELEASE",
- org.springframework.security.ui;version="2.0.6.RELEASE",
- org.springframework.security.ui.basicauth;version="2.0.6.RELEASE",
- org.springframework.security.ui.logout;version="2.0.6.RELEASE",
- org.springframework.security.util;version="2.0.6.RELEASE",
- org.springframework.security.vote;version="2.0.6.RELEASE",
- org.springframework.security.wrapper;version="2.0.6.RELEASE",
- org.springframework.web.context;version="2.5.6.SEC01",
- org.springframework.web.filter;version="2.5.6.SEC01",
- org.springframework.web.servlet;version="2.5.6.SEC01",
- org.springframework.web.servlet.handler;version="2.5.6.SEC01"
+Manifest-Version: 1.0\r
+Bnd-LastModified: 1330634820158\r
+Build-Jdk: 1.6.0_22\r
+Built-By: mbaudier\r
+Bundle-DocURL: http://www.argeo.org\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Bundle-ManifestVersion: 2\r
+Bundle-Name: SLC Repo Web App\r
+Bundle-RequiredExecutionEnvironment: J2SE-1.5\r
+Bundle-SymbolicName: org.argeo.slc.server.repo.webapp\r
+Bundle-Vendor: Argeo\r
+Bundle-Version: 0.13.1.SNAPSHOT-r120301_2146\r
+Created-By: Apache Maven Bundle Plugin\r
+Import-Package: javax.jcr,javax.servlet,javax.servlet.http,javax.servlet\r
+ .resources,org.argeo.jcr.mvc,org.argeo.security.core,org.argeo.security\r
+ .jcr,org.argeo.slc.aether.spring,org.argeo.slc.repo.maven.proxy,org.spr\r
+ ingframework.osgi.web.context.support,org.springframework.security,org.\r
+ springframework.security.context,org.springframework.security.intercept\r
+ .web,org.springframework.security.providers.anonymous,org.springframewo\r
+ rk.security.ui,org.springframework.security.ui.basicauth,org.springfram\r
+ ework.security.ui.logout,org.springframework.security.util,org.springfr\r
+ amework.security.vote,org.springframework.security.wrapper,org.springfr\r
+ amework.web.context,org.springframework.web.filter,org.springframework.\r
+ web.servlet,org.springframework.web.servlet.handler\r
+Tool: Bnd-1.50.0\r

diff --git a/modules/server/org.argeo.slc.server.repo.webapp/pom.xml b/modules/server/org.argeo.slc.server.repo.webapp/pom.xml
new file mode 100644 (file)
index 0000000..4da962b
--- /dev/null
+++ b/modules/server/org.argeo.slc.server.repo.webapp/pom.xml
@@ -0,0 +1,52 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.slc.modules</groupId>
+               <artifactId>server</artifactId>
+               <version>0.13.1-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.slc.server.repo.webapp</artifactId>
+       <name>SLC Repo Web App</name>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <!-- TODO optimize -->
+                                               <Import-Package>
+                                                       *,
+                                                       javax.jcr,
+                                                       javax.servlet,
+                                                       javax.servlet.http,
+                                                       javax.servlet.resources,
+                                                       org.argeo.jcr.mvc,
+                                                       org.argeo.security.core,
+                                                       org.argeo.security.jcr,
+                                                       org.argeo.slc.aether.spring,
+                                                       org.argeo.slc.repo.maven.proxy,
+                                                       org.springframework.osgi.web.context.support,
+                                                       org.springframework.security,
+                                                       org.springframework.security.context,
+                                                       org.springframework.security.intercept.web,
+                                                       org.springframework.security.providers.anonymous,
+                                                       org.springframework.security.ui,
+                                                       org.springframework.security.ui.basicauth,
+                                                       org.springframework.security.ui.logout,
+                                                       org.springframework.security.util,
+                                                       org.springframework.security.vote,
+                                                       org.springframework.security.wrapper,
+                                                       org.springframework.web.context,
+                                                       org.springframework.web.filter,
+                                                       org.springframework.web.servlet,
+                                                       org.springframework.web.servlet.handler
+                                               </Import-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+</project>
\ No newline at end of file

diff --git a/modules/server/org.argeo.slc.server.repo/META-INF/MANIFEST.MF b/modules/server/org.argeo.slc.server.repo/META-INF/MANIFEST.MF
index bbcba69bb501de671a415d8661211e5a8b1cbf9f..b4d528c24fcab5a3838fe6f5d64f25854af64630 100644 (file)
--- a/modules/server/org.argeo.slc.server.repo/META-INF/MANIFEST.MF
+++ b/modules/server/org.argeo.slc.server.repo/META-INF/MANIFEST.MF
@@ -1,20 +1,19 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Repo
-Bundle-SymbolicName: org.argeo.slc.server.repo
-Bundle-Version: 0.13.1.SNAPSHOT
-Import-Package: javax.jcr;version="2.0.0",
- org.argeo.jackrabbit,
- org.argeo.jcr,
- org.argeo.security.core,
- org.argeo.security.jcr,
- org.argeo.slc.aether,
- org.argeo.slc.aether.spring,
- org.argeo.slc.jcr,
- org.argeo.slc.repo,
- org.argeo.slc.repo.maven,
- org.argeo.slc.repo.maven.proxy,
- org.h2;resolution:=optional,
- org.sonatype.aether;version="1.9.0",
- org.springframework.beans.factory.config;version="2.5.6.SEC01",
- org.springframework.security;version="2.0.6.RELEASE"
+Manifest-Version: 1.0\r
+Bnd-LastModified: 1330634819681\r
+Build-Jdk: 1.6.0_22\r
+Built-By: mbaudier\r
+Bundle-DocURL: http://www.argeo.org\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Bundle-ManifestVersion: 2\r
+Bundle-Name: SLC Repo Services\r
+Bundle-RequiredExecutionEnvironment: J2SE-1.5\r
+Bundle-SymbolicName: org.argeo.slc.server.repo\r
+Bundle-Vendor: Argeo\r
+Bundle-Version: 0.13.1.SNAPSHOT-r120301_2146\r
+Created-By: Apache Maven Bundle Plugin\r
+Import-Package: javax.jcr,org.argeo.jackrabbit,org.argeo.jcr,org.argeo.s\r
+ ecurity.core,org.argeo.security.jcr,org.argeo.slc.aether.spring,org.arg\r
+ eo.slc.jcr,org.argeo.slc.repo,org.argeo.slc.repo.maven.proxy,org.h2;res\r
+ olution:=optional,org.springframework.beans.factory.config,org.springfr\r
+ amework.security\r
+Tool: Bnd-1.50.0\r

diff --git a/modules/server/org.argeo.slc.server.repo/pom.xml b/modules/server/org.argeo.slc.server.repo/pom.xml
new file mode 100644 (file)
index 0000000..a6f0fec
--- /dev/null
+++ b/modules/server/org.argeo.slc.server.repo/pom.xml
@@ -0,0 +1,31 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.slc.modules</groupId>
+               <artifactId>server</artifactId>
+               <version>0.13.1-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.slc.server.repo</artifactId>
+       <name>SLC Repo Services</name>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <Import-Package>
+                                                       *,
+                                                       org.argeo.jcr,
+                                                       org.argeo.slc.jcr,
+                                                       org.argeo.slc.repo,
+                                                       org.h2;resolution:=optional,
+                                               </Import-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+</project>
\ No newline at end of file

diff --git a/modules/server/pom.xml b/modules/server/pom.xml
index a8e28085f04ecc494129731498d6a6423e8054f8..3ee6e81def7bcd7136baee16286aed6b0c19b084 100644 (file)
--- a/modules/server/pom.xml
+++ b/modules/server/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.slc</groupId>
@@ -8,19 +9,49 @@
        </parent>
        <groupId>org.argeo.slc.modules</groupId>
        <artifactId>server</artifactId>
-       <packaging>bundles</packaging>
+       <packaging>pom</packaging>
        <name>SLC Modules Server</name>
+       <modules>
+               <module>org.argeo.slc.node.jackrabbit</module>
+               <module>org.argeo.slc.server.repo</module>
+               <module>org.argeo.slc.server.repo.webapp</module>
+       </modules>
        <build>
+               <resources>
+                       <resource>
+                               <directory>.</directory>
+                               <includes>
+                                       <include>**</include>
+                               </includes>
+                               <excludes>
+                                       <exclude>.*</exclude>
+                                       <exclude>pom.xml</exclude>
+                                       <exclude>build.properties</exclude>
+                               </excludes>
+                       </resource>
+               </resources>
                <plugins>
                        <plugin>
-                               <groupId>org.argeo.maven.plugins</groupId>
-                               <artifactId>maven-argeo-osgi-plugin</artifactId>
-                               <extensions>true</extensions>
+                               <artifactId>maven-clean-plugin</artifactId>
                                <configuration>
-                                       <bundlesPomArtifactId>org.argeo.slc.modules.server.bundles</bundlesPomArtifactId>
-                                       <buildNumber>${timestamp}</buildNumber>
+                                       <filesets>
+                                               <fileset>
+                                                       <directory>META-INF</directory>
+                                                       <includes>
+                                                               <include>MANIFEST.MF</include>
+                                                       </includes>
+                                               </fileset>
+                                       </filesets>
                                </configuration>
                        </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-jar-plugin</artifactId>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                       </plugin>
                </plugins>
        </build>
 </project>
\ No newline at end of file

diff --git a/pom.xml b/pom.xml
index 78511d1510330c635809da4262f8652e01fae718..53432c442277663084260d8d18400397f99d3c24 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
                <developmentCycle.slc>0.13</developmentCycle.slc>
                <site.repoBase>file:///srv/projects/www/slc/site</site.repoBase>
                <site.urlBase>http://projects.argeo.org/slc/site</site.urlBase>
-               <version.slc>${developmentCycle.slc}.1-SNAPSHOT</version.slc>
+<!--           <version.slc>${developmentCycle.slc}.1-SNAPSHOT</version.slc> -->
        </properties>
        <modules>
                <module>runtime</module>
@@ -108,16 +108,16 @@ limitations under the License.
        <dependencyManagement>
                <dependencies>
                        <!-- FIXME : use distribution > v1.1.5 and remove this -->
-                       <dependency>
-                               <groupId>org.eclipse.core</groupId>
-                               <artifactId>org.eclipse.core.databinding.observable</artifactId>
-                               <version>1.3.0</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.eclipse.core</groupId>
-                               <artifactId>org.eclipse.core.databinding.property</artifactId>
-                               <version>1.3.0</version>
-                       </dependency>
+<!--                   <dependency> -->
+<!--                           <groupId>org.eclipse.core</groupId> -->
+<!--                           <artifactId>org.eclipse.core.databinding.observable</artifactId> -->
+<!--                           <version>1.3.0</version> -->
+<!--                   </dependency> -->
+<!--                   <dependency> -->
+<!--                           <groupId>org.eclipse.core</groupId> -->
+<!--                           <artifactId>org.eclipse.core.databinding.property</artifactId> -->
+<!--                           <version>1.3.0</version> -->
+<!--                   </dependency> -->
 
 
                        <dependency>
@@ -129,143 +129,143 @@ limitations under the License.
                        </dependency>
 
                        <!-- SLC (itself) -->
-                       <dependency>
-                               <groupId>org.argeo.slc.runtime</groupId>
-                               <artifactId>org.argeo.slc.specs</artifactId>
-                               <version>${version.slc}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.argeo.slc.runtime</groupId>
-                               <artifactId>org.argeo.slc.core</artifactId>
-                               <version>${version.slc}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.argeo.slc.runtime</groupId>
-                               <artifactId>org.argeo.slc.unit</artifactId>
-                               <version>${version.slc}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.argeo.slc.runtime</groupId>
-                               <artifactId>org.argeo.slc.launcher</artifactId>
-                               <version>${version.slc}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.argeo.slc.runtime</groupId>
-                               <artifactId>org.argeo.slc.detached</artifactId>
-                               <version>${version.slc}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.argeo.slc.runtime</groupId>
-                               <artifactId>org.argeo.slc.lib.detached</artifactId>
-                               <version>${version.slc}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.argeo.slc.runtime</groupId>
-                               <artifactId>org.argeo.slc.support.simple</artifactId>
-                               <version>${version.slc}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.argeo.slc.runtime</groupId>
-                               <artifactId>org.argeo.slc.support.ant</artifactId>
-                               <version>${version.slc}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.argeo.slc.runtime</groupId>
-                               <artifactId>org.argeo.slc.support.maven</artifactId>
-                               <version>${version.slc}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.argeo.slc.runtime</groupId>
-                               <artifactId>org.argeo.slc.support.hibernate</artifactId>
-                               <version>${version.slc}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.argeo.slc.runtime</groupId>
-                               <artifactId>org.argeo.slc.support.castor</artifactId>
-                               <version>${version.slc}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.argeo.slc.runtime</groupId>
-                               <artifactId>org.argeo.slc.support.activemq</artifactId>
-                               <version>${version.slc}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.argeo.slc.runtime</groupId>
-                               <artifactId>org.argeo.slc.support.jcr</artifactId>
-                               <version>${version.slc}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.argeo.slc.runtime</groupId>
-                               <artifactId>org.argeo.slc.server</artifactId>
-                               <version>${version.slc}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.argeo.slc.runtime</groupId>
-                               <artifactId>org.argeo.slc.support.osgi</artifactId>
-                               <version>${version.slc}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.argeo.slc.runtime</groupId>
-                               <artifactId>org.argeo.slc.support.equinox</artifactId>
-                               <version>${version.slc}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.argeo.slc.runtime</groupId>
-                               <artifactId>org.argeo.slc.support.jemmy</artifactId>
-                               <version>${version.slc}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.argeo.slc.server</groupId>
-                               <artifactId>org.argeo.slc.ria</artifactId>
-                               <version>${version.slc}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.argeo.ria</groupId>
-                               <artifactId>org.argeo.ria.core</artifactId>
-                               <version>${version.argeo-ria}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.argeo.slc.server</groupId>
-                               <artifactId>deploy</artifactId>
-                               <version>${version.slc}</version>
-                               <type>pom</type>
-                       </dependency>
-                       <!-- SLC dubious -->
-                       <dependency>
-                               <groupId>org.argeo.slc.runtime</groupId>
-                               <artifactId>org.argeo.slc.detached.launcher</artifactId>
-                               <version>${version.slc}</version>
-                               <type>tar.gz</type>
-                               <classifier>dist</classifier>
-                       </dependency>
+<!--                   <dependency> -->
+<!--                           <groupId>org.argeo.slc.runtime</groupId> -->
+<!--                           <artifactId>org.argeo.slc.specs</artifactId> -->
+<!--                           <version>${version.slc}</version> -->
+<!--                   </dependency> -->
+<!--                   <dependency> -->
+<!--                           <groupId>org.argeo.slc.runtime</groupId> -->
+<!--                           <artifactId>org.argeo.slc.core</artifactId> -->
+<!--                           <version>${version.slc}</version> -->
+<!--                   </dependency> -->
+<!--                   <dependency> -->
+<!--                           <groupId>org.argeo.slc.runtime</groupId> -->
+<!--                           <artifactId>org.argeo.slc.unit</artifactId> -->
+<!--                           <version>${version.slc}</version> -->
+<!--                   </dependency> -->
+<!--                   <dependency> -->
+<!--                           <groupId>org.argeo.slc.runtime</groupId> -->
+<!--                           <artifactId>org.argeo.slc.launcher</artifactId> -->
+<!--                           <version>${version.slc}</version> -->
+<!--                   </dependency> -->
+<!--                   <dependency> -->
+<!--                           <groupId>org.argeo.slc.runtime</groupId> -->
+<!--                           <artifactId>org.argeo.slc.detached</artifactId> -->
+<!--                           <version>${version.slc}</version> -->
+<!--                   </dependency> -->
+<!--                   <dependency> -->
+<!--                           <groupId>org.argeo.slc.runtime</groupId> -->
+<!--                           <artifactId>org.argeo.slc.lib.detached</artifactId> -->
+<!--                           <version>${version.slc}</version> -->
+<!--                   </dependency> -->
+<!--                   <dependency> -->
+<!--                           <groupId>org.argeo.slc.runtime</groupId> -->
+<!--                           <artifactId>org.argeo.slc.support.simple</artifactId> -->
+<!--                           <version>${version.slc}</version> -->
+<!--                   </dependency> -->
+<!--                   <dependency> -->
+<!--                           <groupId>org.argeo.slc.runtime</groupId> -->
+<!--                           <artifactId>org.argeo.slc.support.ant</artifactId> -->
+<!--                           <version>${version.slc}</version> -->
+<!--                   </dependency> -->
+<!--                   <dependency> -->
+<!--                           <groupId>org.argeo.slc.runtime</groupId> -->
+<!--                           <artifactId>org.argeo.slc.support.maven</artifactId> -->
+<!--                           <version>${version.slc}</version> -->
+<!--                   </dependency> -->
+<!--                   <dependency> -->
+<!--                           <groupId>org.argeo.slc.runtime</groupId> -->
+<!--                           <artifactId>org.argeo.slc.support.hibernate</artifactId> -->
+<!--                           <version>${version.slc}</version> -->
+<!--                   </dependency> -->
+<!--                   <dependency> -->
+<!--                           <groupId>org.argeo.slc.runtime</groupId> -->
+<!--                           <artifactId>org.argeo.slc.support.castor</artifactId> -->
+<!--                           <version>${version.slc}</version> -->
+<!--                   </dependency> -->
+<!--                   <dependency> -->
+<!--                           <groupId>org.argeo.slc.runtime</groupId> -->
+<!--                           <artifactId>org.argeo.slc.support.activemq</artifactId> -->
+<!--                           <version>${version.slc}</version> -->
+<!--                   </dependency> -->
+<!--                   <dependency> -->
+<!--                           <groupId>org.argeo.slc.runtime</groupId> -->
+<!--                           <artifactId>org.argeo.slc.support.jcr</artifactId> -->
+<!--                           <version>${version.slc}</version> -->
+<!--                   </dependency> -->
+<!--                   <dependency> -->
+<!--                           <groupId>org.argeo.slc.runtime</groupId> -->
+<!--                           <artifactId>org.argeo.slc.server</artifactId> -->
+<!--                           <version>${version.slc}</version> -->
+<!--                   </dependency> -->
+<!--                   <dependency> -->
+<!--                           <groupId>org.argeo.slc.runtime</groupId> -->
+<!--                           <artifactId>org.argeo.slc.support.osgi</artifactId> -->
+<!--                           <version>${version.slc}</version> -->
+<!--                   </dependency> -->
+<!--                   <dependency> -->
+<!--                           <groupId>org.argeo.slc.runtime</groupId> -->
+<!--                           <artifactId>org.argeo.slc.support.equinox</artifactId> -->
+<!--                           <version>${version.slc}</version> -->
+<!--                   </dependency> -->
+<!--                   <dependency> -->
+<!--                           <groupId>org.argeo.slc.runtime</groupId> -->
+<!--                           <artifactId>org.argeo.slc.support.jemmy</artifactId> -->
+<!--                           <version>${version.slc}</version> -->
+<!--                   </dependency> -->
+<!--                   <dependency> -->
+<!--                           <groupId>org.argeo.slc.server</groupId> -->
+<!--                           <artifactId>org.argeo.slc.ria</artifactId> -->
+<!--                           <version>${version.slc}</version> -->
+<!--                   </dependency> -->
+<!--                   <dependency> -->
+<!--                           <groupId>org.argeo.ria</groupId> -->
+<!--                           <artifactId>org.argeo.ria.core</artifactId> -->
+<!--                           <version>${version.argeo-ria}</version> -->
+<!--                   </dependency> -->
+<!--                   <dependency> -->
+<!--                           <groupId>org.argeo.slc.server</groupId> -->
+<!--                           <artifactId>deploy</artifactId> -->
+<!--                           <version>${version.slc}</version> -->
+<!--                           <type>pom</type> -->
+<!--                   </dependency> -->
+<!--                   SLC dubious -->
+<!--                   <dependency> -->
+<!--                           <groupId>org.argeo.slc.runtime</groupId> -->
+<!--                           <artifactId>org.argeo.slc.detached.launcher</artifactId> -->
+<!--                           <version>${version.slc}</version> -->
+<!--                           <type>tar.gz</type> -->
+<!--                           <classifier>dist</classifier> -->
+<!--                   </dependency> -->
                        <!-- Argeo Commons -->
-                       <dependency>
-                               <groupId>org.argeo.commons.security</groupId>
-                               <artifactId>org.argeo.security.dep.ads</artifactId>
-                               <version>${version.argeo-commons}</version>
-                               <type>pom</type>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.argeo.commons.osgi</groupId>
-                               <artifactId>org.argeo.osgi.boot</artifactId>
-                               <version>${version.argeo-commons}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.argeo.commons.server</groupId>
-                               <artifactId>org.argeo.server.ads</artifactId>
-                               <version>${version.argeo-commons}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.argeo.commons.server</groupId>
-                               <artifactId>org.argeo.server.dep.jackrabbit.server</artifactId>
-                               <version>${version.argeo-commons}</version>
-                               <type>pom</type>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.argeo.commons.server</groupId>
-                               <artifactId>org.argeo.server.jackrabbit</artifactId>
-                               <version>${version.argeo-commons}</version>
-                       </dependency>
+<!--                   <dependency> -->
+<!--                           <groupId>org.argeo.commons.security</groupId> -->
+<!--                           <artifactId>org.argeo.security.dep.ads</artifactId> -->
+<!--                           <version>${version.argeo-commons}</version> -->
+<!--                           <type>pom</type> -->
+<!--                   </dependency> -->
+<!--                   <dependency> -->
+<!--                           <groupId>org.argeo.commons.osgi</groupId> -->
+<!--                           <artifactId>org.argeo.osgi.boot</artifactId> -->
+<!--                           <version>${version.argeo-commons}</version> -->
+<!--                   </dependency> -->
+<!--                   <dependency> -->
+<!--                           <groupId>org.argeo.commons.server</groupId> -->
+<!--                           <artifactId>org.argeo.server.ads</artifactId> -->
+<!--                           <version>${version.argeo-commons}</version> -->
+<!--                   </dependency> -->
+<!--                   <dependency> -->
+<!--                           <groupId>org.argeo.commons.server</groupId> -->
+<!--                           <artifactId>org.argeo.server.dep.jackrabbit.server</artifactId> -->
+<!--                           <version>${version.argeo-commons}</version> -->
+<!--                           <type>pom</type> -->
+<!--                   </dependency> -->
+<!--                   <dependency> -->
+<!--                           <groupId>org.argeo.commons.server</groupId> -->
+<!--                           <artifactId>org.argeo.server.jackrabbit</artifactId> -->
+<!--                           <version>${version.argeo-commons}</version> -->
+<!--                   </dependency> -->
                </dependencies>
        </dependencyManagement>
        <!-- -->

diff --git a/runtime/org.argeo.slc.launcher/pom.xml b/runtime/org.argeo.slc.launcher/pom.xml
index 9942c92690195bd37c50be2f5baffc74c84c88a8..cbd9139b473fe5a30d96787601c6c4c90de65367 100644 (file)
--- a/runtime/org.argeo.slc.launcher/pom.xml
+++ b/runtime/org.argeo.slc.launcher/pom.xml
@@ -75,7 +75,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons.osgi</groupId>

diff --git a/runtime/org.argeo.slc.lib.detached/pom.xml b/runtime/org.argeo.slc.lib.detached/pom.xml
index dcbe1c460a8cf061599bd1fe2742882cde6f910e..9338587e1929d2f6913b8c1282dc418e32405d76 100644 (file)
--- a/runtime/org.argeo.slc.lib.detached/pom.xml
+++ b/runtime/org.argeo.slc.lib.detached/pom.xml
@@ -31,24 +31,24 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.simple</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.detached</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.castor</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Unit Tests -->
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.unit</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                        <scope>test</scope>
                </dependency>
 

diff --git a/runtime/org.argeo.slc.support.activemq/pom.xml b/runtime/org.argeo.slc.support.activemq/pom.xml
index 6708d4df402549433d7cea3439328180dfad9f42..f49ce6a37d81ba0111a608ccdcccbaa870096959 100644 (file)
--- a/runtime/org.argeo.slc.support.activemq/pom.xml
+++ b/runtime/org.argeo.slc.support.activemq/pom.xml
@@ -31,7 +31,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Spring -->

diff --git a/runtime/org.argeo.slc.support.ant/pom.xml b/runtime/org.argeo.slc.support.ant/pom.xml
index 43dfef6285c50f8113f4e0de7e752cd6cd4233a0..b19f5b22717f70fc6dbdd5fd80ec52f389d422f1 100644 (file)
--- a/runtime/org.argeo.slc.support.ant/pom.xml
+++ b/runtime/org.argeo.slc.support.ant/pom.xml
@@ -31,7 +31,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
 
                <dependency>

diff --git a/runtime/org.argeo.slc.support.castor/pom.xml b/runtime/org.argeo.slc.support.castor/pom.xml
index 4ea5a34f29be26661c4412fc714137c2381438eb..858869099fecabdcbfe31b31615b55dea6fc4a16 100644 (file)
--- a/runtime/org.argeo.slc.support.castor/pom.xml
+++ b/runtime/org.argeo.slc.support.castor/pom.xml
@@ -63,7 +63,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
 
                <dependency>
@@ -91,7 +91,7 @@
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.unit</artifactId>
                        <scope>test</scope>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/runtime/org.argeo.slc.support.equinox/pom.xml b/runtime/org.argeo.slc.support.equinox/pom.xml
index aa0927259d914d0749f704f56c2cb4ef9fc8ea77..8e6ca0f45774d4944da66ea36212d9efbb59800d 100644 (file)
--- a/runtime/org.argeo.slc.support.equinox/pom.xml
+++ b/runtime/org.argeo.slc.support.equinox/pom.xml
@@ -44,7 +44,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.osgi</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
 
                <dependency>
@@ -57,7 +57,7 @@
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.unit</artifactId>
                        <scope>test</scope>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/runtime/org.argeo.slc.support.hibernate/pom.xml b/runtime/org.argeo.slc.support.hibernate/pom.xml
index 9508df5324c53fe16b877e3c2211c49c360dcd49..7592946e84ecc4c838a3c45fec8c04e01f5405d2 100644 (file)
--- a/runtime/org.argeo.slc.support.hibernate/pom.xml
+++ b/runtime/org.argeo.slc.support.hibernate/pom.xml
@@ -29,7 +29,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
 
                <dependency>
@@ -69,14 +69,14 @@
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.unit</artifactId>
                        <scope>test</scope>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
 
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.castor</artifactId>
                        <scope>test</scope>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
 
                <dependency>

diff --git a/runtime/org.argeo.slc.support.jcr/pom.xml b/runtime/org.argeo.slc.support.jcr/pom.xml
index f946f1fef413ee26b07dfa1654968b1aaf3f0728..135407c46a3795b0753cf332907a04ee80051c51 100644 (file)
--- a/runtime/org.argeo.slc.support.jcr/pom.xml
+++ b/runtime/org.argeo.slc.support.jcr/pom.xml
@@ -32,7 +32,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
 
                <dependency>
@@ -46,7 +46,7 @@
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.unit</artifactId>
                        <scope>test</scope>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons.server</groupId>

diff --git a/runtime/org.argeo.slc.support.maven/pom.xml b/runtime/org.argeo.slc.support.maven/pom.xml
index 5d247502a32d70d6b1da3ae29337245df4f511a9..348c96c8081d2772c9576cc01080d040ace7e1fa 100644 (file)
--- a/runtime/org.argeo.slc.support.maven/pom.xml
+++ b/runtime/org.argeo.slc.support.maven/pom.xml
@@ -67,12 +67,12 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.specs</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.aether</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
 
                <!-- <dependency> <groupId>org.argeo.dep.osgi</groupId> <artifactId>org.argeo.dep.osgi.maven.embedder</artifactId> 

diff --git a/runtime/org.argeo.slc.support.osgi/pom.xml b/runtime/org.argeo.slc.support.osgi/pom.xml
index 9f77a8e89b94785c96e33617489be9974a19ad27..2eaafe3dd2086a751324d95eb106c293eff1544d 100644 (file)
--- a/runtime/org.argeo.slc.support.osgi/pom.xml
+++ b/runtime/org.argeo.slc.support.osgi/pom.xml
@@ -32,7 +32,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
 
                <dependency>

diff --git a/runtime/org.argeo.slc.support.ws.client/pom.xml b/runtime/org.argeo.slc.support.ws.client/pom.xml
index 92ad80290497b183a21650de911a8fa726c5f51d..1dd69d59a7b03d98aa8cff4f2f4518ef9ac0a9e3 100644 (file)
--- a/runtime/org.argeo.slc.support.ws.client/pom.xml
+++ b/runtime/org.argeo.slc.support.ws.client/pom.xml
@@ -38,12 +38,12 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.simple</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.castor</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
 
                <dependency>

diff --git a/runtime/org.argeo.slc.unit/pom.xml b/runtime/org.argeo.slc.unit/pom.xml
index 5e4377b7b4fd1f0b37824e3688643179d74ebfaa..bff82d0e071fbba900f015d20356eff16cc2abb7 100644 (file)
--- a/runtime/org.argeo.slc.unit/pom.xml
+++ b/runtime/org.argeo.slc.unit/pom.xml
@@ -38,12 +38,12 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.simple</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.junit</groupId>
@@ -89,7 +89,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.launcher</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
 
                <!-- OXM -->