X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=demo%2Fpom.xml;h=ad45b4e57990b3f379a346753fd0a631eb7dcb08;hb=refs%2Ftags%2Fsvn%2Ftags%2Fargeo-slc-0.13.0;hp=37ab5507c4acb171a8a2eeca28880586753b3a54;hpb=77c154bbed62738179f6c710a7734a008a8d9798;p=gpl%2Fargeo-slc.git

diff --git a/demo/pom.xml b/demo/pom.xml
index 37ab5507c..ad45b4e57 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</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
@@ -39,10 +39,9 @@
 							<execDir>target/exec/server</execDir>
 							<systemPropertiesFile>server.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>
@@ -73,10 +72,9 @@
 							<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>
@@ -122,6 +120,11 @@
 					<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>
@@ -136,7 +139,6 @@
 							<systemPropertiesFile>slc_gis_position.properties</systemPropertiesFile>
 							<systemProperties>
 								<argeo.osgi.bundles>
-									${basedir}/site;in=*;ex=pom.xml;ex=target,
 									${basedir}/../modules/gis;in=*;ex=pom.xml;ex=target
 								</argeo.osgi.bundles>
 							</systemProperties>
@@ -147,7 +149,7 @@
 			<dependencies>
 				<dependency>
 					<groupId>org.argeo.slc.dep</groupId>
-					<artifactId>org.argeo.slc.dep.sdk</artifactId>
+					<artifactId>org.argeo.slc.dep.gis</artifactId>
 					<version>${project.version}</version>
 				</dependency>
 			</dependencies>
@@ -231,7 +233,6 @@
 			<dependencies>
 				<dependency>
 					<groupId>org.argeo.slc.dep</groupId>
-					<artifactId>org.argeo.slc.dep.server</artifactId>
 					<version>${project.version}</version>
 				</dependency>
 				<dependency>