Add Javax Mail

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index bf7883c865319fc7379c1f1ecc7d8ee0101097dc..b88cdd5bde74b42efec30164f32ddb89d045da3f 100644 (file)
--- 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 386d12ede92155868eb1f97575f5babcd7a75964..17a719b9af1aea966311402ca9dbc61f572982e3 100644 (file)
--- 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