X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=security%2Fdemo%2Fpom.xml;h=67cb9c7dc37908a983e28200d145cfb721b18683;hb=c6c3aa132f6559ac1e2fa015cf2efba92802eba0;hp=10fbcb526d5d52e8f8ffa6009363908b5856fb71;hpb=978cbd4cc396b3f26a8b7a1d1381aada70d89611;p=lgpl%2Fargeo-commons.git

diff --git a/security/demo/pom.xml b/security/demo/pom.xml
index 10fbcb526..67cb9c7dc 100644
--- a/security/demo/pom.xml
+++ b/security/demo/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.commons</groupId>
-		<version>0.1.1-SNAPSHOT</version>
+		<version>0.1.2-SNAPSHOT</version>
 		<artifactId>security</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
@@ -16,165 +16,92 @@
 			<plugin>
 				<groupId>org.argeo.maven.plugins</groupId>
 				<artifactId>maven-argeo-osgi-plugin</artifactId>
+				<version>${version.maven-argeo-osgi}</version>
 				<extensions>true</extensions>
 				<configuration>
 					<bundlesPomArtifactId>org.argeo.security.demo</bundlesPomArtifactId>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.argeo.maven.plugins</groupId>
-				<artifactId>maven-argeo-osgi-plugin</artifactId>
-				<configuration>
-					<execDir>target/exec/server</execDir>
+					<execDir>target/exec</execDir>
 					<osgiBootArtifactId>org.argeo.osgi.boot</osgiBootArtifactId>
+					<argsToAppend>
+						<arg>-clean</arg>
+					</argsToAppend>
+					<fork>false</fork>
 					<systemProperties>
-						<slc.osgi.start>
+						<argeo.osgi.start>
 							org.springframework.osgi.extender,
 							org.springframework.osgi.web.extender,
 							org.argeo.dep.osgi.catalina.start,
-							org.argeo.server.security.webapp
-						</slc.osgi.start>
-						<slc.osgi.bundles>
-							${basedir};in=*;ex=pom.xml;ex=target;ex=.*,
+							org.argeo.security.manager.ldap,
+							org.argeo.security.webapp,
+							org.argeo.security.ria,
+							org.argeo.security.core,
+							org.argeo.server.ads.server
+						</argeo.osgi.start>
+						<argeo.osgi.bundles>
+							${basedir};in=*;ex=pom.xml;ex=target;ex=.*;ex=*.ldif,
 							${basedir}/../modules;in=*;ex=pom.xml;ex=target;ex=.*,
-						</slc.osgi.bundles>
+							${basedir}/../../server/modules;in=*;ex=pom.xml;ex=target;ex=.*,
+						</argeo.osgi.bundles>
 					</systemProperties>
 				</configuration>
 			</plugin>
 		</plugins>
 	</build>
 	<dependencies>
-		<!--  Third Parties -->
-
-		<!-- OSGi -->
+		<!-- Argeo -->
 		<dependency>
-			<groupId>org.eclipse.osgi</groupId>
-			<artifactId>org.eclipse.osgi</artifactId>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.mvc</artifactId>
+			<version>0.1.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.commons.osgi</groupId>
-			<artifactId>org.argeo.osgi.boot</artifactId>
-			<version>0.1.1-SNAPSHOT</version>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.ria</artifactId>
+			<version>0.1.2-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.json</artifactId>
+			<version>0.1.2-SNAPSHOT</version>
 		</dependency>
 
-		<!-- Logging -->
+		<!-- OSGi -->
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
+			<groupId>org.argeo.commons.osgi</groupId>
+			<artifactId>org.argeo.osgi.boot</artifactId>
+			<version>0.1.2-SNAPSHOT</version>
 		</dependency>
+
+		<!--  Commons Dep -->
 		<dependency>
-			<groupId>org.apache.log4j</groupId>
-			<artifactId>com.springsource.org.apache.log4j</artifactId>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.dep.tomcat</artifactId>
+			<version>0.1.2-SNAPSHOT</version>
+			<type>pom</type>
 		</dependency>
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>com.springsource.slf4j.log4j</artifactId>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.dep.ads</artifactId>
+			<version>0.1.2-SNAPSHOT</version>
+			<type>pom</type>
 		</dependency>
 
 		<!-- Spring -->
-		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>org.springframework.osgi.web.extender</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.osgi</groupId>
 			<artifactId>org.springframework.osgi.extender</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.osgi</groupId>
-			<artifactId>org.springframework.osgi.web</artifactId>
-		</dependency>
-
-		<!-- JEE -->
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>com.springsource.javax.servlet</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.annotation</groupId>
-			<artifactId>com.springsource.javax.annotation</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.persistence</groupId>
-			<artifactId>com.springsource.javax.persistence</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.activation</groupId>
-			<artifactId>com.springsource.javax.activation</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>com.springsource.javax.management.j2ee</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.ejb</groupId>
-			<artifactId>com.springsource.javax.ejb</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.xml.rpc</groupId>
-			<artifactId>com.springsource.javax.xml.rpc</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.xml.soap</groupId>
-			<artifactId>com.springsource.javax.xml.soap</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.transaction</groupId>
-			<artifactId>com.springsource.javax.transaction</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.xml.stream</groupId>
-			<artifactId>com.springsource.javax.xml.stream</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>com.springsource.javax.servlet.jsp</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>com.springsource.javax.servlet.jsp.jstl</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.el</groupId>
-			<artifactId>com.springsource.javax.el</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.xml.ws</groupId>
-			<artifactId>com.springsource.javax.xml.ws</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.xml.bind</groupId>
-			<artifactId>com.springsource.javax.xml.bind</artifactId>
+			<artifactId>org.springframework.osgi.web.extender</artifactId>
 		</dependency>
 
-		<!-- Taglibs
-		<dependency>
-			<groupId>org.apache.taglibs</groupId>
-			<artifactId>com.springsource.org.apache.taglibs.standard</artifactId>
-		</dependency> -->
-
-
-		<!-- Tomcat -->
-		<dependency>
-			<groupId>org.argeo.dep.osgi</groupId>
-			<artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.catalina</groupId>
-			<artifactId>com.springsource.org.apache.catalina</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.jasper</groupId>
-			<artifactId>com.springsource.org.apache.jasper</artifactId>
-		</dependency>
+		<!-- Used to start the Apache Directory server -->
 		<dependency>
-			<groupId>org.apache.el</groupId>
-			<artifactId>com.springsource.org.apache.el</artifactId>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.ads</artifactId>
+			<version>0.1.2-SNAPSHOT</version>
 		</dependency>
 
-		<!--
-			ActiveMQ <dependency> <groupId>org.argeo.dep.osgi</groupId>
-			<artifactId>org.argeo.dep.osgi.activemq</artifactId> </dependency>
-		-->
 	</dependencies>
 </project>
\ No newline at end of file