X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fmodules%2Forg.argeo.jackrabbit.webapp%2Fpom.xml;h=b947c469c6191d7c97b1f0d25359e747787abccc;hb=492ea2b43dba4b9694da87808a96d7fc37687e19;hp=5ece3e263335a8e61a6fed38a3a0d3e723cc3a2a;hpb=cb03e53c0ae1087fd3021f2e0051f7f191ddf84f;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 5ece3e263..b947c469c 100644
--- a/server/modules/org.argeo.jackrabbit.webapp/pom.xml
+++ b/server/modules/org.argeo.jackrabbit.webapp/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.commons.server</groupId>
-		<version>0.3.5-SNAPSHOT</version>
+		<version>1.1.8-SNAPSHOT</version>
 		<artifactId>modules</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
@@ -16,9 +16,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 +29,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 +36,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>