From 598457a8a982be73a4a0137605e824ce50491fae Mon Sep 17 00:00:00 2001
From: mbaudier <mbaudier@argeo.org>
Date: Sat, 3 Jan 2015 15:05:28 +0100
Subject: [PATCH] OSGi complete distribution

---
 META-INF/spring/apache.commons.xml    |  11 +-
 META-INF/spring/apache.jackrabbit.xml |  46 ++++++---
 META-INF/spring/distribution.xml      |   1 +
 META-INF/spring/eclipse.equinox.xml   |   3 +
 META-INF/spring/misc.xml              |   8 ++
 META-INF/spring/spring.security.xml   |  32 ++++--
 META-INF/spring/spring.xml            | 141 ++++++++++++++++++--------
 7 files changed, 171 insertions(+), 71 deletions(-)

diff --git a/META-INF/spring/apache.commons.xml b/META-INF/spring/apache.commons.xml
index 473859d..e35f05d 100644
--- a/META-INF/spring/apache.commons.xml
+++ b/META-INF/spring/apache.commons.xml
@@ -47,7 +47,16 @@
 				<map>
 					<entry
 						key="commons-@{project}-@{version}-bin/lib/commons-@{project}-@{version}.jar">
-						<bean id="org.apache.commons.fileupload" parent="template.org.apache.commons" />
+						<bean id="org.apache.commons.fileupload" parent="template.org.apache.commons">
+							<property name="bndProperties">
+								<props merge="true">
+									<prop key="Import-Package">
+										javax.portlet;resolution:=optional,
+										*
+									</prop>
+								</props>
+							</property>
+						</bean>
 					</entry>
 				</map>
 			</property>
diff --git a/META-INF/spring/apache.jackrabbit.xml b/META-INF/spring/apache.jackrabbit.xml
index dbeed98..7faad97 100644
--- a/META-INF/spring/apache.jackrabbit.xml
+++ b/META-INF/spring/apache.jackrabbit.xml
@@ -21,11 +21,12 @@
 			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">
+						EDU.oswego.cs.dl.util.concurrent;resolution:=optional,
+						org.apache.jackrabbit.test;resolution:=optional,
+						*
+					</prop>
 				</props>
 			</property>
 		</bean>
@@ -33,17 +34,30 @@ 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">
+						EDU.oswego.cs.dl.util.concurrent;resolution:=optional,
+						org.apache.jackrabbit.test;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,15 +68,17 @@ 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.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>
+					<prop key="Import-Package">
+						EDU.oswego.cs.dl.util.concurrent;resolution:=optional,
+						*
+					</prop>
 				</props>
 			</property>
 		</bean>
diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index a48117b..8ead12f 100644
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -18,6 +18,7 @@
 				<ref bean="org.aopalliance" />
 				<ref bean="org.junit" />
 				<ref bean="org.h2" />
+				<!-- <ref bean="org.openid4java" /> -->
 				<ref bean="javax.el" />
 				<ref bean="javax.inject" />
 				<ref bean="misc/org.aspectj" />
diff --git a/META-INF/spring/eclipse.equinox.xml b/META-INF/spring/eclipse.equinox.xml
index 265de1f..6e42b38 100644
--- a/META-INF/spring/eclipse.equinox.xml
+++ b/META-INF/spring/eclipse.equinox.xml
@@ -30,10 +30,13 @@
 				<map>
 					<entry key="plugins/org.eclipse.osgi_*.jar" value="org.argeo.tp.equinox" />
 					<entry key="plugins/org.eclipse.osgi.*.jar" value="org.argeo.tp.equinox" />
+					<!-- FIXME move it to RAP or Addons, only used for build -->
 					<entry key="plugins/org.eclipse.equinox.security_*.jar"
 						value="org.argeo.tp.equinox" />
 					<entry key="plugins/org.eclipse.equinox.security.source_*.jar"
 						value="org.argeo.tp.equinox" />
