X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=demo%2Fpom.xml;h=c152f29846ca2df9a43edfbec9b504d932612712;hb=91bc9fe34e8c4fa1cc20d6b85a2fbff031cba6d6;hp=5d3d567a697d207088c6c25ba5d3fea92a6d92fa;hpb=cb6c9116f75a6941f6f968bf2757260ae8a5dbda;p=gpl%2Fargeo-slc.git

diff --git a/demo/pom.xml b/demo/pom.xml
index 5d3d567a6..c152f2984 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.12.2-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>
@@ -26,58 +25,8 @@
 					</argsToAppend>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy-dependencies</id>
-						<phase>pre-integration-test</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<includeScope>compile</includeScope>
-							<includeTypes>jar</includeTypes>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<skipTests>true</skipTests>
-				</configuration>
-				<executions>
-					<execution>
-						<id>surefire-it</id>
-						<phase>integration-test</phase>
-						<goals>
-							<goal>test</goal>
-						</goals>
-						<configuration>
-							<skipTests>false</skipTests>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 	</build>
-	<dependencies>
-		<dependency>
-			<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>
 		<profile>
 			<id>server</id>
@@ -88,18 +37,45 @@
 						<artifactId>maven-argeo-osgi-plugin</artifactId>
 						<configuration>
 							<execDir>target/exec/server</execDir>
+							<systemPropertiesFile>server.properties</systemPropertiesFile>
 							<systemProperties>
-								<slc.osgi.start>
-									org.springframework.osgi.extender,
-									org.argeo.slc.server.hsqldb,
-									org.argeo.slc.server.main,
-									org.argeo.slc.ria
-								</slc.osgi.start>
-								<slc.osgi.bundles>
-									${user.home}/dev/src/sparta/dist/runtime/target;in=*.jar,
-									${basedir}/site;in=*;ex=pom.xml;ex=target,
-									${basedir}/../modules/server;in=*;ex=pom.xml;ex=target;ex=.*
-								</slc.osgi.bundles>
+								<log4j.configuration>file:${basedir}/log4j.properties</log4j.configuration>
+								<argeo.osgi.bundles>
+									${basedir}/../modules/server;in=*;ex=pom.xml;ex=target;ex=.*,
+								</argeo.osgi.bundles>
+							</systemProperties>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+			<dependencies>
+				<dependency>
+					<groupId>org.argeo.slc.dep</groupId>
+					<artifactId>org.argeo.slc.dep.server</artifactId>
+					<version>${project.version}</version>
+				</dependency>
+				<dependency>
+					<groupId>org.argeo.slc.server</groupId>
+					<artifactId>org.argeo.slc.ria</artifactId>
+				</dependency>
+
+			</dependencies>
+		</profile>
+		<profile>
+			<id>server_jcr</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.argeo.maven.plugins</groupId>
+						<artifactId>maven-argeo-osgi-plugin</artifactId>
+						<configuration>
+							<execDir>target/exec/server</execDir>
+							<systemPropertiesFile>server_jcr.properties</systemPropertiesFile>
+							<systemProperties>
+								<log4j.configuration>file:${basedir}/log4j.properties</log4j.configuration>
+								<argeo.osgi.bundles>
+									${basedir}/../modules/server;in=*;ex=pom.xml;ex=target;ex=.*,
+								</argeo.osgi.bundles>
 							</systemProperties>
 						</configuration>
 					</plugin>
@@ -115,6 +91,7 @@
 					<groupId>org.argeo.slc.server</groupId>
 					<artifactId>org.argeo.slc.ria</artifactId>
 				</dependency>
+
 			</dependencies>
 		</profile>
 		<profile>
@@ -126,17 +103,12 @@
 						<artifactId>maven-argeo-osgi-plugin</artifactId>
 						<configuration>
 							<execDir>target/exec/agent</execDir>
+							<systemPropertiesFile>agent.properties</systemPropertiesFile>
 							<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>
+								<argeo.osgi.bundles>
 									${basedir}/site;in=*;ex=pom.xml;ex=target,
 									${basedir}/../modules/agent;in=*;ex=pom.xml;ex=target
-								</slc.osgi.bundles>
+								</argeo.osgi.bundles>
 							</systemProperties>
 						</configuration>
 					</plugin>
@@ -149,33 +121,26 @@
 					<version>${project.version}</version>
 				</dependency>
 				<dependency>
-					<groupId>org.argeo.slc.runtime</groupId>
-					<artifactId>org.argeo.slc.support.ant</artifactId>
+					<groupId>org.argeo.slc.dep</groupId>
+					<artifactId>org.argeo.slc.dep.agent.extras</artifactId>
 					<version>${project.version}</version>
 				</dependency>
 			</dependencies>
 		</profile>
 		<profile>
