]> git.argeo.org Git - gpl/argeo-slc.git/commitdiff
Maven structure
authorMathieu Baudier <mbaudier@argeo.org>
Fri, 24 Apr 2009 14:21:28 +0000 (14:21 +0000)
committerMathieu Baudier <mbaudier@argeo.org>
Fri, 24 Apr 2009 14:21:28 +0000 (14:21 +0000)
git-svn-id: https://svn.argeo.org/slc/trunk@2345 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

27 files changed:
demo/.project [new file with mode: 0644]
demo/exec/server/conf/config.ini [new file with mode: 0644]
demo/pom.xml
demo/site/org.argeo.slc.demo.deploy/pom.xml
org.argeo.slc/pom.xml
runtime/org.argeo.slc.detached/pom.xml
runtime/org.argeo.slc.launcher/pom.xml
runtime/org.argeo.slc.lib.detached/pom.xml
runtime/org.argeo.slc.osgiboot/pom.xml
runtime/org.argeo.slc.server/pom.xml
runtime/org.argeo.slc.specs/pom.xml
runtime/org.argeo.slc.support.activemq/pom.xml
runtime/org.argeo.slc.support.ant/pom.xml
runtime/org.argeo.slc.support.castor/pom.xml
runtime/org.argeo.slc.support.equinox/pom.xml
runtime/org.argeo.slc.support.hibernate/pom.xml
runtime/org.argeo.slc.support.maven/pom.xml
runtime/org.argeo.slc.support.simple/pom.xml
runtime/org.argeo.slc.support.ws.client/pom.xml
server/org.argeo.slc.ria/pom.xml
server/org.argeo.slc.siteserver/bundles/distributionManagement.xml [deleted file]
server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/MANIFEST.MF
server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hsqldb/META-INF/MANIFEST.MF
server/org.argeo.slc.siteserver/bundles/pom-template.xml [deleted file]
server/org.argeo.slc.siteserver/bundles/pom.xml
server/org.argeo.slc.siteserver/deploy/pom.xml [deleted file]
server/org.argeo.slc.siteserver/pom.xml

diff --git a/demo/.project b/demo/.project
new file mode 100644 (file)
index 0000000..46d39a8
--- /dev/null
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>org.argeo.slc.demo</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+       </buildSpec>
+       <natures>
+       </natures>
+</projectDescription>
diff --git a/demo/exec/server/conf/config.ini b/demo/exec/server/conf/config.ini
new file mode 100644 (file)
index 0000000..9c4c3d5
--- /dev/null
@@ -0,0 +1,20 @@
+osgi.bundles=org.argeo.slc.osgiboot-0.11.3-SNAPSHOT.jar@start
+slc.osgi.bundles=../../lib;in=*.jar,../../site;in=*
+slc.osgi.start=org.argeo.dep.osgi.catalina.start,\
+       org.springframework.osgi.extender,\
+       org.springframework.osgi.web.extender,\
+       org.springframework.osgi.samples.simplewebapp,\
+       org.argeo.slc.server.activemq,\
+       org.argeo.slc.server.hsqldb,\
+       org.argeo.slc.server.hibernate,\
+       org.argeo.slc.server.services,\
+       org.argeo.slc.server.jms,\
+       org.argeo.slc.webapp,\
+       org.argeo.slc.support.equinox,\
+       com.capco.sparta.demo.environments,\
+       com.capco.sparta.demo.filediff,\
+       com.capco.sparta.demo.tablediff,\
+       com.capco.sparta.demo.autoui,\
+       com.capco.sparta.demo.manager
+       
+
index c0f671401f9b9d380c6aad9fc8038406d891a873..00feace89f40406ef119dd39bcbcc1c0e507e064 100644 (file)
@@ -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>
        <name>Argeo SLC Demo</name>
        <build>
                <plugins>
+                       <plugin>
+                               <artifactId>maven-dependency-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <goals>
+                                                       <goal>copy-dependencies</goal>
+                                               </goals>
+                                               <phase>initialize</phase>
+                                               <configuration>
+                                                       <outputDirectory>lib</outputDirectory>
+                                                       <includeTypes>jar</includeTypes>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.codehaus.mojo</groupId>
+                               <artifactId>exec-maven-plugin</artifactId>
+                               <version>1.1</version>
+                               <configuration>
+                                       <executable>java</executable>
+                                       <workingDirectory>exec/server</workingDirectory>
+                                       <arguments>
+                                               <argument>-Dmyproperty=myvalue</argument>
+                                               <argument>-jar</argument>
+                                               <argument>../../lib/org.eclipse.osgi-3.4.2.R34x_v20080826-1230.jar</argument>
+                                               <argument>-clean</argument>
+                                               <argument>-console</argument>
+                                               <argument>-configuration</argument>
+                                               <argument>conf</argument>
+                                       </arguments>
+                               </configuration>
+                       </plugin>
+
                </plugins>
        </build>