+					<!-- <entry key="plugins/org.eclipse.core.*.jar" -->
+					<!-- value="org.argeo.tp.equinox" /> -->
 				</map>
 			</property>
 			<property name="osgiFactory" ref="osgiFactory" />
diff --git a/META-INF/spring/misc.xml b/META-INF/spring/misc.xml
index bb21023..9b8e305 100644
--- a/META-INF/spring/misc.xml
+++ b/META-INF/spring/misc.xml
@@ -38,12 +38,20 @@
 			<props merge="true">
 				<prop key="Import-Package">
 					org.hamcrest;resolution:=optional,
+					org.hamcrest.core;resolution:=optional,
 					*
 				</prop>
 			</props>
 		</property>
 	</bean>
 
+	<bean id="org.openid4java" p:sourceCoords="org.openid4java:openid4java:0.9.8"
+		parent="template.mavenWrapper">
+		<property name="license">
+			<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+		</property>
+	</bean>
+
 	<bean id="org.h2" p:sourceCoords="com.h2database:h2:1.4.184"
 		parent="template.mavenWrapper">
 		<property name="doNotModify" value="true" />
diff --git a/META-INF/spring/spring.security.xml b/META-INF/spring/spring.security.xml
index c21f48d..cefb63b 100644
--- a/META-INF/spring/spring.security.xml
+++ b/META-INF/spring/spring.security.xml
@@ -14,8 +14,7 @@
 		<property name="doNotModify" value="true" />
 	</bean>
 
-	<flow:flow name="spring/org.springframework.security"
-		spec="spec.version">
+	<flow:flow name="spring/org.springframework.security" spec="spec.version">
 		<flow:arg name="version" value="3.2.5.RELEASE" />
 		<bean parent="template.archiveWrapper">
 			<property name="uri"
@@ -25,25 +24,36 @@
 			</property>
 			<property name="wrappers">
 				<map>
-					<entry key="spring-security-@{version}/dist/spring-security-acl-@{version}.jar">
+					<entry
+						key="spring-security-@{version}/dist/spring-security-acl-@{version}.jar">
 						<bean id="org.springframework.security.acls" parent="template.spring.security" />
 					</entry>
-					<entry key="spring-security-@{version}/dist/spring-security-config-@{version}.jar">
+					<entry
+						key="spring-security-@{version}/dist/spring-security-aspects-@{version}.jar">
+						<bean id="org.springframework.security.aspects" parent="template.spring.security" />
+					</entry>
+					<entry
+						key="spring-security-@{version}/dist/spring-security-config-@{version}.jar">
 						<bean id="org.springframework.security.config" parent="template.spring.security" />
 					</entry>
-					<entry key="spring-security-@{version}/dist/spring-security-core-@{version}.jar">
+					<entry
+						key="spring-security-@{version}/dist/spring-security-core-@{version}.jar">
 						<bean id="org.springframework.security" parent="template.spring.security" />
 					</entry>
-					<entry key="spring-security-@{version}/dist/spring-security-crypto-@{version}.jar">
+					<entry
+						key="spring-security-@{version}/dist/spring-security-crypto-@{version}.jar">
 						<bean id="org.springframework.security.crypto" parent="template.spring.security" />
 					</entry>
-					<entry key="spring-security-@{version}/dist/spring-security-ldap-@{version}.jar">
+					<entry
+						key="spring-security-@{version}/dist/spring-security-ldap-@{version}.jar">
 						<bean id="org.springframework.security.ldap" parent="template.spring.security" />
 					</entry>
-					<entry key="spring-security-@{version}/dist/spring-security-openid-@{version}.jar">
-						<bean id="org.springframework.security.openid" parent="template.spring.security" />
-					</entry>
-					<entry key="spring-security-@{version}/dist/spring-security-web-@{version}.jar">
+					<!-- <entry key="spring-security-@{version}/dist/spring-security-openid-@{version}.jar"> -->
+					<!-- <bean id="org.springframework.security.openid" parent="template.spring.security" 
+						/> -->
+					<!-- </entry> -->
+					<entry
+						key="spring-security-@{version}/dist/spring-security-web-@{version}.jar">
 						<bean id="org.springframework.security.web" parent="template.spring.security" />
 					</entry>
 				</map>
