X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=demo%2Fpom.xml;h=27e7888d0c0b3df08b22024ab2689631e4becd5a;hb=719f374a748e531ae706115252978e06ad72c308;hp=6f1eeaea0176556c22027e3d81fc3d81d18e5387;hpb=c7283f211f9a72d5dcfd0a7e1c55209a489882b6;p=gpl%2Fargeo-slc.git

diff --git a/demo/pom.xml b/demo/pom.xml
index 6f1eeaea0..27e7888d0 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -1,14 +1,13 @@
-<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>
 		<artifactId>argeo-slc</artifactId>
-		<version>0.11.3-SNAPSHOT</version>
-		<relativePath>../org.argeo.slc</relativePath>
+		<version>0.11.4-SNAPSHOT</version>
+		<relativePath>..</relativePath>
 	</parent>
-	<groupId>org.argeo.slc.demo</groupId>
-	<artifactId>deploy</artifactId>
+	<groupId>org.argeo.slc</groupId>
+	<artifactId>demo</artifactId>
 	<packaging>pom</packaging>
 	<name>Argeo SLC Demo Deploy</name>
 	<modules>
@@ -19,12 +18,52 @@
 			<plugin>
 				<groupId>org.argeo.slc.maven</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/**</slc.osgi.bundles>
+						<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>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>pre-integration-test</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<includeScope>compile</includeScope>
+							<includeTypes>jar</includeTypes>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<skipTests>true</skipTests>
+				</configuration>
+				<executions>
+					<execution>
+						<id>surefire-it</id>
+						<phase>integration-test</phase>
+						<goals>
+							<goal>test</goal>
+						</goals>
+						<configuration>
+							<skipTests>false</skipTests>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 	<dependencies>
@@ -35,14 +74,6 @@
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.osgiboot</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<!--  Server -->
-		<dependency>
-			<groupId>org.argeo.slc.server</groupId>
-			<artifactId>bundles</artifactId>
-			<version>${project.version}</version>
-			<type>pom</type>
 		</dependency>
 	</dependencies>
 
@@ -58,10 +89,8 @@
 							<execDir>target/exec/server</execDir>
 							<jvmArgs>
 								<jvmArg>-Xmx256m</jvmArg>
-								<!--
-									<jvmArg>-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000</jvmArg>
-								-->
 							</jvmArgs>
+							<debug>0</debug>
 							<systemProperties>
 								<slc.osgi.start>
 									org.argeo.dep.osgi.catalina.start,
@@ -74,16 +103,21 @@
 									org.argeo.slc.server.services,
 									org.argeo.slc.server.jms,
 									org.argeo.slc.webapp,
-									org.argeo.slc.ria,
-									org.argeo.slc.support.equinox,
-									org.argeo.slc.demo.basic,
-									org.argeo.slc.demo.manager
+									org.argeo.slc.ria
 								</slc.osgi.start>
+								<!--  <slc.osgiboot.debug>true</slc.osgiboot.debug>-->
 							</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>
+			</dependencies>
 		</profile>
 		<profile>
 			<id>agent</id>
@@ -94,19 +128,73 @@
 						<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.demo.basic,
-									org.argeo.slc.demo.agent,
-									org.argeo.slc.demo.manager
+									org.argeo.slc.agent,
+									org.argeo.slc.demo.basic
+								</slc.osgi.start>
+							</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>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>server_mysql</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.argeo.slc.maven</groupId>
+						<artifactId>maven-argeo-osgi-plugin</artifactId>
+						<configuration>
+							<execDir>target/exec/server</execDir>
+							<jvmArgs>
+								<jvmArg>-Xmx256m</jvmArg>
+								<!--
+									<jvmArg>-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000</jvmArg>
+								-->
+							</jvmArgs>
+							<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.mysql,
+									org.argeo.slc.server.hibernate,
+									org.argeo.slc.server.services,
+									org.argeo.slc.server.jms,
+									org.argeo.slc.webapp,
+									org.argeo.slc.ria
 								</slc.osgi.start>
 							</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>
+			</dependencies>
 		</profile>
 	</profiles>
 </project>