X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=demo%2Fpom.xml;h=5e99953b4bde0643908da0c4748f7923c72ffb8c;hb=006e9a660a4edb4b3815f5a96e4366f80dbcc3ea;hp=684466dbff1bab3c5b6edccb87599bdb742b9498;hpb=05a94c0b56e68b90f527b903a1e669b7b3f70e9a;p=gpl%2Fargeo-slc.git

diff --git a/demo/pom.xml b/demo/pom.xml
index 684466dbf..5e99953b4 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -1,16 +1,15 @@
-<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>
 		<artifactId>argeo-slc</artifactId>
-		<version>0.11.4-SNAPSHOT</version>
+		<version>0.11.5-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>demo</artifactId>
 	<packaging>pom</packaging>
-	<name>Argeo SLC Demo</name>
+	<name>SLC Demo</name>
 	<modules>
 		<module>site</module>
 	</modules>
@@ -69,6 +68,16 @@
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.osgiboot</artifactId>
 		</dependency>
+
+		<!--
+			Unit Tests -->
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.unit</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+
 	</dependencies>
 
 	<profiles>
@@ -90,7 +99,8 @@
 								</slc.osgi.start>
 								<slc.osgi.bundles>
 									${basedir}/site;in=*;ex=pom.xml;ex=target,
-									${basedir}/../server/org.argeo.slc.siteserver/bundles;in=*;ex=pom.xml;ex=target
+									${basedir}/../modules/server;in=*;ex=pom.xml;ex=target;ex=.*,
+									${basedir}/../modules/agent;in=*;ex=pom.xml;ex=target
 								</slc.osgi.bundles>
 							</systemProperties>
 						</configuration>
@@ -111,6 +121,87 @@
 		</profile>
 		<profile>
 			<id>agent</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.argeo.maven.plugins</groupId>
+						<artifactId>maven-argeo-osgi-plugin</artifactId>
+						<configuration>
+							<execDir>target/exec/agent</execDir>
+							<systemProperties>
+								<slc.osgi.start>
+									org.springframework.osgi.extender,
+									org.argeo.slc.support.equinox,
+									org.argeo.slc.agent,
+									org.argeo.slc.agent.jms
+								</slc.osgi.start>
+								<slc.osgi.bundles>
+									${basedir}/site;in=*;ex=pom.xml;ex=target,
+									${basedir}/../modules/agent;in=*;ex=pom.xml;ex=target
+								</slc.osgi.bundles>
+							</systemProperties>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+			<dependencies>
+				<dependency>
+					<groupId>org.argeo.slc.dep</groupId>
+					<artifactId>org.argeo.slc.dep.agent</artifactId>
+					<version>${project.version}</version>
+				</dependency>
+				<dependency>
+					<groupId>org.argeo.slc.runtime</groupId>
+					<artifactId>org.argeo.slc.support.ant</artifactId>
+					<version>${project.version}</version>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>detached</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.argeo.maven.plugins</groupId>
+						<artifactId>maven-argeo-osgi-plugin</artifactId>
+						<configuration>
+							<execDir>target/exec/detached</execDir>
+							<fork>true</fork>
+							<systemProperties>
+								<slc.osgi.start>
+									org.springframework.osgi.extender,
+									org.argeo.slc.detached,
+									org.argeo.slc.demo.det
+								</slc.osgi.start>
+								<slc.osgi.bundles>
+									${basedir}/site;in=org.argeo.slc.demo.det;ex=pom.xml;ex=target,
+									${basedir}/site;in=org.argeo.slc.demo.log4j;ex=pom.xml;ex=target,
+								</slc.osgi.bundles>
+								<javax.xml.parsers.DocumentBuilderFactory>org.apache.xerces.jaxp.DocumentBuilderFactoryImpl</javax.xml.parsers.DocumentBuilderFactory>
+							</systemProperties>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+			<dependencies>
+				<dependency>
+					<groupId>org.argeo.slc.dep</groupId>
+					<artifactId>org.argeo.slc.dep.detached</artifactId>
+					<version>${project.version}</version>
+				</dependency>
+				<dependency>
+					<groupId>net.sourceforge.mx4j</groupId>
+					<artifactId>com.springsource.mx4j</artifactId>
+				</dependency>
+				<dependency>
+					<groupId>org.eclipse.osgi</groupId>
+					<artifactId>org.eclipse.osgi</artifactId>
+					<version>3.5.0.v20090311-1300</version>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>standalone</id>
 			<build>
 				<plugins>
 					<plugin>
@@ -126,7 +217,7 @@
 								</slc.osgi.start>
 								<slc.osgi.bundles>
 									${basedir}/site;in=*;ex=pom.xml;ex=target,
-									${basedir}/../server/org.argeo.slc.siteserver/bundles;in=org.argeo.slc.agent;ex=pom.xml;ex=target
+									${basedir}/../modules/agent;in=*;ex=pom.xml;ex=target
 								</slc.osgi.bundles>
 							</systemProperties>
 						</configuration>
@@ -139,6 +230,11 @@
 					<artifactId>org.argeo.slc.dep.agent</artifactId>
 					<version>${project.version}</version>
 				</dependency>
+				<dependency>
+					<groupId>org.argeo.slc.runtime</groupId>
+					<artifactId>org.argeo.slc.support.ant</artifactId>
+					<version>${project.version}</version>
+				</dependency>
 			</dependencies>
 		</profile>
 		<profile>