X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=demo%2Fpom.xml;h=71be268c1d29b390b0a2ea5ef4e1bd7328264e6f;hb=a91feabac0f3f603a73936b4447599402fba71d0;hp=6103ddaadd6618b7a7291cf508b82a560a3d9847;hpb=99333a1d7cad2883616c63059bd360fb91916742;p=gpl%2Fargeo-slc.git

diff --git a/demo/pom.xml b/demo/pom.xml
index 6103ddaad..71be268c1 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -4,84 +4,209 @@
 	<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>
-	<artifactId>argeo-slc-demo</artifactId>
+	<groupId>org.argeo.slc</groupId>
+	<artifactId>demo</artifactId>
 	<packaging>pom</packaging>
 	<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>0.1.6-SNAPSHOT</version>
+				<version>${version.maven-argeo-osgi}</version>
 				<configuration>
-					<execDir>exec/server</execDir>
-					<jvmArgs>
-						<jvmArg>-Xmx256m</jvmArg>
-						<!-- <jvmArg>-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000</jvmArg> -->
-					</jvmArgs>
-					<systemProperties>
-						<slc.osgi.bundles>../../site;in=*</slc.osgi.bundles>
-						<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,
-							org.argeo.slc.support.equinox,
-							org.argeo.slc.demo.basic,
-							org.argeo.slc.demo.manager
-						</slc.osgi.start>
-					</systemProperties>
+					<argsToAppend>
+						<arg>-clean</arg>
+					</argsToAppend>
 				</configuration>
 			</plugin>
-			<!--
-				<plugin> <artifactId>maven-dependency-plugin</artifactId>
-				<executions> <execution> <goals> <goal>copy-dependencies</goal>
-				</goals> <phase>initialize</phase> <configuration>
-				<outputDirectory>lib</outputDirectory>
-				<includeTypes>jar</includeTypes> </configuration> </execution>
-				</executions> </plugin> <plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>exec-maven-plugin</artifactId> <version>1.1</version>
-				<configuration> <executable>java</executable>
-				<workingDirectory>exec/server</workingDirectory> <arguments>
-				<argument>-Dmyproperty=myvalue</argument> <argument>-jar</argument>
-				<argument>../../lib/org.eclipse.osgi-3.4.2.R34x_v20080826-1230.jar</argument>
-				<argument>-clean</argument> <argument>-console</argument>
-				<argument>-configuration</argument> <argument>conf</argument>
-				</arguments> </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>
+			<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>
-		<!--  Server -->
+
+		<!-- Unit Tests -->
 		<dependency>
-			<groupId>org.argeo.slc.server</groupId>
-			<artifactId>bundles</artifactId>
-			<version>${project.version}</version>
-			<type>pom</type>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.unit</artifactId>
+			<scope>test</scope>
 		</dependency>
-	</dependencies>
 
+	</dependencies>
 
+	<profiles>
+		<profile>
+			<id>server</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.argeo.maven.plugins</groupId>
+						<artifactId>maven-argeo-osgi-plugin</artifactId>
+						<configuration>
+							<execDir>target/exec/server</execDir>
+							<systemProperties>
+								<slc.osgi.start>
+									org.springframework.osgi.extender,
+									org.argeo.slc.server.hsqldb,
+									org.argeo.slc.server.main,
+									org.argeo.slc.ria
+								</slc.osgi.start>
+								<slc.osgi.bundles>
+									${user.home}/dev/src/sparta/dist/runtime/target;in=*.jar,
+									${basedir}/site;in=*;ex=pom.xml;ex=target,
+									${basedir}/../modules/server;in=*;ex=pom.xml;ex=target;ex=.*
+								</slc.osgi.bundles>
+							</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>
+				<dependency>
+					<groupId>org.argeo.slc.server</groupId>
+					<artifactId>org.argeo.slc.ria</artifactId>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>agent</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,
+									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>
+				</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.maven.plugins</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>
+				<dependency>
+					<groupId>org.argeo.slc.server</groupId>
+					<artifactId>org.argeo.slc.ria</artifactId>
+				</dependency>
+			</dependencies>
+		</profile>
+	</profiles>
 </project>