From 4cb92ff7f95e22aef01528f1c99472e3a5469ec5 Mon Sep 17 00:00:00 2001
From: mbaudier <mbaudier@argeo.org>
Date: Wed, 7 Jan 2015 11:36:26 +0100
Subject: [PATCH] Add Javax Mail

---
 META-INF/spring/distribution.xml |  7 ++++---
 META-INF/spring/javax.xml        | 23 ++++-------------------
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index bf7883c..b88cdd5 100644
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -18,13 +18,15 @@
 				<ref bean="org.aopalliance" />
 				<ref bean="org.junit" />
 				<ref bean="org.h2" />
-				<ref bean="joda-time" />
+				<ref bean="org.joda.time" />
 				<!-- This has been defined as optional via bnd -->
-				<!--   <ref bean="com.jcraft.jzlib" /> -->
+				<!-- <ref bean="com.jcraft.jzlib" /> -->
 				<ref bean="com.jcraft.jsch" />
 				<ref bean="EDU.oswego.cs.dl.util.concurrent" />
 				<ref bean="javax.el" />
 				<ref bean="javax.inject" />
+				<ref bean="javax.jcr" />
+				<ref bean="javax.mail" />
 				<ref bean="misc/org.aspectj" />
 				<ref bean="misc/org.bouncycastle" />
 				<ref bean="spring/org.springframework" />
@@ -56,7 +58,6 @@
 				<!-- <ref bean="org.eclipse.gemini.web.extender" /> -->
 				<!-- <ref bean="org.eclipse.gemini.web.tomcat" /> -->
 				<!-- Jackrabbit -->
-				<ref bean="javax/javax.jcr" />
 				<ref bean="apache/org.apache.tika" />
 				<ref bean="apache/org.apache.lucene" />
 				<ref bean="apache/org.apache.jackrabbit" />
diff --git a/META-INF/spring/javax.xml b/META-INF/spring/javax.xml
index 386d12e..17a719b 100644
--- a/META-INF/spring/javax.xml
+++ b/META-INF/spring/javax.xml
@@ -7,30 +7,15 @@
 	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="javax.annotation" p:version="3.0.0" parent="template.javax" 
-		/> -->
-	<!-- <bean id="javax.el" p:version="2.2.0" parent="template.javax" /> -->
-	<!-- <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" p:version="1.0.0" p:groupId="org.argeo.tp.javax"
 		p:sourceCoords="javax.inject:javax.inject:1" parent="template.mavenWrapper" />
 
 	<bean id="javax.el" p:version="2.2.5" p:groupId="org.argeo.tp.javax"
 		p:sourceCoords="javax.el:javax.el-api:2.2.5" parent="template.mavenWrapper" />
 
-	<bean id="javax.jcr" flow:as-flow="javax/javax.jcr" p:version="2.0.0"
-		p:groupId="org.argeo.tp.javax" p:sourceCoords="javax.jcr:jcr:2.0"
-		parent="template.mavenWrapper" />
+	<bean id="javax.jcr" p:version="2.0.0" p:groupId="org.argeo.tp.javax"
+		p:sourceCoords="javax.jcr:jcr:2.0" parent="template.mavenWrapper" />
 
-	<!-- FACTORY -->
-<!-- 	<bean id="template.javax" parent="template.bndWrapper" abstract="true"> -->
-<!-- 		<property name="groupId" value="org.argeo.tp.javax" /> -->
-<!-- 		<property name="license"> -->
-<!-- 			<util:constant static-field="org.argeo.slc.repo.FreeLicense.CDDL" /> -->
-<!-- 		</property> -->
-<!-- 	</bean> -->
+	<bean id="javax.mail" p:groupId="org.argeo.tp.mail"
+		p:sourceCoords="com.sun.mail:javax.mail:1.5.2" parent="template.mavenWrapper" />
 </beans>
\ No newline at end of file
-- 
2.30.2