Move server modules

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

diff --git a/dep/org.argeo.slc.dep.server/pom.xml b/dep/org.argeo.slc.dep.server/pom.xml
index 4e1453b12c30065d7570e38640f54101e6b900c2..9f062156d7893a8751fc5c6a5248d741014761bf 100644 (file)
--- a/dep/org.argeo.slc.dep.server/pom.xml
+++ b/dep/org.argeo.slc.dep.server/pom.xml
@@ -92,7 +92,7 @@
 
                <!-- Tomcat -->
                <dependency>
-                       <groupId>org.argeo.slc.dep.osgi</groupId>
+                       <groupId>org.argeo.dep.osgi</groupId>
                        <artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
                </dependency>
                <dependency>

diff --git a/integration-tests/org.argeo.slc.it.webapp/pom.xml b/integration-tests/org.argeo.slc.it.webapp/pom.xml
index c589eb1ae26a3f96effb6f2d9109d1c851ffbf7c..c6d1279dd74d7eb7dc9dd7754c3dfe8d1fe95a1e 100644 (file)
--- a/integration-tests/org.argeo.slc.it.webapp/pom.xml
+++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml
@@ -22,16 +22,17 @@
                                        </argsToAppend>
                                        <systemProperties>
                                                <slc.osgi.bundles>
-                                                       ${basedir}/../../demo/site;in=*;ex=target,ex=pom.xml,
-                                                       ${basedir}/../../modules/server;in=*;ex=target,ex=pom.xml,
-                                                       ${basedir}/../../modules/agent;in=*;ex=target,ex=pom.xml
+                                                       ${basedir}/../../demo/site;in=*;ex=target;ex=pom.xml,
+                                                       ${basedir}/../../modules/server;in=*;ex=target;ex=pom.xml,
+                                                       ${basedir}/../../modules/agent;in=*;ex=target;ex=pom.xml
                                                </slc.osgi.bundles>
                                                <slc.osgi.start>
                                                        org.springframework.osgi.extender,
                                                        org.argeo.slc.server.main,
                                                        org.argeo.slc.server.hsqldb,
                                                        org.argeo.slc.ria,
-                                                       org.argeo.slc.agent                                                             
+                                                       org.argeo.slc.agent,                                                            
+                                                       org.argeo.slc.agent.jms                                                 
                                                </slc.osgi.start>
                                        </systemProperties>
                                </configuration>

diff --git a/modules/agent/pom.xml b/modules/agent/pom.xml
index 6c16c62d6a1356aa303f8e10309bf63850513ad9..b060ee1145a37543f54fc8df8027dcea88c0e886 100644 (file)
--- a/modules/agent/pom.xml
+++ b/modules/agent/pom.xml
@@ -18,6 +18,7 @@
                                <extensions>true</extensions>
                                <configuration>
                                        <strictManifestVersion>true</strictManifestVersion>
+                                       <bundlesPomArtifactId>org.argeo.slc.modules.agent.bundles</bundlesPomArtifactId>
                                </configuration>
                        </plugin>
                </plugins>

diff --git a/modules/server/pom.xml b/modules/server/pom.xml
index cc118d09d8cb3c10c7a1acd168b1fb20b070f5ad..534ae5376ecd6c330da87d1faa8c1a1bfce69874 100644 (file)
--- a/modules/server/pom.xml
+++ b/modules/server/pom.xml
@@ -18,6 +18,7 @@
                                <extensions>true</extensions>
                                <configuration>
                                        <strictManifestVersion>true</strictManifestVersion>
+                                       <bundlesPomArtifactId>org.argeo.slc.modules.server.bundles</bundlesPomArtifactId>
                                </configuration>
                        </plugin>
                </plugins>

diff --git a/pom.xml b/pom.xml
index becb45a8c6bfbb3fda206f35ef213d62f1876632..6a6346d2c89424a2deb2707a36cf990f6699ac93 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -492,7 +492,7 @@ limitations under the License.
                                <version>${version.spring-osgi}</version>
                        </dependency>
                        <dependency>
-                               <groupId>org.argeo.slc.dep.osgi</groupId>
+                               <groupId>org.argeo.dep.osgi</groupId>
                                <artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
                                <version>1.0.0.argeo4</version>
                        </dependency>

diff --git a/server/pom.xml b/server/pom.xml
index 16b288390ca5c5b12bb14306a55086023de5234c..0bc523e9283c98522bf059ec07d2f57b3c5ec9fc 100644 (file)
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -11,7 +11,6 @@
        <packaging>pom</packaging>
        <name>Argeo SLC Server</name>
        <modules>
-               <module>org.argeo.slc.siteserver</module>
        </modules>
        <profiles>
                <profile>

diff --git a/src/site/site.xml b/src/site/site.xml
index 88f8bcab3dccda89afa1c7f8030efb1398946673..5267df93eaf914ee23d6105f1c3f9693a166b0fd 100644 (file)
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -2,27 +2,23 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
        <version />
-       <publishDate format="yyyy-MM-dd HH:mm"/>
+       <publishDate format="yyyy-MM-dd HH:mm" />
        <body>
                <menu name="Overview">
                        <item name="Home" href="${project.url}/index.html" />
                        <item name="Getting Started" href="${project.url}/gettingStarted.html" />
                        <item name="FAQ" href="${project.url}/faq.html" />
                        <item name="Runtime" href="${project.url}/runtime/index.html">
-                               <item name="API (Javadoc)"
-                                       href="${project.url}/apidocs/index.html" />
-                               <item name="Code"
-                                       href="${project.url}/xref/index.html" />
-                               <item name="Unit Tests Results"
-                                       href="${project.url}/surefire-report.html" />
+                               <item name="API (Javadoc)" href="${project.url}/apidocs/index.html" />
+                               <item name="Code" href="${project.url}/xref/index.html" />
+                               <item name="Unit Tests Results" href="${project.url}/surefire-report.html" />
                        </item>
                        <item name="How-To">
                                <item name="Execution Resources"
                                        href="${project.url}/howtos/howto-executionResources.html" />
-                               <item name="Attachments"
-                                       href="${project.url}/howtos/howto-attachments.html" />
+                               <item name="Attachments" href="${project.url}/howtos/howto-attachments.html" />
                        </item>
-                       <item name="Argeo RIA (Web UI)"  href="${project.url}/server/org.argeo.slc.ria/index.html">
+                       <item name="Argeo RIA (Web UI)" href="${project.url}/server/org.argeo.slc.ria/index.html">
                                <item name="API"
                                        href="${project.url}/server/org.argeo.slc.ria/argeo-ria-api/index.html" />
                                <item name="Browser Support"
@@ -37,5 +33,10 @@
                <logo name="Maven" href="http://maven.apache.org/"
                        img="http://maven.apache.org/images/logos/maven-feather.png" />
        </poweredBy>
+       <skin>
+               <groupId>org.apache.maven.skins</groupId>
+               <artifactId>maven-default-skin</artifactId>
+               <version>1.0</version>
+       </skin>
 </project>