Argeo TP v2.1.11

Add Bitronix Transaction Manager
Remove Spring Security and Spring LDAP

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 20281d9040a219ea276c28c079e8549f441fb174..0808a97cd8f24f5f7568cca858e545aee8396dcf 100644 (file)
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0\r
-Bnd-LastModified: 1443975788093\r
+Bnd-LastModified: 1444405858936\r
 Build-Jdk: 1.7.0_85\r
 Built-By: mbaudier\r
 Bundle-Description: SLC execution modules for generic tasks, to be used \r
@@ -11,7 +11,7 @@ Bundle-Name: Third Party Factory
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6\r
 Bundle-SymbolicName: org.argeo.tp.factory.core\r
 Bundle-Vendor: Argeo\r
-Bundle-Version: 2.1.11.SNAPSHOT-r151004_1823\r
+Bundle-Version: 2.1.11.r151009_1750\r
 Created-By: Apache Maven Bundle Plugin\r
 Import-Package: javax.jcr;version="[2.0,3)",javax.security.auth.callback\r
  ;resolution:=optional,net.sf.cglib.core;version="[2.1,3)",net.sf.cglib.\r

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 7b535745353485fde0113bdf5547b6c2d76814f8..dad8c9540cfef8502e831574dd4e3dc0364a60ae 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -38,6 +38,7 @@
                                <ref bean="apache/org.apache.ant" />
                                <ref bean="org.quartz-scheduler.quartz" />
                                <ref bean="org.quartz-scheduler.quartz.jobs" />
+                               <ref bean="bitronix.tm" />
 
                                <!-- Apache Commons -->
                                <ref bean="apache/org.apache.commons.io" />
@@ -69,8 +70,8 @@
                                
                                <!-- Spring -->
                                <ref bean="spring/org.springframework" />
-                               <ref bean="org.springframework.ldap" />
-                               <ref bean="spring/org.springframework.security" />
+<!--                           <ref bean="org.springframework.ldap" /> -->
+<!--                           <ref bean="spring/org.springframework.security" /> -->
                        </list>
                </property>
        </bean>

diff --git a/META-INF/spring/misc.xml b/META-INF/spring/misc.xml
index bf3df95b5262450307b75a700f4ae34333267df6..7d98f6358725beae40bc76b6e34fad77ba5cc70b 100644 (file)
--- a/META-INF/spring/misc.xml
+++ b/META-INF/spring/misc.xml
@@ -152,6 +152,22 @@
                        </props>
                </property>
        </bean>
+       
+       <bean id="bitronix.tm" p:sourceCoords="org.codehaus.btm:btm:2.1.4"
+               parent="template.mavenWrapper">
+               <property name="license">
+                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+               </property>
+               <property name="bndProperties">
+                       <props merge="true">
+                               <prop key="Import-Package">
+                                       javax.jms;resolution:=optional,
+                                       javax.swing.*;resolution:=optional,
+                                       *
+                               </prop>
+                       </props>
+               </property>
+       </bean>
 
        <flow:flow name="misc/org.slf4j" spec="spec.version">
                <flow:arg name="version" value="1.7.5" />

diff --git a/pom.xml b/pom.xml
index a4fde8a67f469d1b3df890be759b512fbac2aed1..70817fbda7ab0186719600ac23524bea359f8ee1 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
        </parent>
        <groupId>org.argeo.tp.factory</groupId>
        <artifactId>org.argeo.tp.factory.core</artifactId>
-       <version>2.1.11-SNAPSHOT</version>
+       <version>2.1.11</version>
        <name>Third Party Factory</name>
        <properties>
                <additionalImports.slc-lib>