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

diff --git a/demo/pom.xml b/demo/pom.xml
index 37ab5507c..b3aa65175 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>1.1.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
@@ -11,14 +11,13 @@
 	<packaging>pom</packaging>
 	<name>SLC Demo</name>
 	<modules>
-		<module>site</module>
+		<module>modules</module>
 	</modules>
 	<build>
 		<plugins>
 			<plugin>
 				<groupId>org.argeo.maven.plugins</groupId>
 				<artifactId>maven-argeo-osgi-plugin</artifactId>
-				<version>${version.maven-argeo-osgi}</version>
 				<configuration>
 					<argsToAppend>
 						<arg>-clean</arg>
@@ -39,10 +38,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>
@@ -53,7 +51,7 @@
 				<dependency>
 					<groupId>org.argeo.slc.dep</groupId>
 					<artifactId>org.argeo.slc.dep.server</artifactId>
-					<version>${project.version}</version>
+					<version>${version.slc}</version>
 				</dependency>
 				<dependency>
 					<groupId>org.argeo.slc.server</groupId>
@@ -73,10 +71,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>
@@ -87,7 +84,7 @@
 				<dependency>
 					<groupId>org.argeo.slc.dep</groupId>
 					<artifactId>org.argeo.slc.dep.server</artifactId>
-					<version>${project.version}</version>
+					<version>${version.slc}</version>
 				</dependency>
 				<dependency>
 					<groupId>org.argeo.slc.server</groupId>
@@ -120,7 +117,12 @@
 				<dependency>
 					<groupId>org.argeo.slc.dep</groupId>
 					<artifactId>org.argeo.slc.dep.agent</artifactId>
-					<version>${project.version}</version>
+					<version>${version.slc}</version>
+				</dependency>
+				<dependency>
+					<groupId>org.argeo.slc.dep</groupId>
+					<artifactId>org.argeo.slc.dep.agent.extras</artifactId>
+					<version>${version.slc}</version>
 				</dependency>
 			</dependencies>
 		</profile>
@@ -136,7 +138,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,8 +148,8 @@
 			<dependencies>
 				<dependency>
 					<groupId>org.argeo.slc.dep</groupId>
-					<artifactId>org.argeo.slc.dep.sdk</artifactId>
-					<version>${project.version}</version>
+					<artifactId>org.argeo.slc.dep.gis</artifactId>
+					<version>${version.slc}</version>
 				</dependency>
 			</dependencies>
 		</profile>
@@ -182,7 +183,7 @@
 				<dependency>
 					<groupId>org.argeo.slc.dep</groupId>
 					<artifactId>org.argeo.slc.dep.detached</artifactId>
-					<version>${project.version}</version>
+					<version>${version.slc}</version>
 				</dependency>
 				<dependency>
 					<groupId>net.sourceforge.mx4j</groupId>
@@ -231,8 +232,7 @@
 			<dependencies>
 				<dependency>
 					<groupId>org.argeo.slc.dep</groupId>
-					<artifactId>org.argeo.slc.dep.server</artifactId>
-					<version>${project.version}</version>
+					<version>${version.slc}</version>
 				</dependency>
 				<dependency>
 					<groupId>org.argeo.slc.server</groupId>