+       <dependencies>
+
+               <dependency>
+                       <groupId>org.argeo.slc.runtime</groupId>
+                       <artifactId>org.argeo.slc.support.equinox</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc.runtime</groupId>
+                       <artifactId>org.argeo.slc.osgiboot</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+               <!--  Server -->
+               <dependency>
+                       <groupId>org.argeo.slc.server</groupId>
+                       <artifactId>deploy</artifactId>
+                       <version>${project.version}</version>
+                       <type>pom</type>
+               </dependency>
+       </dependencies>
+
+
 </project>
index dabfa6aeb50ef5de5ff09c1ab3f7dac51b705b76..417621bbd5632c5ea376b53def329af8965cd36d 100644 (file)
                                </dependency>
                                <dependency>
                                        <groupId>org.argeo.slc.server</groupId>
-                                       <artifactId>deploy</artifactId>
+                                       <artifactId>bundles</artifactId>
                                        <version>${project.version}</version>
                                        <type>pom</type>
                                </dependency>
index a19a72f89b37b8f29d8f7bfb2f8432a17438542f..078e1061caaaec483144aa2ec20b2a102e6631f0 100644 (file)
@@ -83,21 +83,6 @@ limitations under the License.
                                                <target>1.5</target>
                                        </configuration>
                                </plugin>
-                               <plugin>
-                                       <artifactId>maven-jar-plugin</artifactId>
-                                       <configuration>
-                                               <archive>
-                                                       <manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
-                                               </archive>
-                                       </configuration>
-                                       <executions>
-                                               <execution>
-                                                       <goals>
-                                                               <goal>test-jar</goal>
-                                                       </goals>
-                                               </execution>
-                                       </executions>
-                               </plugin>
                                <plugin>
                                        <groupId>org.apache.maven.plugins</groupId>
                                        <artifactId>maven-source-plugin</artifactId>
@@ -195,30 +180,6 @@ limitations under the License.
                                                -->
                                        </dependencies>
                                </plugin>
-                               <plugin>
-                                       <groupId>org.apache.felix</groupId>
-                                       <artifactId>maven-bundle-plugin</artifactId>
-                                       <version>${version.maven-bundle-plugin}</version>
-                                       <extensions>true</extensions>
-                                       <configuration>
-                                               <manifestLocation>target/classes/META-INF</manifestLocation>
-                                               <instructions>
-                                                       <Bundle-SymbolicName>
-                                                               ${pom.artifactId}
-                                                       </Bundle-SymbolicName>
-                                                       <_removeheaders>Bnd-LastModified</_removeheaders>
-                                               </instructions>
-                                       </configuration>
-                                       <executions>
-                                               <execution>
-                                                       <id>bundle-manifest</id>
-                                                       <phase>process-classes</phase>
-                                                       <goals>
-                                                               <goal>manifest</goal>
-                                                       </goals>
-                                               </execution>
-                                       </executions>
-                               </plugin>
                        </plugins>
                </pluginManagement>
                <plugins>
index d3b9b49fc8accaed96919d31959f649ecf6f5d62..c9ceb50190563cb867f67c29e7b223128f120979 100644 (file)
@@ -1,12 +1,11 @@
 <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>
-               <artifactId>argeo-slc</artifactId>
+               <groupId>org.argeo.slc.runtime</groupId>
+               <artifactId>argeo-slc-runtime</artifactId>
                <version>0.11.3-SNAPSHOT</version>
-               <relativePath>../../org.argeo.slc</relativePath>
+               <relativePath>..</relativePath>
        </parent>
-       <groupId>org.argeo.slc.runtime</groupId>
        <artifactId>org.argeo.slc.detached</artifactId>
        <name>Argeo SLC Detached</name>
        <packaging>jar</packaging>
index 57d1e004e5d38f6b10f3f17a8b939c34f9c5b143..6e6a1a33a8d5bc14b364910ef759af06a9f09f28 100644 (file)
@@ -2,12 +2,11 @@
        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>
-               <artifactId>argeo-slc</artifactId>
+               <groupId>org.argeo.slc.runtime</groupId>
+               <artifactId>argeo-slc-runtime</artifactId>
                <version>0.11.3-SNAPSHOT</version>
-               <relativePath>../../org.argeo.slc</relativePath>
+               <relativePath>..</relativePath>
        </parent>
-       <groupId>org.argeo.slc.runtime</groupId>
        <artifactId>org.argeo.slc.launcher</artifactId>
        <packaging>jar</packaging>
        <name>Argeo SLC Launcher</name>
index a67d86ccc5a2d6a67f30127fb4765a45060cdd6c..a96206dc39ad6aa4c953123ac7496cb6f18a3c86 100644 (file)
@@ -2,12 +2,11 @@
        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>
