X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fmodules%2Forg.argeo.jackrabbit.webapp%2Fpom.xml;h=c3dddd941c9539eebca6a321ed274292c7f74fdc;hb=8fe3a103099c4efa70f4cfef88d0e8684dcd7ced;hp=c777cede6714be82e1bb83a6f15a27069ab6375c;hpb=e1133b983c25f3c14a189d5609ee88a5fd4c3c29;p=lgpl%2Fargeo-commons.git

diff --git a/server/modules/org.argeo.jackrabbit.webapp/pom.xml b/server/modules/org.argeo.jackrabbit.webapp/pom.xml
index c777cede6..c3dddd941 100644
--- 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.3-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,12 +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>