From 0e6c2a855b169c40d38d63bf1b7a581b9f4a25fb Mon Sep 17 00:00:00 2001
From: mbaudier <mbaudier@argeo.org>
Date: Mon, 7 Oct 2013 17:51:15 +0200
Subject: [PATCH] Core Spring working

---
 META-INF/spring/distribution.xml              |  29 +++++
 META-INF/spring/org.argeo.tp.ant.xml          |  34 +++++
 .../spring/org.argeo.tp.apache.tomcat.xml     |  47 ++++++-
 META-INF/spring/org.argeo.tp.equinox.xml      |  52 ++++++++
 META-INF/spring/org.argeo.tp.javax.xml        |   4 +
 META-INF/spring/org.argeo.tp.spring.xml       | 119 ++++++++++++++++--
 META-INF/spring/org.argeo.tp.xml              |  65 +++++++++-
 7 files changed, 337 insertions(+), 13 deletions(-)
 create mode 100644 META-INF/spring/org.argeo.tp.ant.xml
 create mode 100644 META-INF/spring/org.argeo.tp.equinox.xml

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index db233c9..3c1eef0 100644
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -16,6 +16,7 @@
 				<ref bean="org.argeo.tp/org.apache.log4j" />
 				<ref bean="org.argeo.tp/org.slf4j" />
 				<ref bean="org.argeo.tp.apache.tomcat/org.apache.tomcat" />
+				<ref bean="org.argeo.tp/org.aopalliance" />
 				<ref bean="org.argeo.tp.spring/org.springframework" />
 			</list>
 		</property>
@@ -31,6 +32,23 @@
 				<bean class="org.argeo.slc.repo.JarFileIndexer" />
 			</list>
 		</property>
