Simple bundles packaging

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

diff --git a/demo/site/org.argeo.slc.demo.deploy/pom.xml b/demo/site/org.argeo.slc.demo.deploy/pom.xml
index 9e73311eb225f61071342a0a5bbc30e2fe58099e..1646d8393d3552e6ebf5cdf4450349f680f82910 100644 (file)
--- a/demo/site/org.argeo.slc.demo.deploy/pom.xml
+++ b/demo/site/org.argeo.slc.demo.deploy/pom.xml
@@ -89,6 +89,38 @@
                                </dependency>
                        </dependencies>
                </profile>
+               <profile>
+                       <id>server</id>
+                       <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>
+                       <dependencies>
+                               <dependency>
+                                       <groupId>org.argeo.slc.demo</groupId>
+                                       <artifactId>org.argeo.slc.demo.agent</artifactId>
+                                       <version>${project.version}</version>
+                               </dependency>
+                               <dependency>
+                                       <groupId>org.argeo.slc.server</groupId>
+                                       <artifactId>deploy</artifactId>
+                                       <version>${project.version}</version>
+                                       <type>pom</type>
+                               </dependency>
+                       </dependencies>
+               </profile>
        </profiles>
        <dependencies>
 

diff --git a/server/org.argeo.slc.siteserver/bundles/logging/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/logging/META-INF/MANIFEST.MF
index 35ccf4646ea9629d5f080ec494301f5b5cbe5f01..8f6fb5a594e4db3c2f62fcb0c7829fce7b9dd8f0 100644 (file)
--- a/server/org.argeo.slc.siteserver/bundles/logging/META-INF/MANIFEST.MF
+++ b/server/org.argeo.slc.siteserver/bundles/logging/META-INF/MANIFEST.MF
@@ -1,4 +1,5 @@
 Bundle-Name: Log4j configuration bundle\r
 Bundle-SymbolicName: server.logging\r
+Bundle-Version: 0.1.0.qualifier\r
 Fragment-Host: com.springsource.org.apache.log4j\r
 \r

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/META-INF/MANIFEST.MF
index 778c94e75a452beac206007172801ff535e8a82e..17689e2bc064191c85d15958d58fff8dd69a2ea1 100644 (file)
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/META-INF/MANIFEST.MF
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Bundle-SymbolicName: org.argeo.slc.server.activemq
-Bundle-Version: 0.1.0
+Bundle-Version: 0.11.3.qualifier
 Import-Package: javax.jms,
  javax.management.j2ee.statistics,
  org.apache.commons.logging

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.catalina/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.catalina/META-INF/MANIFEST.MF
index 82d61530288b498a0b48f3547b0fb492a0fbcf0a..a1879c8da431858982a60cec75826900c5ab617d 100644 (file)
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.catalina/META-INF/MANIFEST.MF
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.catalina/META-INF/MANIFEST.MF
@@ -1,3 +1,3 @@
 Bundle-SymbolicName: org.argeo.slc.server.catalina
-Bundle-Version: 0.1.0
+Bundle-Version: 0.11.3.qualifier
 Fragment-Host: com.springsource.org.apache.catalina;bundle-version="[6.0.16,7.0.0)"
\ No newline at end of file

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/MANIFEST.MF
index 3612c0bf5660bc84239f3e754b731be5e8f81b2a..fab33ff0c54568e6bac5e620f6727a4478d5898b 100644 (file)
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/MANIFEST.MF
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Bundle-SymbolicName: org.argeo.slc.server.hibernate
-Bundle-Version: 0.1.0
+Bundle-Version: 0.11.3.qualifier
 Import-Package: 
  org.hibernate,
  org.springframework.orm.hibernate3,

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hsqldb/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hsqldb/META-INF/MANIFEST.MF
index f3bd1fe3e3982e2d2f93f20f8be4f494e835f426..138eb54d7e717a6a629def8b1e49365c14a195bf 100644 (file)
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hsqldb/META-INF/MANIFEST.MF
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hsqldb/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Bundle-SymbolicName: org.argeo.slc.server.hsqldb
-Bundle-Version: 0.1.0
+Bundle-Version: 0.11.3.qualifier
 Import-Package: 
  org.springframework.orm.hibernate3,
  org.springframework.cache.ehcache,

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.jms/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.jms/META-INF/MANIFEST.MF
index c58913c14ae116dd9f2da95872969be265b72bfa..888a64c399e23deeb29b7661a547765ec35ebdde 100644 (file)
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.jms/META-INF/MANIFEST.MF
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.jms/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Bundle-SymbolicName: org.argeo.slc.server.jms
-Bundle-Version: 0.1.0
+Bundle-Version: 0.11.3.qualifier
 Import-Package: javax.jms,
  javax.management.j2ee.statistics,
  org.apache.commons.logging

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/MANIFEST.MF
index 1e5e51a59e5e660a6d2cd1c30efc866c15a2141f..dec14f39e8da95fa5bbd7f1f34f134201dc460d6 100644 (file)
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/MANIFEST.MF
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Bundle-Name: SLC Server Services
 Bundle-SymbolicName: org.argeo.slc.server.services