-               <artifactId>argeo-slc</artifactId>
+               <groupId>org.argeo.slc.runtime</groupId>
+               <artifactId>argeo-slc-runtime</artifactId>
                <version>0.11.3-SNAPSHOT</version>
-               <relativePath>../../org.argeo.slc</relativePath>
+               <relativePath>..</relativePath>
        </parent>
-       <groupId>org.argeo.slc.runtime</groupId>
        <artifactId>org.argeo.slc.lib.detached</artifactId>
        <packaging>jar</packaging>
        <name>Argeo SLC Lib Detached</name>
index 02ee44aaeb58f226ebc6633dc94c0ac6a6d76672..df47dc71ae916b59ccef5e3ef362ec77ec646eaa 100644 (file)
@@ -2,12 +2,11 @@
        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>
-               <artifactId>argeo-slc</artifactId>
+               <groupId>org.argeo.slc.runtime</groupId>
+               <artifactId>argeo-slc-runtime</artifactId>
                <version>0.11.3-SNAPSHOT</version>
-               <relativePath>../../org.argeo.slc</relativePath>
+               <relativePath>..</relativePath>
        </parent>
-       <groupId>org.argeo.slc.runtime</groupId>
        <artifactId>org.argeo.slc.osgiboot</artifactId>
        <packaging>jar</packaging>
        <name>Argeo SLC OSGi Boot</name>
index f69f8bd35d1733c0372032e98372bfaa0dd80ce2..c60ae13af97598c5f477b44b79d66afb43659536 100644 (file)
@@ -2,12 +2,11 @@
        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>
-               <artifactId>argeo-slc</artifactId>
+               <groupId>org.argeo.slc.runtime</groupId>
+               <artifactId>argeo-slc-runtime</artifactId>
                <version>0.11.3-SNAPSHOT</version>
-               <relativePath>../../org.argeo.slc</relativePath>
+               <relativePath>..</relativePath>
        </parent>
-       <groupId>org.argeo.slc.runtime</groupId>
        <artifactId>org.argeo.slc.server</artifactId>
        <name>Argeo SLC Server</name>
        <description>SLC Server</description>
index 68ee65f4b0530a4a8ffb3f0cd8c061b9d805eb15..ef463e3310794471e18c84646c28f2fcd232bebe 100644 (file)
@@ -1,12 +1,11 @@
 <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>
-               <artifactId>argeo-slc</artifactId>
+               <groupId>org.argeo.slc.runtime</groupId>
+               <artifactId>argeo-slc-runtime</artifactId>
                <version>0.11.3-SNAPSHOT</version>
-               <relativePath>../../org.argeo.slc</relativePath>
+               <relativePath>..</relativePath>
        </parent>
-       <groupId>org.argeo.slc.runtime</groupId>
        <artifactId>org.argeo.slc.specs</artifactId>
        <name>Argeo SLC Specifications</name>
        <build>
index 5260893db27f53c752c0685f126c41c785c76172..d0141651158834074ca201ac42e3422572c476d2 100644 (file)
@@ -2,12 +2,11 @@
        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>
-               <artifactId>argeo-slc</artifactId>
+               <groupId>org.argeo.slc.runtime</groupId>
+               <artifactId>argeo-slc-runtime</artifactId>
                <version>0.11.3-SNAPSHOT</version>
-               <relativePath>../../org.argeo.slc</relativePath>
+               <relativePath>..</relativePath>
        </parent>
-       <groupId>org.argeo.slc.runtime</groupId>
        <artifactId>org.argeo.slc.support.activemq</artifactId>
        <name>Argeo SLC Support ActiveMQ</name>
        <build>
index 7f780119620fe48b65b3d80d26316715bc5b54e0..909fd1a49384fb4ade0bb182025f3de8529046a4 100644 (file)
@@ -1,12 +1,11 @@
 <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>
-               <artifactId>argeo-slc</artifactId>
+               <groupId>org.argeo.slc.runtime</groupId>
+               <artifactId>argeo-slc-runtime</artifactId>
                <version>0.11.3-SNAPSHOT</version>
-               <relativePath>../../org.argeo.slc</relativePath>
+               <relativePath>..</relativePath>
        </parent>
-       <groupId>org.argeo.slc.runtime</groupId>
        <artifactId>org.argeo.slc.support.ant</artifactId>
        <packaging>jar</packaging>
        <name>Argeo SLC Support Ant</name>
index 3aa47a13522c1d919053ad68fb3ce072ddf1781a..5fa3b3f9aab37d8d5b5fba37e44830f10f63fda8 100644 (file)
@@ -2,12 +2,11 @@
        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>
-               <artifactId>argeo-slc</artifactId>
+               <groupId>org.argeo.slc.runtime</groupId>
+               <artifactId>argeo-slc-runtime</artifactId>
                <version>0.11.3-SNAPSHOT</version>
