From 08a8842a24c5dfb64162072fb73f8c7b34bfd60f Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 13 Mar 2020 09:56:45 +0100
Subject: [PATCH] Adapt to changes in Argeo Platform.

---
 org.argeo.tp.factory.core/META-INF/MANIFEST.MF               | 5 +++--
 org.argeo.tp.factory.core/META-INF/spring/bouncycastle.xml   | 2 +-
 .../META-INF/spring/eclipse.equinox.xml                      | 2 +-
 org.argeo.tp.factory.core/META-INF/spring/templates.xml      | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/org.argeo.tp.factory.core/META-INF/MANIFEST.MF b/org.argeo.tp.factory.core/META-INF/MANIFEST.MF
index 7bfcca4..cf5d583 100644
--- a/org.argeo.tp.factory.core/META-INF/MANIFEST.MF
+++ b/org.argeo.tp.factory.core/META-INF/MANIFEST.MF
@@ -7,12 +7,13 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Argeo Third Party Factory
 Bundle-RequiredExecutionEnvironment: JavaSE-11,JavaSE-1.8
 Bundle-SymbolicName: org.argeo.tp.factory.core
-Bundle-Version: 2.1.28.SNAPSHOT-r20200216092056
+Bundle-Version: 2.1.28.SNAPSHOT-r20200313085348
 Import-Package: 
  javax.jcr;version="[2.0,3)",
  org.argeo.cms.spring;version="[2.1,3)",
  org.argeo.slc.repo;version="[2.1,3)",
  org.argeo.slc.repo.osgi;version="[2.1,3)",
+ org.argeo.slc.spring.repo.osgi;version="[2.1,3)",
  org.springframework.cglib.proxy;resolution:=optional;version="[3.2,4)",
  org.springframework.cglib.core;resolution:=optional;version="[3.2,4)",
  org.springframework.cglib.reflect;resolution:=optional;version="[3.2,4)
@@ -49,6 +50,6 @@ Include-Resource: META-INF/spring/eclipse.jetty.xml=META-INF/spring/ecli
  spring/eclipse.rap.e4.xml,META-INF/spring/bouncycastle.xml=META-INF/spr
  ing/bouncycastle.xml
 Private-Package: !*
-SLC-Build-Timestamp: 20200216092056
+SLC-Build-Timestamp: 20200313085348
 SLC-Category: org.argeo.tp.factory
 SLC-ExecutionModule: default
diff --git a/org.argeo.tp.factory.core/META-INF/spring/bouncycastle.xml b/org.argeo.tp.factory.core/META-INF/spring/bouncycastle.xml
index bce7570..213d83f 100644
--- a/org.argeo.tp.factory.core/META-INF/spring/bouncycastle.xml
+++ b/org.argeo.tp.factory.core/META-INF/spring/bouncycastle.xml
@@ -59,7 +59,7 @@
 	</flow:flow>
 
 	<!-- FACTORY -->
-	<bean id="template.bouncycastle" class="org.argeo.slc.repo.osgi.UriWrapper"
+	<bean id="template.bouncycastle" class="org.argeo.slc.spring.repo.osgi.UriWrapper"
 		abstract="true">
 		<property name="version" value="@{version}" />
 		<property name="groupId" value="org.argeo.tp.bouncycastle" />
diff --git a/org.argeo.tp.factory.core/META-INF/spring/eclipse.equinox.xml b/org.argeo.tp.factory.core/META-INF/spring/eclipse.equinox.xml
index 3c86a80..c8d2306 100644
--- a/org.argeo.tp.factory.core/META-INF/spring/eclipse.equinox.xml
+++ b/org.argeo.tp.factory.core/META-INF/spring/eclipse.equinox.xml
@@ -80,7 +80,7 @@
 	<!-- spec="equinoxVersion.spec"> -->
 	<!-- <flow:arg name="equinoxRelease" value="4.4.1" /> -->
 	<!-- <flow:arg name="equinoxTimestamp" value="201409250400" /> -->
-	<!-- <bean id="org.eclipse.jdt.core.compiler.batch" class="org.argeo.slc.repo.osgi.UriWrapper"> -->
+	<!-- <bean id="org.eclipse.jdt.core.compiler.batch" class="org.argeo.slc.spring.repo.osgi.UriWrapper"> -->
 	<!-- <property name="version" value="3.10.0.v20140902-0626" /> -->
 	<!-- <property name="uri" -->
 	<!-- value="http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-@{equinoxRelease}-@{equinoxTimestamp}/ecj-@{equinoxRelease}.jar" 
diff --git a/org.argeo.tp.factory.core/META-INF/spring/templates.xml b/org.argeo.tp.factory.core/META-INF/spring/templates.xml
index 2a2283f..9cf8de7 100644
--- a/org.argeo.tp.factory.core/META-INF/spring/templates.xml
+++ b/org.argeo.tp.factory.core/META-INF/spring/templates.xml
@@ -22,7 +22,7 @@
 	</bean>
 
 	<bean id="template.bndWrapper"
-		class="org.argeo.slc.repo.osgi.BndWrapper" abstract="true">
+		class="org.argeo.slc.spring.repo.osgi.BndWrapper" abstract="true">
 		<property name="groupId" value="org.argeo.tp.misc" />
 		<property name="bndProperties">
 			<props>
@@ -31,7 +31,7 @@
 		</property>
 	</bean>
 	<bean id="template.mavenWrapper"
-		class="org.argeo.slc.repo.osgi.MavenWrapper" abstract="true">
+		class="org.argeo.slc.spring.repo.osgi.MavenWrapper" abstract="true">
 		<property name="groupId" value="org.argeo.tp.misc" />
 		<property name="bndProperties">
 			<props>
-- 
2.30.2