-Bundle-Version: 1.0.0
+Bundle-Version: 0.11.3.qualifier
 Import-Package: org.hibernate.jdbc,
  org.springframework.transaction,
  org.springframework.aop,

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.tomcat/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.tomcat/META-INF/MANIFEST.MF
index db811a3e21dca1f87b2afd11818e1677be67760a..6f09b39cc0aae03538a2eed80a0016812d1329bb 100644 (file)
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.tomcat/META-INF/MANIFEST.MF
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.tomcat/META-INF/MANIFEST.MF
@@ -1,3 +1,3 @@
 Bundle-SymbolicName: org.argeo.slc.server.tomcat
-Bundle-Version: 0.1.0
+Bundle-Version: 0.11.3.qualifier
 Fragment-Host: org.argeo.dep.osgi.catalina.start
\ No newline at end of file

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF
index 719331cc66afb3373becb95ac2c61a7bd0020f3d..02af45540160effa495f3a388dd2a94bbf543599 100644 (file)
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Web-ContextPath: org.argeo.slc.webapp
 Bundle-Name: SLC Webapp
 Bundle-SymbolicName: org.argeo.slc.webapp
-Bundle-Version: 1.0.0
+Bundle-Version: 0.11.3.qualifier
 Bundle-ClassPath: WEB-INF/classes
 Import-Package: com.sun.xml.messaging.saaj.soap;optional=true,
  javax.servlet,
@@ -19,8 +19,8 @@ Import-Package: com.sun.xml.messaging.saaj.soap;optional=true,
  org.apache.taglibs.standard.tei,
  org.apache.taglibs.standard.tlv,
  org.hibernate,
- org.hibernate.jdbc,
  org.hibernate.hql.ast,
+ org.hibernate.jdbc,
  org.springframework.aop,
  org.springframework.aop.framework,
  org.springframework.orm.hibernate3.support,

diff --git a/server/org.argeo.slc.siteserver/bundles/pom-template.xml b/server/org.argeo.slc.siteserver/bundles/pom-template.xml
new file mode 100644 (file)
index 0000000..3991566
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/pom-template.xml
@@ -0,0 +1,26 @@
+<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>
+</project>
\ No newline at end of file

diff --git a/server/org.argeo.slc.siteserver/bundles/pom.xml b/server/org.argeo.slc.siteserver/bundles/pom.xml
new file mode 100644 (file)
index 0000000..486663e
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/pom.xml
@@ -0,0 +1,60 @@
+<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>org.argeo.slc.server.bundles</artifactId>
+       <packaging>pom</packaging>
+       <name>Argeo SLC Server Bundles</name>
+       <properties>
+       </properties>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.argeo.slc.maven</groupId>
+                               <artifactId>maven-argeo-osgi-plugin</artifactId>
+                               <version>0.1.1</version>
+                               <executions>
+                                       <execution>
+                                               <phase>package</phase>
+                                               <goals>
+                                                       <goal>simple-bundles</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <bundlesBase>.</bundlesBase>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
+                       <plugin>
+                               <artifactId>maven-invoker-plugin</artifactId>
+                               <version>1.3</version>
+                               <configuration>
+                                       <goals>
+                                               <goal>install</goal>
+                                       </goals>
+                                       <projectsDirectory>target/bundles</projectsDirectory>
+                                       <pomIncludes>
+                                               <pomInclude>pom.xml</pomInclude>
+                                       </pomIncludes>
+                               </configuration>
+                               <executions>
+                                       <execution>
+                                               <phase>package</phase>
+                                               <goals>
+                                                       <goal>run</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                       </plugin>
+
+               </plugins>
+       </build>
+       <dependencies>
+       </dependencies>
+</project>
\ No newline at end of file

diff --git a/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/META-INF/MANIFEST.MF
index a6623f905c5164bbd18d389c290a0e9d0327bcce..b0c882f943911fcb2e306d1fd32c7061db9c85aa 100644 (file)
--- a/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/META-INF/MANIFEST.MF
+++ b/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/META-INF/MANIFEST.MF
@@ -1,12 +1,7 @@
-Manifest-Version: 1.0\r
-Archiver-Version: Plexus Archiver\r
-Created-By: Apache Maven\r
-Built-By: mbaudier\r
-Build-Jdk: 1.6.0_0\r
 Web-ContextPath: simple-web-app\r
-Bundle-ManifestVersion: 2\r
 Bundle-Name: Simple OSGi War\r
 Bundle-SymbolicName: org.springframework.osgi.samples.simplewebapp\r
+Bundle-Version: 0.1.0.qualifier\r
 Bundle-ClassPath: WEB-INF/classes\r
 Import-Package: javax.servlet,javax.servlet.http,\r
  javax.servlet.resources,javax.servlet.jsp,\r

diff --git a/server/org.argeo.slc.siteserver/deploy/pom.xml b/server/org.argeo.slc.siteserver/deploy/pom.xml
new file mode 100644 (file)
index 0000000..ef8425d
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/deploy/pom.xml
@@ -0,0 +1,224 @@
+<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

diff --git a/server/org.argeo.slc.siteserver/pom.xml b/server/org.argeo.slc.siteserver/pom.xml
index 9999303d78ca2a218536da1faaf7364a630f6bea..c7b320f0f912c0c1720b24bcd0930542fe76ee5b 100644 (file)
--- a/server/org.argeo.slc.siteserver/pom.xml
+++ b/server/org.argeo.slc.siteserver/pom.xml
@@ -11,205 +11,13 @@
        <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.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>
+       <modules>
+               <module>bundles</module>
+               <module>deploy</module>
+       </modules>
        <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.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