diff --git a/META-INF/spring/spring.xml b/META-INF/spring/spring.xml
index 487e7ba..0fd66fa 100644
--- a/META-INF/spring/spring.xml
+++ b/META-INF/spring/spring.xml
@@ -24,6 +24,7 @@
 		<property name="bndProperties">
 			<props merge="true">
 				<prop key="Import-Package">
+					org.springframework.orm.jpa;resolution:=optional,
 					*
 				</prop>
 			</props>
@@ -36,6 +37,7 @@
 		<property name="bndProperties">
 			<props merge="true">
 				<prop key="Import-Package">
+					javax.ejb;resolution:=optional,
 					bsh;resolution:=optional,
 					com.sun.net.httpserver;resolution:=optional,
 					edu.emory.mathcs.backport.java.util.concurrent;resolution:=optional,
@@ -57,7 +59,7 @@
 		<property name="bndProperties">
 			<props merge="true">
 				<prop key="Import-Package">
-					*
+					*;resolution:=optional
 				</prop>
 			</props>
 		</property>
@@ -76,24 +78,23 @@
 	</bean>
 	<bean id="org.springframework.expression" parent="template.org.springframework" />
 
-	<!-- <bean id="org.springframework.instrument" parent="template.org.springframework" 
-		/> -->
+	<bean id="org.springframework.instrument" parent="template.org.springframework" />
 
 	<!-- <bean id="org.springframework.instrument.tomcat" parent="template.org.springframework" 
 		/> -->
 
-	<!-- <bean id="org.springframework.jdbc" parent="template.org.springframework"> -->
-	<!-- <property name="bndProperties"> -->
-	<!-- <props merge="true"> -->
-	<!-- <prop key="Import-Package"> -->
-	<!-- com.mchange.v2.c3p0;resolution:=optional, -->
-	<!-- com.sun.rowset;resolution:=optional, -->
-	<!-- org.apache.derby.*;resolution:=optional, -->
-	<!-- * -->
-	<!-- </prop> -->
-	<!-- </props> -->
-	<!-- </property> -->
-	<!-- </bean> -->
+	<bean id="org.springframework.jdbc" parent="template.org.springframework">
+		<property name="bndProperties">
+			<props merge="true">
+				<prop key="Import-Package">
+					com.mchange.v2.c3p0;resolution:=optional,
+					com.sun.rowset;resolution:=optional,
+					org.apache.derby.*;resolution:=optional,
+					*
+				</prop>
+			</props>
+		</property>
+	</bean>
 
 	<!-- <bean id="org.springframework.jms" parent="template.org.springframework" 
 		/> -->
@@ -123,6 +124,7 @@
 			<props merge="true">
 				<prop key="Import-Package">
 					com.ibm.wsspi.uow;resolution:=optional,
+					javax.ejb;resolution:=optional,
 					javax.resource.*;resolution:=optional,
 					*
 				</prop>
@@ -130,9 +132,51 @@
 		</property>
 	</bean>
 
-	<bean id="org.springframework.web" parent="template.org.springframework" />
+	<bean id="org.springframework.web" parent="template.org.springframework">
+		<property name="bndProperties">
+			<props merge="true">
+				<prop key="Import-Package">
+					com.caucho.hessian.*;resolution:=optional,
+					com.caucho.burlap.*;resolution:=optional,
+					com.fasterxml.jackson.*;resolution:=optional,
+					com.sun.net.httpserver.*;resolution:=optional,
+					com.sun.syndication.*;resolution:=optional,
+					javax.faces.*;resolution:=optional,
+					javax.portlet;resolution:=optional,
+					javax.servlet.jsp.*;resolution:=optional,
+					javax.xml.rpc.*;resolution:=optional,
+					org.apache.http.*;resolution:=optional,
+					org.codehaus.jackson.*;resolution:=optional,
+					org.apache.commons.fileupload.*;resolution:=optional,
+					org.springframework.oxm;resolution:=optional,
+					*
+				</prop>
+			</props>
+		</property>
+	</bean>
+
 
