Security Demo

[lgpl/argeo-commons.git] / security / demo / pom.xml

diff --git a/security/demo/pom.xml b/security/demo/pom.xml
index 10fbcb526d5d52e8f8ffa6009363908b5856fb71..7f52d9631fa513d295208e5234f0983c41fcc5d9 100644 (file)
--- a/security/demo/pom.xml
+++ b/security/demo/pom.xml
@@ -25,18 +25,23 @@
                                <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>
                                                        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 +49,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 +164,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 -->