X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fmodules%2Forg.argeo.jackrabbit.webapp%2Fpom.xml;h=f189258df30fb58a465b4e4691681c0d438801b6;hb=aa9d3a8e795237d8593f6e437afc4f61debc318a;hp=2e47cd1a2b091836692ee92dd48149a4ea663b01;hpb=cf6a0a76a1f0e471c31e2190db80949fb3dd5f51;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 2e47cd1a2..f189258df 100644
--- a/server/modules/org.argeo.jackrabbit.webapp/pom.xml
+++ b/server/modules/org.argeo.jackrabbit.webapp/pom.xml
@@ -1,9 +1,8 @@
-<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>0.3.4-SNAPSHOT</version>
+		<version>2.1.1.tp-SNAPSHOT</version>
 		<artifactId>modules</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
@@ -17,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,
@@ -30,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,
@@ -38,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>