X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=demo%2Fpom.xml;h=e0dcaf7d623ce39377260f115c27bab6bf58e80b;hb=9c82ed02a7ee7b4a757853d8160587b27e493f1a;hp=5a0198f4fa1963d1e0839521ab9a2552fd2352b2;hpb=27c92a7e65dc2d52426dd3cbf9030da42285e862;p=gpl%2Fargeo-slc.git

diff --git a/demo/pom.xml b/demo/pom.xml
index 5a0198f4f..e0dcaf7d6 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -1,4 +1,5 @@
-<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>
@@ -9,24 +10,20 @@
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>demo</artifactId>
 	<packaging>pom</packaging>
-	<name>Argeo SLC Demo Deploy</name>
+	<name>Argeo SLC Demo</name>
 	<modules>
 		<module>site</module>
 	</modules>
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.argeo.slc.maven</groupId>
+				<groupId>org.argeo.maven.plugins</groupId>
 				<artifactId>maven-argeo-osgi-plugin</artifactId>
 				<version>${version.maven-argeo-osgi}</version>
 				<configuration>
 					<argsToAppend>
 						<arg>-clean</arg>
-						<arg>-noExit</arg>
 					</argsToAppend>
-					<systemProperties>
-						<slc.osgi.bundles>${basedir}/site;in=*;ex=**/.svn/**,${basedir}/../server/org.argeo.slc.siteserver/bundles;in=*;ex=**/.svn/**</slc.osgi.bundles>
-					</systemProperties>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -70,11 +67,13 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.equinox</artifactId>
+			<artifactId>org.argeo.slc.osgiboot</artifactId>
 		</dependency>
+
 		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.osgiboot</artifactId>
+			<groupId>org.argeo.slc.dep</groupId>
+			<artifactId>org.argeo.slc.dep.agent</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
 
@@ -84,29 +83,21 @@
 			<build>
 				<plugins>
 					<plugin>
-						<groupId>org.argeo.slc.maven</groupId>
+						<groupId>org.argeo.maven.plugins</groupId>
 						<artifactId>maven-argeo-osgi-plugin</artifactId>
 						<configuration>
 							<execDir>target/exec/server</execDir>
-							<jvmArgs>
-								<jvmArg>-Xmx256m</jvmArg>
-							</jvmArgs>
-							<debug>0</debug>
 							<systemProperties>
 								<slc.osgi.start>
-									org.argeo.dep.osgi.catalina.start,
 									org.springframework.osgi.extender,
-									org.springframework.osgi.web.extender,
-									org.springframework.osgi.samples.simplewebapp,
-									org.argeo.slc.server.activemq,
 									org.argeo.slc.server.hsqldb,
-									org.argeo.slc.server.hibernate,
-									org.argeo.slc.server.services,
-									org.argeo.slc.server.jms,
-									org.argeo.slc.webapp,
+									org.argeo.slc.server.main,
 									org.argeo.slc.ria
 								</slc.osgi.start>
-								<!--  <slc.osgiboot.debug>true</slc.osgiboot.debug>-->
+								<slc.osgi.bundles>
+									${basedir}/site;in=*;ex=pom.xml;ex=target,
+									${basedir}/../server/org.argeo.slc.siteserver/bundles;in=*;ex=pom.xml;ex=target
+								</slc.osgi.bundles>
 							</systemProperties>
 						</configuration>
 					</plugin>
@@ -118,6 +109,10 @@
 					<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>
@@ -125,35 +120,44 @@
 			<build>
 				<plugins>
 					<plugin>
-						<groupId>org.argeo.slc.maven</groupId>
+						<groupId>org.argeo.maven.plugins</groupId>
 						<artifactId>maven-argeo-osgi-plugin</artifactId>
 						<configuration>
 							<execDir>target/exec/agent</execDir>
-							<jvmArgs>
-								<jvmArg>-Xmx128m</jvmArg>
-								<!--
-									<jvmArg>-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8001</jvmArg>
-								-->
-							</jvmArgs>
 							<systemProperties>
 								<slc.osgi.start>
 									org.springframework.osgi.extender,
 									org.argeo.slc.support.equinox,
-									org.argeo.slc.agent,
-									org.argeo.slc.demo.basic
+									org.argeo.slc.agent
 								</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
+								</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>server_mysql</id>
 			<build>
 				<plugins>
 					<plugin>
-						<groupId>org.argeo.slc.maven</groupId>
+						<groupId>org.argeo.maven.plugins</groupId>
 						<artifactId>maven-argeo-osgi-plugin</artifactId>
 						<configuration>
 							<execDir>target/exec/server</execDir>
@@ -188,6 +192,10 @@
 					<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>
 	</profiles>