Change JCR url

[lgpl/argeo-commons.git] / server / modules / org.argeo.jackrabbit.webapp / pom.xml

diff --git a/server/modules/org.argeo.jackrabbit.webapp/pom.xml b/server/modules/org.argeo.jackrabbit.webapp/pom.xml
index 2be9e3d1ffe70fcd4ae71a0b86683d938969a044..c3dddd941c9539eebca6a321ed274292c7f74fdc 100644 (file)
--- a/server/modules/org.argeo.jackrabbit.webapp/pom.xml
+++ b/server/modules/org.argeo.jackrabbit.webapp/pom.xml
@@ -1,8 +1,9 @@
-<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.commons.server</groupId>
-               <version>1.1.4-SNAPSHOT</version>
+               <version>1.1.5-SNAPSHOT</version>
                <artifactId>modules</artifactId>
                <relativePath>..</relativePath>
        </parent>
@@ -16,9 +17,9 @@
                                <artifactId>maven-bundle-plugin</artifactId>
                                <configuration>
                                        <instructions>
-                                               <Web-ContextPath>org.argeo.jcr.webapp</Web-ContextPath>
-                                               <!-- TODO is it still necessary? -->
-                                               <DynamicImport-Package>*</DynamicImport-Package>
+                                               <Web-ContextPath>data</Web-ContextPath>
+                                               <!-- Import-Package needs to be specified explicitly since BND doesn't 
+                                                       scane WEB-INF -->
                                                <Import-Package>
                                                        *,
                                                        javax.jcr,
@@ -29,7 +30,6 @@
                                                        org.argeo.jackrabbit.remote,
                                                        org.argeo.jcr,
                                                        org.argeo.jcr.mvc,
-                                                       org.argeo.server.mvc,
                                                        org.springframework.aop,
                                                        org.springframework.aop.framework,
                                                        org.springframework.aop.scope,
@@ -37,13 +37,22 @@
                                                        org.springframework.osgi.web.context.support,
                                                        org.springframework.security,
                                                        org.springframework.security.providers.anonymous,
+                                                       org.springframework.security.ui,
                                                        org.springframework.security.ui.webapp,
                                                        org.springframework.security.ui.preauth.x509,
+                                                       org.springframework.security.userdetails,
                                                        org.springframework.web.context,
                                                        org.springframework.web.filter,
                                                        org.springframework.web.servlet,
                                                        org.springframework.web.servlet.handler,
-                                                       org.springframework.web.servlet.view
+                                                       org.springframework.web.servlet.view,
+                                                       org.springframework.security.util,
+                                                       org.springframework.security.context,
+                                                       org.springframework.security.ui.basicauth,
+                                                       org.springframework.security.intercept.web,
+                                                       org.springframework.security.vote,
+                                                       org.springframework.security.ui.logout,
+                                                       org.apache.jackrabbit.server,
                                                </Import-Package>
                                        </instructions>
                                </configuration>