X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=demo%2Fpom.xml;h=169a343a527bf4ecfb639c10fe55b81b2387290a;hb=7186b3cd27177184333e9cdd01b9cc1b08f44bb1;hp=475b720c53451d811076f1d92e827d967fd15ebc;hpb=a1b71d4abc3b36d052d827e9356a3f9ba4c5cf6d;p=gpl%2Fargeo-slc.git

diff --git a/demo/pom.xml b/demo/pom.xml
index 475b720c5..169a343a5 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -1,199 +1,15 @@
-<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>1.1.7-SNAPSHOT</version>
+		<relativePath>..</relativePath>
 	</parent>
-	<groupId>org.argeo.slc.demo</groupId>
-	<artifactId>deploy</artifactId>
+	<artifactId>demo</artifactId>
 	<packaging>pom</packaging>
-	<name>Argeo SLC Demo Deploy</name>
+	<name>SLC Demo</name>
 	<modules>
-		<module>site</module>
+		<module>modules</module>
 	</modules>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.argeo.slc.maven</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>
-				<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>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.equinox</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.osgiboot</artifactId>
-		</dependency>
-
-		<!--  TESTS -->
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.equinox</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.osgiboot</artifactId>
-		</dependency>
-	</dependencies>
-
-	<profiles>
-		<profile>
-			<id>server</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>
-							</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.ria
-								</slc.osgi.start>
-								<!--  <slc.osgiboot.debug>true</slc.osgiboot.debug>-->
-							</systemProperties>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-			<dependencies>
-				<!--  Server -->
-				<dependency>
-					<groupId>org.argeo.slc.server</groupId>
-					<artifactId>deploy</artifactId>
-					<type>pom</type>
-				</dependency>
-			</dependencies>
-		</profile>
-		<profile>
-			<id>agent</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.argeo.slc.maven</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
-								</slc.osgi.start>
-							</systemProperties>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</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>
-		</profile>
-	</profiles>
 </project>