X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=demo%2Fpom.xml;h=5017c3baf96cc2c2071676356f0da85353c5878d;hb=refs%2Ftags%2Fsvn%2Ftags%2Fargeo-slc-0.11.4;hp=27e7888d0c0b3df08b22024ab2689631e4becd5a;hpb=719f374a748e531ae706115252978e06ad72c308;p=gpl%2Fargeo-slc.git

diff --git a/demo/pom.xml b/demo/pom.xml
index 27e7888d0..5017c3baf 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -3,29 +3,26 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>argeo-slc</artifactId>
-		<version>0.11.4-SNAPSHOT</version>
+		<version>0.11.4</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>demo</artifactId>
 	<packaging>pom</packaging>
-	<name>Argeo SLC Demo Deploy</name>
+	<name>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>
 					</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>
@@ -69,12 +66,18 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.equinox</artifactId>
+			<artifactId>org.argeo.slc.osgiboot</artifactId>
 		</dependency>
+
+		<!--
+			Unit Tests -->
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.osgiboot</artifactId>
+			<artifactId>org.argeo.slc.unit</artifactId>
+			<scope>test</scope>
 		</dependency>
+
+
 	</dependencies>
 
 	<profiles>
@@ -83,29 +86,22 @@
 			<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}/../modules/server;in=*;ex=pom.xml;ex=target;ex=.*,
+									${basedir}/../modules/agent;in=*;ex=pom.xml;ex=target
+								</slc.osgi.bundles>
 							</systemProperties>
 						</configuration>
 					</plugin>
@@ -117,6 +113,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>
@@ -124,23 +124,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/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.jms
 								</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>
 							</systemProperties>
 						</configuration>
 					</plugin>
@@ -149,7 +147,92 @@
 			<dependencies>
 				<dependency>
 					<groupId>org.argeo.slc.dep</groupId>
-					<artifactId>org.argeo.slc.dep.server</artifactId>
+					<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>detached</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.argeo.maven.plugins</groupId>
+						<artifactId>maven-argeo-osgi-plugin</artifactId>
+						<configuration>
+							<execDir>target/exec/detached</execDir>
+							<fork>true</fork>
+							<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>
+							</systemProperties>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+			<dependencies>
+				<dependency>
+					<groupId>org.argeo.slc.dep</groupId>
+					<artifactId>org.argeo.slc.dep.detached</artifactId>
+					<version>${project.version}</version>
+				</dependency>
+				<dependency>
+					<groupId>net.sourceforge.mx4j</groupId>
+					<artifactId>com.springsource.mx4j</artifactId>
+				</dependency>
+				<dependency>
+					<groupId>org.eclipse.osgi</groupId>
+					<artifactId>org.eclipse.osgi</artifactId>
+					<version>3.5.0.v20090311-1300</version>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>standalone</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.argeo.maven.plugins</groupId>
+						<artifactId>maven-argeo-osgi-plugin</artifactId>
+						<configuration>
+							<execDir>target/exec/agent</execDir>
+							<systemProperties>
+								<slc.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>
+							</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>
@@ -159,7 +242,7 @@
 			<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>
@@ -194,6 +277,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>