+		<property name="mirrors">
+			<map>
+				<entry key="http://archive.apache.org/dist">
+					<list>
+						<value>http://mirror.derwebwolf.net/apache</value>
+						<value>http://archive.apache.org/dist</value>
+					</list>
+				</entry>
+				<entry key="http://www.eclipse.org/downloads">
+					<list>
+						<value>http://mirror.netcologne.de/eclipse</value>
+						<value>http://mirror.selfnet.de/eclipse</value>
+						<value><![CDATA[http://www.eclipse.org/downloads/download.php?file=]]></value>
+					</list>
+				</entry>
+			</map>
+		</property>
 		<property name="javaRepository" ref="javaRepository" />
 		<property name="distRepository" ref="distRepository" />
 	</bean>
@@ -60,11 +78,22 @@
 		such as version can be set by caller. -->
 	<bean id="template.bndWrapper" class="org.argeo.slc.repo.osgi.BndWrapper"
 		abstract="true" scope="prototype">
+		<property name="groupId" value="org.argeo.tp" />
 		<property name="bndProperties">
 			<props>
 				<prop key="Export-Package">*</prop>
 			</props>
 		</property>
 	</bean>
+	<bean id="template.mavenWrapper" class="org.argeo.slc.repo.osgi.MavenWrapper"
+		abstract="true" scope="prototype">
+		<property name="groupId" value="org.argeo.tp" />
+		<property name="bndProperties">
+			<props>
+				<prop key="Export-Package">*</prop>
+			</props>
+		</property>
+		<property name="osgiFactory" ref="osgiFactory" />
+	</bean>
 
 </beans>
\ No newline at end of file
diff --git a/META-INF/spring/org.argeo.tp.ant.xml b/META-INF/spring/org.argeo.tp.ant.xml
new file mode 100644
index 0000000..b047f95
--- /dev/null
+++ b/META-INF/spring/org.argeo.tp.ant.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:util="http://www.springframework.org/schema/util" xmlns:flow="http://www.argeo.org/schema/slc-flow"
+	xsi:schemaLocation="
+	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
+	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-1.2.xsd">
+
+	<!-- REGISTER -->
+	<bean id="org.apache.ant" parent="template.org.apache.ant" />
+	<bean id="org.apache.ant.launch" parent="template.org.apache.ant" />
+
+	<!-- Ant Factory -->
+	<bean id="template.org.apache.ant" parent="template.bndWrapper"
+		abstract="true">
+		<property name="groupId" value="org.argeo.tp.ant" />
+	</bean>
+
+	<flow:flow name="org.argeo.tp.ant/org.apache.ant" spec="spec.version">
+		<flow:arg name="version" value="1.9.2" />
+		<bean parent="template.archiveWrapper">
+			<property name="uri"
+				value="http://archive.apache.org/dist/ant/binaries/apache-ant-@{version}-bin.zip" />
+			<property name="wrappers">
+				<map>
+					<entry key="apache-ant-@{version}/lib/ant.jar" value-ref="org.apache.ant" />
+					<entry key="apache-ant-@{version}/lib/ant-launcher.jar"
+						value-ref="org.apache.ant.launch" />
+				</map>
+			</property>
+		</bean>
+	</flow:flow>
+</beans>
\ No newline at end of file
diff --git a/META-INF/spring/org.argeo.tp.apache.tomcat.xml b/META-INF/spring/org.argeo.tp.apache.tomcat.xml
index 712437f..3f295e2 100644
--- a/META-INF/spring/org.argeo.tp.apache.tomcat.xml
+++ b/META-INF/spring/org.argeo.tp.apache.tomcat.xml
@@ -8,12 +8,51 @@
 	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-1.2.xsd">
 
 	<!-- REGISTER -->
-	<bean id="org.apache.catalina" parent="template.org.apache.tomcat" />
-	<bean id="org.apache.jasper" parent="template.org.apache.tomcat" />
+	<bean id="org.apache.catalina" parent="template.org.apache.tomcat">
+		<property name="bndProperties">
+			<props merge="true">
+				<prop key="Import-Package">
+					javax.mail.*;resolution:=optional,
+					org.apache.juli.*;resolution:=optional,
+					*
+				</prop>
+			</props>
+		</property>
+	</bean>
+	<bean id="org.apache.jasper" parent="template.org.apache.tomcat">
+		<property name="bndProperties">
+			<props merge="true">
+				<prop key="Import-Package">
+					org.apache.juli.logging;resolution:=optional,
+					org.apache.tools.ant.*;resolution:=optional,
+					org.eclipse.jdt.*;resolution:=optional,
+					*
+				</prop>
+			</props>
+		</property>
+	</bean>
 	<bean id="org.apache.el" parent="template.org.apache.tomcat" />
-	<bean id="org.apache.coyote" parent="template.org.apache.tomcat" />
+	<bean id="org.apache.coyote" parent="template.org.apache.tomcat">
+		<property name="bndProperties">
+			<props merge="true">
+				<prop key="Import-Package">
+					*,
+					org.apache.juli.logging;resolution:=optional,
+				</prop>
+			</props>
+		</property>
+	</bean>
 	<bean id="org.apache.tomcat.api" parent="template.org.apache.tomcat" />
-	<bean id="org.apache.tomcat.util" parent="template.org.apache.tomcat" />
+	<bean id="org.apache.tomcat.util" parent="template.org.apache.tomcat">
+		<property name="bndProperties">
+			<props merge="true">
+				<prop key="Import-Package">
+					org.apache.juli.logging;resolution:=optional,
+					*
+				</prop>
+			</props>
+		</property>
+	</bean>
 
 	<!-- FACTORY -->
 	<bean id="template.org.apache.tomcat" parent="template.bndWrapper"
diff --git a/META-INF/spring/org.argeo.tp.equinox.xml b/META-INF/spring/org.argeo.tp.equinox.xml
new file mode 100644
index 0000000..b208816
--- /dev/null
+++ b/META-INF/spring/org.argeo.tp.equinox.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:util="http://www.springframework.org/schema/util" xmlns:flow="http://www.argeo.org/schema/slc-flow"
+	xsi:schemaLocation="
+	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
+	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">
+
+	<!-- REGISTER -->
+	<bean id="org.eclipse.osgi" parent="template.org.eclipse.osgi" />
+
+	<!-- FACTORY -->
+	<bean id="template.org.eclipse.osgi" parent="template.bndWrapper"
+		abstract="true">
+		<property name="groupId" value="org.argeo.tp.equinox" />
+	</bean>
+
+	<!-- Equinox Kepler SR1 (3.9.1) -->
+	<flow:flow name="org.argeo.tp.equinox/org.argeo.tp.equinox_KeplerSR1"
+		parent="template.importEquinox">
+		<flow:arg name="equinoxRelease" value="KeplerSR1" />
+		<flow:arg name="equinoxTimestamp" value="201309111000" />
+	</flow:flow>
+
+
+	<!-- RAP specs and templates -->
+	<flow:spec id="equinoxVersion.spec">
+		<flow:primitive name="equinoxRelease" isParameter="true" />
+		<flow:primitive name="equinoxTimestamp" isParameter="true" />
+	</flow:spec>
+
+	<flow:flow id="template.importEquinox" spec="equinoxVersion.spec"
+		abstract="true">
+		<bean class="org.argeo.slc.repo.osgi.ArchiveWrapper">
+			<property name="uri"
+				value="http://www.eclipse.org/downloads/equinox/drops/R-@{equinoxRelease}-@{equinoxTimestamp}/equinox-SDK-@{equinoxRelease}.zip" />
+			<property name="wrappers">
+				<map>
+					<!-- Tomcat -->
+					<entry key="plugins/org.eclipse.osgi_*.jar" value-ref="org.eclipse.osgi" />
+				</map>
+			</property>
+			<!-- <property name="includes"> -->
+			<!-- <map> -->
+			<!-- <entry key="plugins/*.jar" value="org.argeo.tp.equinox" /> -->
+			<!-- </map> -->
+			<!-- </property> -->
+			<property name="osgiFactory" ref="osgiFactory" />
+		</bean>
+	</flow:flow>
+</beans>
\ No newline at end of file
diff --git a/META-INF/spring/org.argeo.tp.javax.xml b/META-INF/spring/org.argeo.tp.javax.xml
index 6a678aa..cb57e73 100644
--- a/META-INF/spring/org.argeo.tp.javax.xml
+++ b/META-INF/spring/org.argeo.tp.javax.xml
@@ -13,6 +13,10 @@
 	<bean id="javax.servlet" p:version="3.0.0" parent="template.javax" />
 	<bean id="javax.servlet.jsp" p:version="2.2.0" parent="template.javax" />
 
+	<bean id="javax.inject" flow:as-flow="org.argeo.tp.javax/javax.inject"
+		p:version="1.0.0" p:groupId="org.argeo.tp.javax" p:sourceCoords="javax.inject:javax.inject:1"
+		parent="template.mavenWrapper" />
+
 	<!-- FACTORY -->
 	<bean id="template.javax" parent="template.bndWrapper" abstract="true">
 		<property name="groupId" value="org.argeo.tp.javax" />
diff --git a/META-INF/spring/org.argeo.tp.spring.xml b/META-INF/spring/org.argeo.tp.spring.xml
index e0f8dd4..11f53a5 100644
--- a/META-INF/spring/org.argeo.tp.spring.xml
+++ b/META-INF/spring/org.argeo.tp.spring.xml
@@ -8,22 +8,125 @@
 	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-1.2.xsd">
 
 	<!-- REGISTER -->
-	<bean id="org.springframework.aop" parent="template.org.springframework" />
-	<bean id="org.springframework.aspects" parent="template.org.springframework" />
+	<bean id="org.springframework.aop" parent="template.org.springframework">
+		<property name="bndProperties">
+			<props merge="true">
+				<prop key="Import-Package">
+					com.jamonapi;resolution:=optional,
+					org.apache.commons.pool.*;resolution:=optional,
+					*
+				</prop>
+			</props>
+		</property>
+	</bean>
+
+	<bean id="org.springframework.aspects" parent="template.org.springframework">
+		<property name="bndProperties">
+			<props merge="true">
+				<prop key="Import-Package">
+					*
+				</prop>
+			</props>
+		</property>
+	</bean>
+
 	<bean id="org.springframework.beans" parent="template.org.springframework" />
-	<bean id="org.springframework.context" parent="template.org.springframework" />
-	<bean id="org.springframework.context.support" parent="template.org.springframework" />
-	<bean id="org.springframework.core" parent="template.org.springframework" />
+
+	<bean id="org.springframework.context" parent="template.org.springframework">
+		<property name="bndProperties">
+			<props merge="true">
+				<prop key="Import-Package">
+					bsh;resolution:=optional,
+					com.sun.net.httpserver;resolution:=optional,
+					edu.emory.mathcs.backport.java.util.concurrent;resolution:=optional,
+					groovy.lang;resolution:=optional,
+					javax.interceptor;resolution:=optional,
+					javax.jms;resolution:=optional,
+					javax.persistence.spi;resolution:=optional,
+					javax.validation.*;resolution:=optional,
+					org.codehaus.groovy.control;resolution:=optional,
+					org.hibernate.validator.*;resolution:=optional,
+					org.joda.time.*;resolution:=optional,
+					org.jruby.*;resolution:=optional,
+					*
+				</prop>
+			</props>
+		</property>
+	</bean>
+	<bean id="org.springframework.context.support" parent="template.org.springframework">
+		<property name="bndProperties">
+			<props merge="true">
+				<prop key="Import-Package">
+					*
+				</prop>
+			</props>
+		</property>
+	</bean>
+
+	<bean id="org.springframework.core" parent="template.org.springframework">
+		<property name="bndProperties">
+			<props merge="true">
+				<prop key="Import-Package">
+					joptsimple;resolution:=optional,
+					org.springframework.asm.tree;resolution:=optional,
+					*
+				</prop>
+			</props>
+		</property>
+	</bean>
 	<bean id="org.springframework.expression" 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" />
+
+	<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" />
+
 	<bean id="org.springframework.orm" parent="template.org.springframework" />
-	<bean id="org.springframework.oxm" parent="template.org.springframework" />
+
+	<bean id="org.springframework.oxm" parent="template.org.springframework">
+		<property name="bndProperties">
+			<props merge="true">
+				<prop key="Import-Package">
+					com.thoughtworks.xstream.*;resolution:=optional,
+					org.apache.xmlbeans.*;resolution:=optional,
+					org.exolab.castor.*;resolution:=optional,
+					org.jibx.runtime.*;resolution:=optional,
+					*
+				</prop>
+			</props>
+		</property>
+	</bean>
+
 	<bean id="org.springframework.test" parent="template.org.springframework" />
-	<bean id="org.springframework.tx" parent="template.org.springframework" />
+
+	<bean id="org.springframework.tx" parent="template.org.springframework">
+		<property name="bndProperties">
+			<props merge="true">
+				<prop key="Import-Package">
+					com.ibm.wsspi.uow;resolution:=optional,
+					javax.resource.*;resolution:=optional,
+					*
+				</prop>
+			</props>
+		</property>
+	</bean>
+
 	<bean id="org.springframework.web" parent="template.org.springframework" />
+
 	<bean id="org.springframework.web.servlet" parent="template.org.springframework" />
 
 	<!-- FACTORY -->
diff --git a/META-INF/spring/org.argeo.tp.xml b/META-INF/spring/org.argeo.tp.xml
index 3b107e4..155c119 100644
--- a/META-INF/spring/org.argeo.tp.xml
+++ b/META-INF/spring/org.argeo.tp.xml
@@ -8,12 +8,61 @@
 	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-1.2.xsd">
 
 	<!-- REGISTER -->
+	<bean id="org.aspectj.weaver" parent="template.bndWrapper">
+		<property name="bndProperties">
+			<props merge="true">
+				<prop key="Import-Package">
+					*,
+					com.bea.jvm;resolution:=optional,
+				</prop>
+			</props>
+		</property>
+	</bean>
 	<bean id="org.apache.log4j" p:groupId="org.argeo.tp.apache"
-		parent="template.bndWrapper" />
+		parent="template.bndWrapper">
+		<property name="bndProperties">
+			<props merge="true">
+				<prop key="Import-Package">
+					*,
+					com.ibm.uvm.tools;resolution:=optional,
+					com.sun.jdmk.comm;resolution:=optional,
+					javax.jmdns;resolution:=optional,
+					javax.jms;resolution:=optional,
+					javax.mail;resolution:=optional,
+					javax.mail.internet;resolution:=optional,
+				</prop>
+			</props>
+		</property>
+	</bean>
 	<bean id="org.slf4j.log4j12" parent="template.org.slf4j" />
 	<bean id="org.slf4j.api" parent="template.org.slf4j" />
 	<bean id="org.slf4j.commons.logging" parent="template.org.slf4j" />
 
+	<bean id="org.aopalliance" p:version="1.0.0" 
+		p:sourceCoords="aopalliance:aopalliance:1.0" parent="template.mavenWrapper" />
+
+	<!-- AOP Alliance factory -->
+	<flow:flow name="org.argeo.tp/org.aopalliance">
+		<ref bean="org.aopalliance" />
+	</flow:flow>
+
+	<!-- Eclipse Batch Compiler (ECJ) factory -->
+	<flow:flow name="org.argeo.tp/org.eclipse.jdt.core.compiler.batch"
+		spec="spec.version">
+		<flow:arg name="version" value="4.3.1" />
+		<!-- <bean parent="template.archiveWrapper"> -->
+		<!-- <property name="uri" -->
+		<!-- value="http://archive.apache.org/dist/logging/log4j/@{version}/log4j-@{version}.zip" 
+			/> -->
+		<!-- <property name="wrappers"> -->
+		<!-- <map> -->
+		<!-- <entry key="plugins/ecj-.jar" -->
+		<!-- value-ref="org.eclipse.jdt.core.compiler.batch" /> -->
+		<!-- </map> -->
+		<!-- </property> -->
+		<!-- </bean> -->
+	</flow:flow>
+
 	<!-- Log4j12 Factory -->
 	<flow:flow name="org.argeo.tp/org.apache.log4j" spec="spec.version">
 		<flow:arg name="version" value="1.2.17" />
@@ -29,6 +78,20 @@
 		</bean>
 	</flow:flow>
 
+	<!-- AspectJ Factory -->
+	<flow:flow name="org.argeo.tp/org.aspectj" spec="spec.version">
+		<flow:arg name="version" value="1.7.3" />
+		<bean parent="template.archiveWrapper">
+			<property name="uri"
+				value="http://www.eclipse.org/downloads/tools/aspectj/aspectj-@{version}.jar" />
+			<property name="wrappers">
+				<map>
+					<entry key="lib/aspectjweaver.jar" value-ref="org.aspectj.weaver" />
+				</map>
+			</property>
+		</bean>
+	</flow:flow>
+
 	<!-- SLF4J Factory -->
 	<bean id="template.org.slf4j" parent="template.bndWrapper"
 		abstract="true">
-- 
2.30.2