-			<id>detached</id>
+			<id>slc_gis_position</id>
 			<build>
 				<plugins>
 					<plugin>
 						<groupId>org.argeo.maven.plugins</groupId>
 						<artifactId>maven-argeo-osgi-plugin</artifactId>
 						<configuration>
-							<execDir>target/exec/detached</execDir>
-							<fork>false</fork>
+							<execDir>target/exec/agent</execDir>
+							<systemPropertiesFile>slc_gis_position.properties</systemPropertiesFile>
 							<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>
+								<argeo.osgi.bundles>
+									${basedir}/../modules/gis;in=*;ex=pom.xml;ex=target
+								</argeo.osgi.bundles>
 							</systemProperties>
 						</configuration>
 					</plugin>
@@ -184,40 +149,32 @@
 			<dependencies>
 				<dependency>
 					<groupId>org.argeo.slc.dep</groupId>
-					<artifactId>org.argeo.slc.dep.detached</artifactId>
+					<artifactId>org.argeo.slc.dep.gis</artifactId>
 					<version>${project.version}</version>
 				</dependency>
-				<dependency>
-					<groupId>net.sourceforge.mx4j</groupId>
-					<artifactId>com.springsource.mx4j</artifactId>
-					<version>3.0.2</version>
-				</dependency>
-				<dependency>
-					<groupId>org.apache.xerces</groupId>
-					<artifactId>com.springsource.org.apache.xerces</artifactId>
-					<version>2.8.1</version>
-				</dependency>
 			</dependencies>
 		</profile>
 		<profile>
-			<id>standalone</id>
+			<id>detached</id>
 			<build>
 				<plugins>
 					<plugin>
 						<groupId>org.argeo.maven.plugins</groupId>
 						<artifactId>maven-argeo-osgi-plugin</artifactId>
 						<configuration>
-							<execDir>target/exec/agent</execDir>
+							<execDir>target/exec/detached</execDir>
+							<fork>true</fork>
 							<systemProperties>
-								<slc.osgi.start>
+								<argeo.osgi.start>
 									org.springframework.osgi.extender,
-									org.argeo.slc.support.equinox,
-									org.argeo.slc.agent
-								</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>
+									org.argeo.slc.detached,
+									org.argeo.slc.demo.det
+								</argeo.osgi.start>
+								<argeo.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,
+								</argeo.osgi.bundles>
+								<javax.xml.parsers.DocumentBuilderFactory>org.apache.xerces.jaxp.DocumentBuilderFactoryImpl</javax.xml.parsers.DocumentBuilderFactory>
 							</systemProperties>
 						</configuration>
 					</plugin>
@@ -226,13 +183,16 @@
 			<dependencies>
 				<dependency>
 					<groupId>org.argeo.slc.dep</groupId>
-					<artifactId>org.argeo.slc.dep.agent</artifactId>
+					<artifactId>org.argeo.slc.dep.detached</artifactId>
 					<version>${project.version}</version>
 				</dependency>
 				<dependency>
-					<groupId>org.argeo.slc.runtime</groupId>
-					<artifactId>org.argeo.slc.support.ant</artifactId>
-					<version>${project.version}</version>
+					<groupId>net.sourceforge.mx4j</groupId>
+					<artifactId>com.springsource.mx4j</artifactId>
+				</dependency>
+				<dependency>
+					<groupId>org.eclipse.osgi</groupId>
+					<artifactId>org.eclipse.osgi</artifactId>
 				</dependency>
 			</dependencies>
 		</profile>
@@ -252,7 +212,7 @@
 								-->
 							</jvmArgs>
 							<systemProperties>
-								<slc.osgi.start>
+								<argeo.osgi.start>
 									org.argeo.dep.osgi.catalina.start,
 									org.springframework.osgi.extender,
 									org.springframework.osgi.web.extender,
@@ -264,7 +224,7 @@
 									org.argeo.slc.server.jms,
 									org.argeo.slc.webapp,
 									org.argeo.slc.ria
-								</slc.osgi.start>
+								</argeo.osgi.start>
 							</systemProperties>
 						</configuration>
 					</plugin>
@@ -273,7 +233,6 @@
 			<dependencies>
 				<dependency>
 					<groupId>org.argeo.slc.dep</groupId>
-					<artifactId>org.argeo.slc.dep.server</artifactId>
 					<version>${project.version}</version>
 				</dependency>
 				<dependency>