-	<bean id="org.springframework.web.servlet" parent="template.org.springframework" />
+	<bean id="org.springframework.web.servlet" parent="template.org.springframework">
+		<property name="bndProperties">
+			<props merge="true">
+				<prop key="Import-Package">
+					com.fasterxml.jackson.*;resolution:=optional,
+					com.lowagie.text.*;resolution:=optional,
+					com.sun.syndication.*;resolution:=optional,
+					freemarker.*;resolution:=optional,
+					javax.servlet.jsp.*;resolution:=optional,
+					jxl.*;resolution:=optional,
+					net.sf.jasperreports.engine.*;resolution:=optional,
+					org.apache.poi.*;resolution:=optional,
+					org.apache.tiles.*;resolution:=optional,
+					org.apache.velocity.*;resolution:=optional,
+					org.codehaus.jackson.*;resolution:=optional,
+					org.springframework.oxm;resolution:=optional,
+					*
+				</prop>
+			</props>
+		</property>
+	</bean>
 
 	<!-- FACTORY -->
 	<bean id="template.org.springframework" parent="template.bndWrapper"
@@ -141,76 +185,85 @@
 	</bean>
 
 	<flow:flow name="spring/org.springframework" spec="spec.version">
-		<flow:arg name="version" value="3.2.4" />
+		<flow:arg name="version" value="3.2.13.RELEASE" />
 		<bean parent="template.archiveWrapper">
 			<property name="uri"
-				value="http://repo.springsource.org/libs-release-local/org/springframework/spring/@{version}.RELEASE/spring-framework-@{version}.RELEASE-dist.zip" />
+				value="http://repo.springsource.org/libs-release-local/org/springframework/spring/@{version}/spring-framework-@{version}-dist.zip" />
 			<property name="license">
 				<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
 			</property>
 			<property name="wrappers">
 				<map>
-					<entry
-						key="spring-framework-@{version}.RELEASE/libs/spring-aop-@{version}.RELEASE.jar"
+					<entry key="spring-framework-@{version}/libs/spring-aop-@{version}.jar"
 						value-ref="org.springframework.aop" />
 					<entry
-						key="spring-framework-@{version}.RELEASE/libs/spring-aspects-@{version}.RELEASE.jar"
+						key="spring-framework-@{version}/libs/spring-aspects-@{version}.jar"
 						value-ref="org.springframework.aspects" />
 					<entry
-						key="spring-framework-@{version}.RELEASE/libs/spring-beans-@{version}.RELEASE.jar"
+						key="spring-framework-@{version}/libs/spring-beans-@{version}.jar"
 						value-ref="org.springframework.beans" />
 					<entry
-						key="spring-framework-@{version}.RELEASE/libs/spring-context-@{version}.RELEASE.jar"
+						key="spring-framework-@{version}/libs/spring-context-@{version}.jar"
 						value-ref="org.springframework.context" />
 					<entry
-						key="spring-framework-@{version}.RELEASE/libs/spring-context-support-@{version}.RELEASE.jar"
+						key="spring-framework-@{version}/libs/spring-context-support-@{version}.jar"
 						value-ref="org.springframework.context.support" />
 					<entry
-						key="spring-framework-@{version}.RELEASE/libs/spring-core-@{version}.RELEASE.jar"
+						key="spring-framework-@{version}/libs/spring-core-@{version}.jar"
 						value-ref="org.springframework.core" />
 					<entry
-						key="spring-framework-@{version}.RELEASE/libs/spring-expression-@{version}.RELEASE.jar"
+						key="spring-framework-@{version}/libs/spring-expression-@{version}.jar"
 						value-ref="org.springframework.expression" />
+					<entry
+						key="spring-framework-@{version}/libs/spring-instrument-@{version}.jar"
+						value-ref="org.springframework.instrument" />
 					<!-- <entry -->
