From 870bdf5efa0679c29a3fb340c50b47ef81504c64 Mon Sep 17 00:00:00 2001
From: mbaudier <mbaudier@argeo.org>
Date: Fri, 9 Oct 2015 17:52:29 +0200
Subject: [PATCH] Argeo TP v2.1.11 Add Bitronix Transaction Manager Remove
 Spring Security and Spring LDAP

---
 META-INF/MANIFEST.MF             |  4 ++--
 META-INF/spring/distribution.xml |  5 +++--
 META-INF/spring/misc.xml         | 16 ++++++++++++++++
 pom.xml                          |  2 +-
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 20281d9..0808a97 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
-Bnd-LastModified: 1443975788093
+Bnd-LastModified: 1444405858936
 Build-Jdk: 1.7.0_85
 Built-By: mbaudier
 Bundle-Description: SLC execution modules for generic tasks, to be used 
@@ -11,7 +11,7 @@ Bundle-Name: Third Party Factory
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-SymbolicName: org.argeo.tp.factory.core
 Bundle-Vendor: Argeo
-Bundle-Version: 2.1.11.SNAPSHOT-r151004_1823
+Bundle-Version: 2.1.11.r151009_1750
 Created-By: Apache Maven Bundle Plugin
 Import-Package: javax.jcr;version="[2.0,3)",javax.security.auth.callback
  ;resolution:=optional,net.sf.cglib.core;version="[2.1,3)",net.sf.cglib.
diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 7b53574..dad8c95 100644
--- 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 bf3df95..7d98f63 100644
--- 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 a4fde8a..70817fb 100644
--- 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>
-- 
2.30.2