X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=demo%2Fpom.xml;h=09b674427d7b2ce8e8cb03ac277f2711be9f115c;hb=0365e07ac2c9c55c1c5e3a43392f4809b539a150;hp=b0c9b2f6d44f3d508464fd591ae924887fb3d59c;hpb=729132de150d9a23fa15d8dab345724530bffc29;p=gpl%2Fargeo-slc.git

diff --git a/demo/pom.xml b/demo/pom.xml
index b0c9b2f6d..09b674427 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -1,87 +1,193 @@
-<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.12.1</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>
+	<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>0.1.6</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>
-			-->
-
 		</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>
-			<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>
-
+	<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>
+								<argeo.osgi.start>
+									org.springframework.osgi.extender,
+									org.argeo.server.ads.server,
+									org.argeo.slc.server.hsqldb,
+									org.argeo.slc.server.main,
+									org.argeo.slc.ria
+								</argeo.osgi.start>
+								<argeo.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
+								</argeo.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>
+								<argeo.osgi.start>
+									org.springframework.osgi.extender,
+									org.argeo.slc.support.equinox,
+									org.argeo.slc.agent,
+									org.argeo.slc.agent.jms
+								</argeo.osgi.start>
+								<argeo.osgi.bundles>
+									${basedir}/site;in=*;ex=pom.xml;ex=target,
+									${basedir}/../modules/agent;in=*;ex=pom.xml;ex=target
+								</argeo.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>
+			</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>
+								<argeo.osgi.start>
+									org.springframework.osgi.extender,
+									org.argeo.slc.detached,
+									org.argeo.slc.demo.det
+								</argeo.osgi.start>
+								<argeo.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,
+								</argeo.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>
+				</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>
+								<argeo.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
+								</argeo.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>