X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=demo%2Fpom.xml;h=e4f569132e78ba7214314cde18b60f0e5d369e3d;hb=ec9fe3774f157092d748b0844dbbb55e29a67481;hp=454a03e0f3ace46535741f30e53e74326985fa86;hpb=67b6879543ebc7c60d72976bca6c572932133a57;p=gpl%2Fargeo-slc.git

diff --git a/demo/pom.xml b/demo/pom.xml
index 454a03e0f..e4f569132 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -7,45 +7,27 @@
 		<version>0.11.3-SNAPSHOT</version>
 		<relativePath>../org.argeo.slc</relativePath>
 	</parent>
-	<artifactId>argeo-slc-demo</artifactId>
+	<groupId>org.argeo.slc.demo</groupId>
+	<artifactId>deploy</artifactId>
 	<packaging>pom</packaging>
-	<name>Argeo SLC Demo</name>
+	<name>Argeo SLC Demo Deploy</name>
+	<modules>
+		<module>site</module>
+	</modules>
 	<build>
 		<plugins>
 			<plugin>
 				<groupId>org.argeo.slc.maven</groupId>
 				<artifactId>maven-argeo-osgi-plugin</artifactId>
-				<version>0.1.5</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>${basedir}/site;in=*;ex=**/.svn/**,${basedir}/../server/org.argeo.slc.siteserver/bundles;in=*;ex=**/.svn/**</slc.osgi.bundles>
+					</systemProperties>
 				</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>
@@ -64,5 +46,66 @@
 		</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>
+								<!-- <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.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>
+							</systemProperties>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</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,
+									org.argeo.slc.demo.manager
+								</slc.osgi.start>
+							</systemProperties>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>