-					<!-- key="spring-framework-@{version}.RELEASE/libs/spring-instrument-@{version}.RELEASE.jar" -->
-					<!-- value-ref="org.springframework.instrument" /> -->
-					<!-- <entry -->
-					<!-- key="spring-framework-@{version}.RELEASE/libs/spring-instrument-tomcat-@{version}.RELEASE.jar" -->
+					<!-- key="spring-framework-@{version}/libs/spring-instrument-tomcat-@{version}.jar" -->
 					<!-- value-ref="org.springframework.instrument.tomcat" /> -->
+					<entry
+						key="spring-framework-@{version}/libs/spring-jdbc-@{version}.jar"
+						value-ref="org.springframework.jdbc" />
 					<!-- <entry -->
-					<!-- key="spring-framework-@{version}.RELEASE/libs/spring-jdbc-@{version}.RELEASE.jar" -->
-					<!-- value-ref="org.springframework.jdbc" /> -->
-					<!-- <entry -->
-					<!-- key="spring-framework-@{version}.RELEASE/libs/spring-jms-@{version}.RELEASE.jar" -->
+					<!-- key="spring-framework-@{version}/libs/spring-jms-@{version}.jar" -->
 					<!-- value-ref="org.springframework.jms" /> -->
 					<!-- <entry -->
-					<!-- key="spring-framework-@{version}.RELEASE/libs/spring-orm-@{version}.RELEASE.jar" -->
+					<!-- key="spring-framework-@{version}/libs/spring-orm-@{version}.jar" -->
 					<!-- value-ref="org.springframework.orm" /> -->
 					<!-- <entry -->
-					<!-- key="spring-framework-@{version}.RELEASE/libs/spring-oxm-@{version}.RELEASE.jar" -->
+					<!-- key="spring-framework-@{version}/libs/spring-oxm-@{version}.jar" -->
 					<!-- value-ref="org.springframework.oxm" /> -->
 					<!-- <entry -->
-					<!-- key="spring-framework-@{version}.RELEASE/libs/spring-test-@{version}.RELEASE.jar" -->
+					<!-- key="spring-framework-@{version}/libs/spring-test-@{version}.jar" -->
 					<!-- value-ref="org.springframework.test" /> -->
-					<entry
-						key="spring-framework-@{version}.RELEASE/libs/spring-tx-@{version}.RELEASE.jar"
+					<entry key="spring-framework-@{version}/libs/spring-tx-@{version}.jar"
 						value-ref="org.springframework.tx" />
-					<entry
-						key="spring-framework-@{version}.RELEASE/libs/spring-web-@{version}.RELEASE.jar"
+					<entry key="spring-framework-@{version}/libs/spring-web-@{version}.jar"
 						value-ref="org.springframework.web" />
 					<entry
-						key="spring-framework-@{version}.RELEASE/libs/spring-webmvc-@{version}.RELEASE.jar"
+						key="spring-framework-@{version}/libs/spring-webmvc-@{version}.jar"
 						value-ref="org.springframework.web.servlet" />
 				</map>
 			</property>
 		</bean>
 	</flow:flow>
 
-	<bean id="org.springframework.ldap" p:sourceCoords="org.springframework.ldap:spring-ldap-core:2.0.2.RELEASE"
+	<bean id="org.springframework.ldap" p:sourceCoords="org.springframework.ldap:spring-ldap-core:1.3.2.RELEASE"
 		parent="template.mavenWrapper">
 		<property name="license">
 			<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
 		</property>
+		<property name="groupId" value="org.argeo.tp.spring" />
+		<property name="bndProperties">
+			<props merge="true">
+				<prop key="Import-Package">
+					org.apache.commons.lang.*;resolution:=optional,
+					com.sun.jndi.ldap.*;resolution:=optional,
+					org.springframework.data.*;resolution:=optional,
+					org.springframework.orm.hibernate3;resolution:=optional,
+					*
+				</prop>
+			</props>
+		</property>
 	</bean>
 
 </beans>
\ No newline at end of file
-- 
2.30.2