-               <relativePath>../../org.argeo.slc</relativePath>
+               <relativePath>..</relativePath>
        </parent>
-       <groupId>org.argeo.slc.runtime</groupId>
        <artifactId>org.argeo.slc.support.castor</artifactId>
        <name>Argeo SLC Support Castor</name>
        <description>Implementations of SLC Specs using Castor</description>
index cf6170b4598096f995eb8758188f18eeb4a59497..3677085d69b4d6c746849bb200afac9a28c0cad3 100644 (file)
@@ -2,12 +2,11 @@
        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>
-               <artifactId>argeo-slc</artifactId>
+               <groupId>org.argeo.slc.runtime</groupId>
+               <artifactId>argeo-slc-runtime</artifactId>
                <version>0.11.3-SNAPSHOT</version>
-               <relativePath>../../org.argeo.slc</relativePath>
+               <relativePath>..</relativePath>
        </parent>
-       <groupId>org.argeo.slc.runtime</groupId>
        <artifactId>org.argeo.slc.support.equinox</artifactId>
        <name>Argeo SLC Support Equinox OSGi</name>
        <packaging>jar</packaging>
index a40133d00ed4793ff8903a919690fba86a51ffe9..2dfdcaee0705b01f8333c0910365efd6e3fa503b 100644 (file)
@@ -1,12 +1,11 @@
 <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>
-               <artifactId>argeo-slc</artifactId>
+               <groupId>org.argeo.slc.runtime</groupId>
+               <artifactId>argeo-slc-runtime</artifactId>
                <version>0.11.3-SNAPSHOT</version>
-               <relativePath>../../org.argeo.slc</relativePath>
+               <relativePath>..</relativePath>
        </parent>
-       <groupId>org.argeo.slc.runtime</groupId>
        <artifactId>org.argeo.slc.support.hibernate</artifactId>
        <name>Argeo SLC Support Hibernate</name>
        <build>
index 9c2e157dd01ff31f0393689d5e2f4b795ffa65a8..94ed95440663824854c0481a451d60205c4a5934 100644 (file)
@@ -2,12 +2,11 @@
        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>
-               <artifactId>argeo-slc</artifactId>
+               <groupId>org.argeo.slc.runtime</groupId>
+               <artifactId>argeo-slc-runtime</artifactId>
                <version>0.11.3-SNAPSHOT</version>
-               <relativePath>../../org.argeo.slc</relativePath>
+               <relativePath>..</relativePath>
        </parent>
-       <groupId>org.argeo.slc.runtime</groupId>
        <artifactId>org.argeo.slc.support.maven</artifactId>
        <packaging>jar</packaging>
        <name>Argeo SLC Support Maven</name>
index 7b955acd2fd62e8f4f9cda954f39dbd58f13fc44..40dc4a0ea95f6a6a22c47a288ad0c3c6115ca7ea 100644 (file)
@@ -2,12 +2,11 @@
        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>
-               <artifactId>argeo-slc</artifactId>
+               <groupId>org.argeo.slc.runtime</groupId>
+               <artifactId>argeo-slc-runtime</artifactId>
                <version>0.11.3-SNAPSHOT</version>
-               <relativePath>../../org.argeo.slc</relativePath>
+               <relativePath>..</relativePath>
        </parent>
-       <groupId>org.argeo.slc.runtime</groupId>
        <artifactId>org.argeo.slc.support.simple</artifactId>
        <name>Argeo SLC Support Simple</name>
        <description>Basic implementations of SLC Specifications</description>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-jar-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <goals>
+                                                       <goal>test-jar</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
                        </plugin>
                        <plugin>
                                <groupId>org.apache.felix</groupId>
index 3ffbd8942b5bc10583200ddfd1d090c84ff0e643..f030c97cb15c12f15215c155e6579e45e781b7d9 100644 (file)
@@ -2,12 +2,11 @@
        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>
-               <artifactId>argeo-slc</artifactId>
+               <groupId>org.argeo.slc.runtime</groupId>
+               <artifactId>argeo-slc-runtime</artifactId>
                <version>0.11.3-SNAPSHOT</version>
-               <relativePath>../../org.argeo.slc</relativePath>
+               <relativePath>..</relativePath>
        </parent>
-       <groupId>org.argeo.slc.runtime</groupId>
        <artifactId>org.argeo.slc.support.ws.client</artifactId>
        <packaging>jar</packaging>
        <name>Argeo SLC Support Web Services Client</name>
index 1a3ac903127d78f0b2d02d4913f8ff6eb99f063d..da74eadca4c0aabfc08135bb92e3bb957110e471 100644 (file)
@@ -34,7 +34,7 @@
                        <plugin>
                                <groupId>org.argeo.slc.maven</groupId>
                                <artifactId>maven-argeo-qooxdoo-plugin</artifactId>
