From 82ce036ceb9e151dfc8ba46b6568929a22245099 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 3 Feb 2022 10:16:48 +0100
Subject: [PATCH] Adapt to changes in Argeo Commons

---
 .../org.argeo.cms.ui.workbench/META-INF/spring/osgi.xml      | 2 +-
 legacy/argeo-commons/org.argeo.cms.ui.workbench/bnd.bnd      | 1 +
 legacy/dep/org.argeo.slc.dep.spring/pom.xml                  | 5 +++++
 legacy/org.argeo.slc.agent.jcr/bnd.bnd                       | 1 +
 legacy/org.argeo.slc.spring/bnd.bnd                          | 1 +
 5 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/META-INF/spring/osgi.xml b/legacy/argeo-commons/org.argeo.cms.ui.workbench/META-INF/spring/osgi.xml
index 17fd7f5b4..5ff8e0a2a 100644
--- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/META-INF/spring/osgi.xml
+++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/META-INF/spring/osgi.xml
@@ -20,7 +20,7 @@
 	<reference id="nodeRepository" interface="javax.jcr.Repository"
 		filter="(cn=ego)" />
 		
-	<reference id="nodeInstance" interface="org.argeo.api.cms.CmsData" />
+	<reference id="nodeInstance" interface="org.argeo.api.cms.CmsContext" />
 
 	<reference id="nodeFileSystemProvider" interface="java.nio.file.spi.FileSystemProvider"
 		filter="(service.pid=org.argeo.api.fsProvider)" />
diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/bnd.bnd b/legacy/argeo-commons/org.argeo.cms.ui.workbench/bnd.bnd
index d485eeb9d..10d9cb011 100644
--- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/bnd.bnd
+++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/bnd.bnd
@@ -6,6 +6,7 @@ Require-Bundle:	org.eclipse.core.runtime,\
 org.eclipse.core.commands
 
 Import-Package:	org.argeo.cms.auth,\
+org.argeo.api.cms,\
 org.argeo.cms,\
 org.argeo.cms.ui,\
 org.argeo.eclipse.spring,\
diff --git a/legacy/dep/org.argeo.slc.dep.spring/pom.xml b/legacy/dep/org.argeo.slc.dep.spring/pom.xml
index 06856957c..c40419c4d 100644
--- a/legacy/dep/org.argeo.slc.dep.spring/pom.xml
+++ b/legacy/dep/org.argeo.slc.dep.spring/pom.xml
@@ -49,6 +49,11 @@
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
 
+		<!-- Spring dependencies -->
+		<dependency>
+			<groupId>org.argeo.tp.apache</groupId>
+			<artifactId>org.apache.log4j</artifactId>
+		</dependency>
 		<!-- Not strictly Spring dependencies but used by the old approach -->
 		<dependency>
 			<groupId>org.argeo.tp.apache.ant</groupId>
diff --git a/legacy/org.argeo.slc.agent.jcr/bnd.bnd b/legacy/org.argeo.slc.agent.jcr/bnd.bnd
index 00566cc50..073315e92 100644
--- a/legacy/org.argeo.slc.agent.jcr/bnd.bnd
+++ b/legacy/org.argeo.slc.agent.jcr/bnd.bnd
@@ -18,4 +18,5 @@ org.apache.commons.vfs2.provider.temp,\
 org.apache.commons.vfs2.provider.webdav,\
 org.apache.commons.vfs2.provider.zip,\
 org.osgi.*;version=0.0.0,\
+org.argeo.cms.auth,\
 *
diff --git a/legacy/org.argeo.slc.spring/bnd.bnd b/legacy/org.argeo.slc.spring/bnd.bnd
index 4b1e53439..4e31f9c15 100644
--- a/legacy/org.argeo.slc.spring/bnd.bnd
+++ b/legacy/org.argeo.slc.spring/bnd.bnd
@@ -4,6 +4,7 @@ aQute.bnd.osgi,\
 org.apache.tools.ant.*;resolution:="optional",\
 junit.framework;resolution:="optional",\
 org.osgi.*;version=0.0.0,\
+org.argeo.cms.auth,\
 *
 
 Export-Package: org.argeo.slc.core.test,\
-- 
2.39.2