Improve detached launcher

[gpl/argeo-slc.git] / server / org.argeo.slc.siteserver / pom.xml

diff --git a/server/org.argeo.slc.siteserver/pom.xml b/server/org.argeo.slc.siteserver/pom.xml
index 5d859019e53ce25c016eb3ed6a72ce44e1f869c0..286b1daca6a918c36c5c7731c5241c5575e1dbb8 100644 (file)
--- a/server/org.argeo.slc.siteserver/pom.xml
+++ b/server/org.argeo.slc.siteserver/pom.xml
@@ -2,85 +2,18 @@
        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>argeo-slc-server</artifactId>
                <version>0.11.3-SNAPSHOT</version>
-               <relativePath>../../org.argeo.slc</relativePath>
+               <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>
-               <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.hibernate,
-                       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>
+       <name>Argeo SLC Server Deploy</name>
+       <modules>
+               <module>bundles</module>
+       </modules>
        <dependencies>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
@@ -188,17 +121,25 @@
                                </artifactId>
                </dependency>
 
-               <!-- For ActiveMQ Web -->
                <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.activemq.web</artifactId>
+                       <groupId>net.sourceforge.jtds</groupId>
+                       <artifactId>com.springsource.net.sourceforge.jtds</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>com.mysql.jdbc</groupId>
+                       <artifactId>com.springsource.com.mysql.jdbc</artifactId>
                </dependency>
 
-               <!-- For demo -->
+               <!-- For WS -->
                <dependency>
-                       <groupId>org.argeo.slc.demo</groupId>
-                       <artifactId>org.argeo.slc.demo.deploy</artifactId>
-                       <version>${project.version}</version>
+                       <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>