From 1fc8c37920ec6054ed5b63b2936cf4c8b62b041e Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 26 Jun 2009 12:50:10 +0000
Subject: [PATCH 1/1] Move server modules

git-svn-id: https://svn.argeo.org/slc/trunk@2603 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 dep/org.argeo.slc.dep.server/pom.xml          |  2 +-
 .../org.argeo.slc.it.webapp/pom.xml           |  9 ++++----
 modules/agent/pom.xml                         |  1 +
 modules/server/pom.xml                        |  1 +
 pom.xml                                       |  2 +-
 server/pom.xml                                |  1 -
 src/site/site.xml                             | 21 ++++++++++---------
 7 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/dep/org.argeo.slc.dep.server/pom.xml b/dep/org.argeo.slc.dep.server/pom.xml
index 4e1453b12..9f062156d 100644
--- 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 c589eb1ae..c6d1279dd 100644
--- 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 6c16c62d6..b060ee114 100644
--- 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 cc118d09d..534ae5376 100644
--- 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 becb45a8c..6a6346d2c 100644
--- 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 16b288390..0bc523e92 100644
--- 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 88f8bcab3..5267df93e 100644
--- 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>
 
-- 
2.39.2