Adapt to changes in Argeo Commons

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 17fd7f5b4790e75f26bea9e057930b968392f5dd..5ff8e0a2a4c2a6e240ad2170461a3b2c1bcc0382 100644 (file)
--- 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"\r
                filter="(cn=ego)" />\r
                \r
-       <reference id="nodeInstance" interface="org.argeo.api.cms.CmsData" />\r
+       <reference id="nodeInstance" interface="org.argeo.api.cms.CmsContext" />\r
 \r
        <reference id="nodeFileSystemProvider" interface="java.nio.file.spi.FileSystemProvider"\r
                filter="(service.pid=org.argeo.api.fsProvider)" />\r

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 d485eeb9d54425ad9caf8bb70533f86813178129..10d9cb011f1297d66bcaab96aff000e62e77edbc 100644 (file)
--- 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 06856957cd6155283cd9becb4b92e90580fc9702..c40419c4de998a0be207dd32815b679c8424389f 100644 (file)
--- 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 00566cc50c70b27f88f0b0bbd51ec5117129d922..073315e92f4b072f790194cc015984f50b27378f 100644 (file)
--- 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 4b1e53439f355aa82440d71d1ee4dc6d09750d91..4e31f9c15ce817b2397b9df3c8add00064da9151 100644 (file)
--- 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,\