X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=demo%2Fpom.xml;h=e57171339ef1798af43e56da6867929c94e72155;hb=5d91de89b70a4ba96cd4d37c4fcc991118faf685;hp=2fad017961e6c7c60883fb9331985bbf7de00295;hpb=0ebe6753b6569ff52b4ba86cd61c6e08a19e0c5f;p=gpl%2Fargeo-slc.git

diff --git a/demo/pom.xml b/demo/pom.xml
index 2fad01796..e57171339 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>argeo-slc</artifactId>
-		<version>0.12.2-SNAPSHOT</version>
+		<version>0.13.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
@@ -37,19 +37,44 @@
 						<artifactId>maven-argeo-osgi-plugin</artifactId>
 						<configuration>
 							<execDir>target/exec/server</execDir>
+							<systemPropertiesFile>server.properties</systemPropertiesFile>
 							<systemProperties>
-								<argeo.osgi.start>
-									org.springframework.osgi.extender,
-									org.argeo.server.ads.server,
-									org.argeo.slc.server.hsqldb,
-									org.argeo.slc.server.hibernate,
-									org.argeo.slc.server.main,
-									org.argeo.slc.ria
-								</argeo.osgi.start>
+								<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}/site;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
 								</argeo.osgi.bundles>
 							</systemProperties>
 						</configuration>
@@ -78,13 +103,8 @@
 						<artifactId>maven-argeo-osgi-plugin</artifactId>
 						<configuration>
 							<execDir>target/exec/agent</execDir>
+							<systemPropertiesFile>agent.properties</systemPropertiesFile>
 							<systemProperties>
-								<argeo.osgi.start>
-									org.springframework.osgi.extender,
-									org.argeo.slc.support.equinox,
-									org.argeo.slc.agent,
-									org.argeo.slc.agent.jms
-								</argeo.osgi.start>
 								<argeo.osgi.bundles>
 									${basedir}/site;in=*;ex=pom.xml;ex=target,
 									${basedir}/../modules/agent;in=*;ex=pom.xml;ex=target
@@ -100,6 +120,38 @@
 					<artifactId>org.argeo.slc.dep.agent</artifactId>
 					<version>${project.version}</version>
 				</dependency>
+				<dependency>
+					<groupId>org.argeo.slc.dep</groupId>
+					<artifactId>org.argeo.slc.dep.agent.extras</artifactId>
+					<version>${project.version}</version>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>slc_gis_position</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.argeo.maven.plugins</groupId>
+						<artifactId>maven-argeo-osgi-plugin</artifactId>
+						<configuration>
+							<execDir>target/exec/agent</execDir>
+							<systemPropertiesFile>slc_gis_position.properties</systemPropertiesFile>
+							<systemProperties>
+								<argeo.osgi.bundles>
+									${basedir}/../modules/gis;in=*;ex=pom.xml;ex=target
+								</argeo.osgi.bundles>
+							</systemProperties>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+			<dependencies>
+				<dependency>
+					<groupId>org.argeo.slc.dep</groupId>
+					<artifactId>org.argeo.slc.dep.gis</artifactId>
+					<version>${project.version}</version>
+				</dependency>
 			</dependencies>
 		</profile>
 		<profile>
@@ -181,7 +233,6 @@
 			<dependencies>
 				<dependency>
 					<groupId>org.argeo.slc.dep</groupId>
-					<artifactId>org.argeo.slc.dep.server</artifactId>
 					<version>${project.version}</version>
 				</dependency>
 				<dependency>