-                               <version>0.8.1.3</version>
+                               <version>0.8.1.4</version>
                                <executions>
                                        <execution>
                                                <id>env</id>
diff --git a/server/org.argeo.slc.siteserver/bundles/distributionManagement.xml b/server/org.argeo.slc.siteserver/bundles/distributionManagement.xml
deleted file mode 100644 (file)
index 934d7af..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-
-       <repositories>
-               <repository>
-                       <id>central</id>
-                       <url>http://repo1.maven.org/maven2</url>
-                       <releases>
-                               <enabled>true</enabled>
-                               <updatePolicy>daily</updatePolicy>
-                               <checksumPolicy>warn</checksumPolicy>
-                       </releases>
-                       <snapshots>
-                               <enabled>false</enabled>
-                               <updatePolicy>never</updatePolicy>
-                               <checksumPolicy>fail</checksumPolicy>
-                       </snapshots>
-               </repository>
-               <repository>
-                       <id>com.springsource.repository.bundles.release</id>
-                       <name>
-                               SpringSource Enterprise Bundle Repository - SpringSource
-                               Bundle
-                               Releases
-                       </name>
-                       <url>
-                               http://repository.springsource.com/maven/bundles/release
-                       </url>
-                       <releases>
-                               <enabled>true</enabled>
-                               <updatePolicy>daily</updatePolicy>
-                               <checksumPolicy>fail</checksumPolicy>
-                       </releases>
-                       <snapshots>
-                               <enabled>false</enabled>
-                               <updatePolicy>never</updatePolicy>
-                               <checksumPolicy>fail</checksumPolicy>
-                       </snapshots>
-               </repository>
-               <repository>
-                       <id>com.springsource.repository.bundles.external</id>
-                       <name>
-                               SpringSource Enterprise Bundle Repository - External
-                               Bundle
-                               Releases
-                       </name>
-                       <url>
-                               http://repository.springsource.com/maven/bundles/external
-                       </url>
-                       <releases>
-                               <enabled>true</enabled>
-                               <updatePolicy>daily</updatePolicy>
-                               <checksumPolicy>fail</checksumPolicy>
-                       </releases>
-                       <snapshots>
-                               <enabled>false</enabled>
-                               <updatePolicy>never</updatePolicy>
-                               <checksumPolicy>fail</checksumPolicy>
-                       </snapshots>
-               </repository>
-               <repository>
-                       <id>argeo</id>
-                       <url>http://www.argeo.org/maven/argeo</url>
-                       <releases>
-                               <enabled>true</enabled>
-                               <updatePolicy>daily</updatePolicy>
-                               <checksumPolicy>fail</checksumPolicy>
-                       </releases>
-                       <snapshots>
-                               <enabled>false</enabled>
-                               <updatePolicy>never</updatePolicy>
-                               <checksumPolicy>fail</checksumPolicy>
-                       </snapshots>
-               </repository>
-               <repository>
-                       <id>argeo-snapshots</id>
-                       <url>http://www.argeo.org/maven/argeo-snapshots</url>
-                       <releases>
-                               <enabled>false</enabled>
-                               <updatePolicy>never</updatePolicy>
-                               <checksumPolicy>fail</checksumPolicy>
-                       </releases>
-                       <snapshots>
-                               <enabled>true</enabled>
-                               <updatePolicy>always</updatePolicy>
-                               <checksumPolicy>fail</checksumPolicy>
-                       </snapshots>
-               </repository>
-       </repositories>
-       <distributionManagement>
-       <repository>
-               <uniqueVersion>false</uniqueVersion>
-               <id>argeo-restricted</id>
-               <name>Argeo FOSS Repository</name>
-               <url>file:///var/argeo/maven2/argeo
-               </url>
-       </repository>
-       <snapshotRepository>
-               <uniqueVersion>true</uniqueVersion>
-               <id>argeo-snapshots-restricted</id>
-               <name>Argeo FOSS Snapshots Repository</name>
-               <url>file:///var/argeo/maven2/argeo-snapshots
-               </url>
-       </snapshotRepository>
-</distributionManagement>
index fab33ff0c54568e6bac5e620f6727a4478d5898b..24a6f92a68808002ae3c9b78f03aef2d28a118e8 100644 (file)
@@ -1,16 +1,15 @@
 Bundle-SymbolicName: org.argeo.slc.server.hibernate
 Bundle-Version: 0.11.3.qualifier
 Import-Package: 
+ org.aopalliance.aop,
  org.hibernate,
- org.springframework.orm.hibernate3,
+ org.hibernate.jdbc,
  org.springframework.aop,
  org.springframework.aop.framework,
- org.aopalliance.aop,
- org.hibernate.jdbc,
+ org.springframework.orm.hibernate3,
  org.springframework.transaction
 Require-Bundle: 
  org.argeo.slc.server,
  org.argeo.slc.specs,
  org.argeo.slc.support.simple,
  com.springsource.org.hibernate
