X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=META-INF%2Fspring%2Fapache.jackrabbit.xml;h=8f4ca80bea713ae2339099abc97bf7d5d59699b7;hb=abfecf8c72b0fe119f6398afaa5aff278ca59456;hp=dbeed98b9863e140e9b6d8cfe23ba8c30344fcb7;hpb=802f29eeaa54f7ea58b4d318d90b16806e24dea0;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/apache.jackrabbit.xml b/META-INF/spring/apache.jackrabbit.xml
index dbeed98..8f4ca80 100644
--- a/META-INF/spring/apache.jackrabbit.xml
+++ b/META-INF/spring/apache.jackrabbit.xml
@@ -8,7 +8,7 @@
 	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-1.2.xsd">
 
 	<flow:flow name="apache/org.apache.jackrabbit" spec="spec.version">
-		<flow:arg name="version" value="2.8.0" />
+		<flow:arg name="version" value="2.16.0" />
 		<bean id="org.apache.jackrabbit.api" parent="template.jackrabbitMaven"
 			p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-api:@{version}" />
 		<bean id="org.apache.jackrabbit.jcr.commons" parent="template.jackrabbitMaven"
@@ -21,11 +21,20 @@
 			p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-data:@{version}">
 			<property name="bndProperties">
 				<props merge="true">
-					<prop key="Fragment-Host"><![CDATA[org.apache.jackrabbit.core]]></prop>
-					<prop key="Import-Package"><![CDATA[
-EDU.oswego.cs.dl.util.concurrent;resolution:=optional,
-org.apache.jackrabbit.test;resolution:=optional,
-*]]></prop>
+					<prop key="Fragment-Host">org.apache.jackrabbit.core</prop>
+					<prop key="Import-Package">
+						org.apache.jackrabbit.test;resolution:=optional,
+						org.apache.derby.*;resolution:=optional,
+						org.h2;resolution:=optional,
+						org.postgresql;resolution:=optional,
+						oracle.jdbc;resolution:=optional,
+						org.gjt.mm.mysql;resolution:=optional,
+						com.mysql.jdbc;resolution:=optional,
+						com.microsoft.sqlserver.jdbc;resolution:=optional,
+						net.sourceforge.jtds.jdbc;resolution:=optional,
+						org.hsqldb;resolution:=optional,
+						*
+					</prop>
 				</props>
 			</property>
 		</bean>
@@ -33,17 +42,38 @@ org.apache.jackrabbit.test;resolution:=optional,
 			p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-core:@{version}">
 			<property name="bndProperties">
 				<props merge="true">
-					<prop key="Import-Package"><![CDATA[
-EDU.oswego.cs.dl.util.concurrent;resolution:=optional,
-org.apache.jackrabbit.test;resolution:=optional,
-*]]></prop>
+					<prop key="Import-Package">
+						org.apache.jackrabbit.test;resolution:=optional,
+						org.apache.derby.*;resolution:=optional,
+						org.h2;resolution:=optional,
+						org.postgresql;resolution:=optional,
+						oracle.jdbc;resolution:=optional,
+						org.gjt.mm.mysql;resolution:=optional,
+						com.mysql.jdbc;resolution:=optional,
+						com.microsoft.sqlserver.jdbc;resolution:=optional,
+						net.sourceforge.jtds.jdbc;resolution:=optional,
+						org.hsqldb;resolution:=optional,
+						*
+					</prop>
 				</props>
 			</property>
 		</bean>
 		<bean id="org.apache.jackrabbit.jcr.client" parent="template.jackrabbitMaven"
 			p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-jcr-client:@{version}" />
-		<bean id="org.apache.jackrabbit.jcr.server" parent="template.jackrabbitMaven"
+		<bean id="org.apache.jackrabbit.server" parent="template.jackrabbitMaven"
 			p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-jcr-server:@{version}" />
+		<bean id="org.apache.jackrabbit.servlet" parent="template.jackrabbitMaven"
+			p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-jcr-servlet:@{version}">
+			<property name="bndProperties">
+				<props merge="true">
+					<prop key="Fragment-Host">org.apache.jackrabbit.core</prop>
+					<prop key="Import-Package">
+						org.apache.jackrabbit.rmi.*;resolution:=optional,
+						*
+					</prop>
+				</props>
+			</property>
+		</bean>
 		<bean id="org.apache.jackrabbit.webdav" parent="template.jackrabbitMaven"
 			p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-webdav:@{version}" />
 		<bean id="org.apache.jackrabbit.spi2dav" parent="template.jackrabbitMaven"
@@ -54,18 +84,19 @@ org.apache.jackrabbit.test;resolution:=optional,
 			p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-jcr2dav:@{version}" />
 		<bean id="org.apache.jackrabbit.jcr2spi" parent="template.jackrabbitMaven"
 			p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-jcr2spi:@{version}" />
-		<bean id="org.apache.jackrabbit.webapp" parent="template.jackrabbitMaven"
-			p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-webapp:@{version}" />
-		<bean id="org.apache.jackrabbit.test" parent="template.jackrabbitMaven"
-			p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-jcr-tests:@{version}">
-			<property name="bndProperties">
-				<props merge="true">
-					<prop key="Import-Package"><![CDATA[
-EDU.oswego.cs.dl.util.concurrent;resolution:=optional,
-*]]></prop>
-				</props>
-			</property>
-		</bean>
+		<!-- <bean id="org.apache.jackrabbit.webapp" parent="template.jackrabbitMaven" -->
+		<!-- p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-webapp:@{version}" 
+			/> -->
+		<!-- <bean id="org.apache.jackrabbit.test" parent="template.jackrabbitMaven" -->
+		<!-- p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-jcr-tests:@{version}"> -->
+		<!-- <property name="bndProperties"> -->
+		<!-- <props merge="true"> -->
+		<!-- <prop key="Import-Package"> -->
+		<!-- * -->
+		<!-- </prop> -->
+		<!-- </props> -->
+		<!-- </property> -->
+		<!-- </bean> -->
 	</flow:flow>
 
 	<bean id="template.jackrabbitMaven" parent="template.mavenWrapper"