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

diff --git a/security/demo/pom.xml b/security/demo/pom.xml
index 10fbcb526..404eb18b8 100644
--- a/security/demo/pom.xml
+++ b/security/demo/pom.xml
@@ -16,6 +16,7 @@
 			<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>
@@ -24,19 +25,25 @@
 			<plugin>
 				<groupId>org.argeo.maven.plugins</groupId>
 				<artifactId>maven-argeo-osgi-plugin</artifactId>
+				<version>${version.maven-argeo-osgi}</version>
 				<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>
 							org.springframework.osgi.extender,
 							org.springframework.osgi.web.extender,
 							org.argeo.dep.osgi.catalina.start,
-							org.argeo.server.security.webapp
+							org.argeo.security.webapp
 						</slc.osgi.start>
 						<slc.osgi.bundles>
 							${basedir};in=*;ex=pom.xml;ex=target;ex=.*,
 							${basedir}/../modules;in=*;ex=pom.xml;ex=target;ex=.*,
+							${basedir}/../../server/modules;in=*;ex=pom.xml;ex=target;ex=.*,
 						</slc.osgi.bundles>
 					</systemProperties>
 				</configuration>
@@ -44,6 +51,18 @@
 		</plugins>
 	</build>
 	<dependencies>
+		<!-- Argeo -->
+		<dependency>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.mvc</artifactId>
+			<version>0.1.1-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.json</artifactId>
+			<version>0.1.1-SNAPSHOT</version>
+		</dependency>
+
 		<!--  Third Parties -->
 
 		<!-- OSGi -->
@@ -147,11 +166,11 @@
 			<artifactId>com.springsource.javax.xml.bind</artifactId>
 		</dependency>
 
-		<!-- Taglibs
-		<dependency>
-			<groupId>org.apache.taglibs</groupId>
+		<!--
+			Taglibs <dependency> <groupId>org.apache.taglibs</groupId>
 			<artifactId>com.springsource.org.apache.taglibs.standard</artifactId>
-		</dependency> -->
+			</dependency>
+		-->
 
 
 		<!-- Tomcat -->
@@ -176,5 +195,31 @@
 			ActiveMQ <dependency> <groupId>org.argeo.dep.osgi</groupId>
 			<artifactId>org.argeo.dep.osgi.activemq</artifactId> </dependency>
 		-->
+
+		<!-- Apache Directory -->
+		<dependency>
+			<groupId>org.apache.directory</groupId>
+			<artifactId>com.springsource.org.apache.directory.server.core</artifactId>
+			<version>1.0.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.directory</groupId>
+			<artifactId>com.springsource.org.apache.directory.server.jndi</artifactId>
+			<version>1.0.2</version>
+		</dependency>
+		<dependency>
+			<groupId>net.sourceforge.jdbm</groupId>
+			<artifactId>com.springsource.jdbm</artifactId>
+			<version>1.0.0</version>
+		</dependency>
+		<!--
+			TODO: version 2.4.0 is required by Spring-LDAP while Apache Directory
+			takes 2.1.0
+		-->
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>com.springsource.org.apache.commons.lang</artifactId>
+			<version>2.4.0</version>
+		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file