\ No newline at end of file
index 138eb54d7e717a6a629def8b1e49365c14a195bf..319630a1e0d6122b24933a22eb08f426b6f5fe0a 100644 (file)
@@ -1,12 +1,11 @@
 Bundle-SymbolicName: org.argeo.slc.server.hsqldb
 Bundle-Version: 0.11.3.qualifier
+Require-Bundle: org.argeo.slc.server,
+ org.argeo.slc.specs,
+ org.argeo.slc.support.simple
 Import-Package: 
  org.springframework.orm.hibernate3,
  org.springframework.cache.ehcache,
  net.sf.ehcache.hibernate,
  org.hsqldb.jdbc,
  org.hibernate
-Require-Bundle: org.argeo.slc.server,
- org.argeo.slc.specs,
- org.argeo.slc.support.simple
\ No newline at end of file
diff --git a/server/org.argeo.slc.siteserver/bundles/pom-template.xml b/server/org.argeo.slc.siteserver/bundles/pom-template.xml
deleted file mode 100644 (file)
index 4f99d50..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-<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>
-       <groupId>org.argeo.slc.server</groupId>
-       <artifactId>@Bundle-SymbolicName@</artifactId>
-       <version>@Bundle-Version@</version>
-       <packaging>jar</packaging>
-       <build>
-               <plugins>
-                       <plugin>
-                               <artifactId>maven-jar-plugin</artifactId>
-                               <configuration>
-                                       <archive>
-                                               <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                                       </archive>
-                                       <classesDirectory>.</classesDirectory>
-                                       <includes>
-                                               <include>META-INF/spring/**</include>
-                                               <include>WEB-INF/**</include>
-                                               <include>conf/**</include>
-                                       </includes>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-       @distributionManagement@
-</project>
\ No newline at end of file
index 073c05f449b7de4c40a95cb3bb2e3c9918504903..4c48fd04e8e60e42ecb1beea80fa16a3ac0b65cd 100644 (file)
@@ -2,14 +2,14 @@
        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>
-               <artifactId>argeo-slc</artifactId>
+               <groupId>org.argeo.slc.server</groupId>
+               <artifactId>deploy</artifactId>
                <version>0.11.3-SNAPSHOT</version>
-               <relativePath>../../../org.argeo.slc</relativePath>
+               <relativePath>..</relativePath>
        </parent>
        <groupId>org.argeo.slc.server</groupId>
        <artifactId>org.argeo.slc.server.bundles</artifactId>
-       <packaging>pom</packaging>
+       <packaging>bundles</packaging>
        <name>Argeo SLC Server Bundles</name>
        <properties>
        </properties>
                        <plugin>
                                <groupId>org.argeo.slc.maven</groupId>
                                <artifactId>maven-argeo-osgi-plugin</artifactId>
-                               <version>0.1.3</version>
-                               <executions>
-                                       <execution>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>simple-bundles</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <bundlesBase>.</bundlesBase>
-                                               </configuration>
-                                       </execution>
-                               </executions>
+                               <version>0.1.4</version>
+                               <extensions>true</extensions>
                        </plugin>
-                       <plugin>
-                               <artifactId>maven-invoker-plugin</artifactId>
-                               <version>1.3</version>
-                               <configuration>
-                                       <projectsDirectory>target/bundles</projectsDirectory>
-                                       <pomIncludes>
-                                               <pomInclude>pom.xml</pomInclude>
-                                       </pomIncludes>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>bundles-install</id>
-                                               <phase>install</phase>
-                                               <goals>
-                                                       <goal>run</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <goals>
-                                                               <goal>install</goal>
-                                                       </goals>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>bundles-deploy</id>
-                                               <phase>deploy</phase>
-                                               <goals>
-                                                       <goal>run</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <goals>
-                                                               <goal>deploy</goal>
-                                                       </goals>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-
                </plugins>
        </build>
-       <dependencies>
-       </dependencies>
 </project>
\ No newline at end of file
diff --git a/server/org.argeo.slc.siteserver/deploy/pom.xml b/server/org.argeo.slc.siteserver/deploy/pom.xml
deleted file mode 100644 (file)
index 83f5d54..0000000
+++ /dev/null
@@ -1,224 +0,0 @@
-<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>
-               <artifactId>argeo-slc</artifactId>
-               <version>0.11.3-SNAPSHOT</version>
-               <relativePath>../../../org.argeo.slc</relativePath>
-       </parent>
-       <groupId>org.argeo.slc.server</groupId>
-       <artifactId>deploy</artifactId>
-       <packaging>pom</packaging>
-       <name>Argeo SLC Server Deploy</name>
-       <properties>
-               <bundlesToStart>
-                       org.argeo.dep.osgi.catalina.start,
-                       org.springframework.osgi.extender,
-                       org.springframework.osgi.web.extender,
-                       org.springframework.osgi.samples.simplewebapp,
-                       org.argeo.slc.server.activemq,
-                       org.argeo.slc.server.hsqldb,
-                       org.argeo.slc.server.hibernate,
-                       org.argeo.slc.server.services,
-                       org.argeo.slc.server.jms,
-                       org.argeo.slc.webapp,
-                       org.argeo.slc.demo.basic,
-                       org.argeo.slc.demo.manager
-               </bundlesToStart>
-       </properties>
-       <build>
-               <plugins>
-
-                       <plugin>
-                               <artifactId>maven-dependency-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <goals>
-                                                       <goal>unpack</goal>
-                                               </goals>
-                                               <phase>initialize</phase>
-                                               <configuration>
-                                                       <outputDirectory>target/equinox</outputDirectory>
-                                                       <artifactItems>
-                                                               <artifactItem>
-                                                                       <groupId>org.argeo.slc.runtime</groupId>
-                                                                       <artifactId>org.argeo.slc.osgiboot</artifactId>
-                                                                       <version>${project.version}</version>
-                                                                       <type>tar.gz</type>
-                                                                       <classifier>osgiboot</classifier>
-                                                               </artifactItem>
-                                                       </artifactItems>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       <plugin>
-                               <artifactId>maven-antrun-plugin</artifactId>
-                               <configuration>
-                                       <tasks>
-                                               <path id="slc.osgi.locations.raw">
-                                                       <dirset dir="${user.dir}/bundles">
-                                                               <include name="*" />
-                                                               <exclude name=".svn" />
-                                                       </dirset>
-                                                       <dirset dir="${user.dir}/../../demo/site">
-                                                               <include name="*" />
-                                                               <exclude name=".svn" />
-                                                       </dirset>
-                                                       <!-- Dev for Argeo RIA: -->
-                                                       <!--
-                                                               <pathelement
-                                                               location="../../org.argeo.slc.webapp/src/main/webapp" />
-                                                       -->
-                                                       <path refid="maven.compile.classpath" />
-                                               </path>
-                                               <pathconvert dirsep="/" property="slc.osgi.locations"
-                                                       refid="slc.osgi.locations.raw" />
-
-                                               <property name="slc.osgi.start" value="${bundlesToStart}" />
-
-                                               <property name="javaCommand" value="java -Xmx256m" />
-                                               <ant antfile="target/equinox/osgiboot.xml" />
-                                       </tasks>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-
-               <dependency>
-                       <groupId>org.argeo.slc.server</groupId>
-                       <artifactId>bundles</artifactId>
-                       <version>${project.version}</version>
-                       <type>pom</type>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.server</artifactId>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.argeo.slc.server</groupId>
-                       <artifactId>org.argeo.slc.ria</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-
-
-               <dependency>
-                       <groupId>org.hsqldb</groupId>
-                       <artifactId>com.springsource.org.hsqldb</artifactId>
-               </dependency>
-
-               <!-- OSGi integration -->
-               <dependency>
-                       <groupId>org.eclipse.osgi</groupId>
-                       <artifactId>org.eclipse.osgi</artifactId>
-               </dependency>
-
-               <dependency>
-                       <groupId>javax.annotation</groupId>
-                       <artifactId>com.springsource.javax.annotation</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.persistence</groupId>
-                       <artifactId>com.springsource.javax.persistence</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.xml.ws</groupId>
-                       <artifactId>com.springsource.javax.xml.ws</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.xml.bind</groupId>
-                       <artifactId>com.springsource.javax.xml.bind</artifactId>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.aopalliance</groupId>
-                       <artifactId>com.springsource.org.aopalliance</artifactId>
-               </dependency>
-
-               <dependency>
-                       <groupId>javax.ejb</groupId>
-                       <artifactId>com.springsource.javax.ejb</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.activation</groupId>
-                       <artifactId>com.springsource.javax.activation</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.xml.rpc</groupId>
-                       <artifactId>com.springsource.javax.xml.rpc</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.xml.soap</groupId>
-                       <artifactId>com.springsource.javax.xml.soap</artifactId>
-               </dependency>
-               <!--
-                       Using springsource repo -->
-               <dependency>
-                       <groupId>org.springframework.osgi</groupId>
-                       <artifactId>org.springframework.osgi.web.extender</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework.osgi</groupId>
-                       <artifactId>org.springframework.osgi.extender</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework.osgi</groupId>
-                       <artifactId>org.springframework.osgi.web</artifactId>
-               </dependency>
-
-               <!-- Tomcat -->
-               <dependency>
-                       <groupId>org.apache.catalina</groupId>
-                       <artifactId>com.springsource.org.apache.catalina</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.jasper</groupId>
-                       <artifactId>com.springsource.org.apache.jasper</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.el</groupId>
-                       <artifactId>com.springsource.org.apache.el</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
-               </dependency>
-
-
-               <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>com.springsource.org.apache.commons.logging</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.log4j</groupId>
-                       <artifactId>
-                                       com.springsource.org.apache.log4j
-                               </artifactId>
-               </dependency>
-
-               <!-- For WS -->
-               <dependency>
-                       <groupId>com.sun.xml</groupId>
-                       <artifactId>com.springsource.com.sun.xml.messaging.saaj</artifactId>
-               </dependency>
-
-               <!-- For ActiveMQ Web -->
-               <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.activemq.web</artifactId>
-               </dependency>
-
-               <!-- For demo
-               <dependency>
-                       <groupId>org.argeo.slc.demo</groupId>
-                       <artifactId>org.argeo.slc.demo.deploy</artifactId>
-                       <version>${project.version}</version>
-                       <type>pom</type>
-               </dependency>
- -->
-       </dependencies>
-</project>
\ No newline at end of file
index b9ab5eec6f7afc6628847e98337d7a995a657e67..e980d0d46d1727e032f26399a2f1da5403770862 100644 (file)
                <version>0.11.3-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
-       <artifactId>org.argeo.slc.siteserver</artifactId>
+       <groupId>org.argeo.slc.server</groupId>
+       <artifactId>deploy</artifactId>
        <packaging>pom</packaging>
-       <name>Argeo SLC Site server</name>
-       <properties>
-       </properties>
+       <name>Argeo SLC Server Deploy</name>
        <modules>
                <module>bundles</module>
-               <module>deploy</module>
        </modules>
-       <build>
-       </build>
        <dependencies>
+               <dependency>
+                       <groupId>org.argeo.slc.runtime</groupId>
+                       <artifactId>org.argeo.slc.server</artifactId>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.argeo.slc.server</groupId>
+                       <artifactId>org.argeo.slc.ria</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+
+
+               <dependency>
+                       <groupId>org.hsqldb</groupId>
+                       <artifactId>com.springsource.org.hsqldb</artifactId>
+               </dependency>
+
+               <!-- OSGi integration -->
+               <dependency>
+                       <groupId>org.eclipse.osgi</groupId>
+                       <artifactId>org.eclipse.osgi</artifactId>
+               </dependency>
+
+               <dependency>
+                       <groupId>javax.annotation</groupId>
+                       <artifactId>com.springsource.javax.annotation</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>javax.persistence</groupId>
+                       <artifactId>com.springsource.javax.persistence</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>javax.xml.ws</groupId>
+                       <artifactId>com.springsource.javax.xml.ws</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>javax.xml.bind</groupId>
+                       <artifactId>com.springsource.javax.xml.bind</artifactId>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.aopalliance</groupId>
+                       <artifactId>com.springsource.org.aopalliance</artifactId>
+               </dependency>
+
+               <dependency>
+                       <groupId>javax.ejb</groupId>
+                       <artifactId>com.springsource.javax.ejb</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>javax.activation</groupId>
+                       <artifactId>com.springsource.javax.activation</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>javax.xml.rpc</groupId>
+                       <artifactId>com.springsource.javax.xml.rpc</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>javax.xml.soap</groupId>
+                       <artifactId>com.springsource.javax.xml.soap</artifactId>
+               </dependency>
+               <!--
+                       Using springsource repo -->
+               <dependency>
+                       <groupId>org.springframework.osgi</groupId>
+                       <artifactId>org.springframework.osgi.web.extender</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework.osgi</groupId>
+                       <artifactId>org.springframework.osgi.extender</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework.osgi</groupId>
+                       <artifactId>org.springframework.osgi.web</artifactId>
+               </dependency>
+
+               <!-- Tomcat -->
+               <dependency>
+                       <groupId>org.apache.catalina</groupId>
+                       <artifactId>com.springsource.org.apache.catalina</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.jasper</groupId>
+                       <artifactId>com.springsource.org.apache.jasper</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.el</groupId>
+                       <artifactId>com.springsource.org.apache.el</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc.dep.osgi</groupId>
+                       <artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
+               </dependency>
+
+
+               <dependency>
+                       <groupId>org.apache.commons</groupId>
+                       <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.log4j</groupId>
+                       <artifactId>
+                                       com.springsource.org.apache.log4j
+                               </artifactId>
+               </dependency>
+
+               <!-- For WS -->
+               <dependency>
+                       <groupId>com.sun.xml</groupId>
+                       <artifactId>com.springsource.com.sun.xml.messaging.saaj</artifactId>
+               </dependency>
+
+               <!-- For ActiveMQ Web -->
+               <dependency>
+                       <groupId>org.argeo.dep.osgi</groupId>
+                       <artifactId>org.argeo.dep.osgi.activemq.web</artifactId>
+               </dependency>
+
        </dependencies>
 </project>
\ No newline at end of file