From a8ec37fa9b7c8d0c1d071b4b9309f59dc0e1e930 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 2 Mar 2009 10:02:04 +0000 Subject: [PATCH] Adapt to JDK 1.6 git-svn-id: https://svn.argeo.org/slc/trunk@2211 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../org.eclipse.osgi/.manager/.fileTable.1 | 4 ---- .../org.eclipse.osgi/.manager/.fileTable.2 | 5 ----- .../org.eclipse.osgi/.manager/.fileTableLock | 0 .../org/argeo/slc/detached/launcher/Main.java | 2 +- org.argeo.slc/pom.xml | 7 +++++- .../org.argeo.slc.support.hibernate/pom.xml | 3 ++- server/org.argeo.slc.siteserver/.classpath | 2 +- server/org.argeo.slc.siteserver/pom.xml | 22 ++++++++++++------- 8 files changed, 24 insertions(+), 21 deletions(-) delete mode 100644 org.argeo.slc.detached.launcher/slc-detached/equinoxConfiguration/org.eclipse.osgi/.manager/.fileTable.1 delete mode 100644 org.argeo.slc.detached.launcher/slc-detached/equinoxConfiguration/org.eclipse.osgi/.manager/.fileTable.2 delete mode 100644 org.argeo.slc.detached.launcher/slc-detached/equinoxConfiguration/org.eclipse.osgi/.manager/.fileTableLock diff --git a/org.argeo.slc.detached.launcher/slc-detached/equinoxConfiguration/org.eclipse.osgi/.manager/.fileTable.1 b/org.argeo.slc.detached.launcher/slc-detached/equinoxConfiguration/org.eclipse.osgi/.manager/.fileTable.1 deleted file mode 100644 index bc534bcc4..000000000 --- a/org.argeo.slc.detached.launcher/slc-detached/equinoxConfiguration/org.eclipse.osgi/.manager/.fileTable.1 +++ /dev/null @@ -1,4 +0,0 @@ -#safe table -#Sat Feb 21 15:16:18 CET 2009 -.state=0 -.crc31e76cd2.v1 diff --git a/org.argeo.slc.detached.launcher/slc-detached/equinoxConfiguration/org.eclipse.osgi/.manager/.fileTable.2 b/org.argeo.slc.detached.launcher/slc-detached/equinoxConfiguration/org.eclipse.osgi/.manager/.fileTable.2 deleted file mode 100644 index 292c7208b..000000000 --- a/org.argeo.slc.detached.launcher/slc-detached/equinoxConfiguration/org.eclipse.osgi/.manager/.fileTable.2 +++ /dev/null @@ -1,5 +0,0 @@ -#safe table -#Sat Feb 21 15:16:18 CET 2009 -.state=0 -.lazy=0 -.crc2f3b06c9.v1 diff --git a/org.argeo.slc.detached.launcher/slc-detached/equinoxConfiguration/org.eclipse.osgi/.manager/.fileTableLock b/org.argeo.slc.detached.launcher/slc-detached/equinoxConfiguration/org.eclipse.osgi/.manager/.fileTableLock deleted file mode 100644 index e69de29bb..000000000 diff --git a/org.argeo.slc.detached.launcher/src/main/java/org/argeo/slc/detached/launcher/Main.java b/org.argeo.slc.detached.launcher/src/main/java/org/argeo/slc/detached/launcher/Main.java index 131975088..807963e14 100644 --- a/org.argeo.slc.detached.launcher/src/main/java/org/argeo/slc/detached/launcher/Main.java +++ b/org.argeo.slc.detached.launcher/src/main/java/org/argeo/slc/detached/launcher/Main.java @@ -196,7 +196,7 @@ public class Main { private static void startBundle(BundleContext bundleContext, String symbolicName) throws BundleException { - info("Starting bundle " + symbolicName + "..."); + //info("Starting bundle " + symbolicName + "..."); Bundle bundle = findBundleBySymbolicName(bundleContext, symbolicName); if (bundle != null) bundle.start(); diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml index fcf9d8b20..9c3b2cab3 100644 --- a/org.argeo.slc/pom.xml +++ b/org.argeo.slc/pom.xml @@ -530,6 +530,11 @@ limitations under the License. com.springsource.net.sf.cglib 2.1.3 + + org.objectweb.asm + com.springsource.org.objectweb.asm + 2.2.0 + org.objectweb.asm com.springsource.org.objectweb.asm.attrs @@ -787,7 +792,7 @@ limitations under the License. org.argeo.dep.osgi org.argeo.dep.osgi.activemq - 5.2.0.argeo.1 + 5.2.0.argeo.2 diff --git a/runtime/org.argeo.slc.support.hibernate/pom.xml b/runtime/org.argeo.slc.support.hibernate/pom.xml index 2de824bdc..6b3b43828 100644 --- a/runtime/org.argeo.slc.support.hibernate/pom.xml +++ b/runtime/org.argeo.slc.support.hibernate/pom.xml @@ -38,11 +38,12 @@ *,org.argeo.slc.*;resolution:=optional, org.argeo.slc.execution;resolution:=optional, + org.argeo.slc.runtime;resolution:=optional, + org.argeo.slc.structure;resolution:=optional, org.argeo.slc.core.structure;resolution:=optional, org.argeo.slc.core.structure.tree;resolution:=optional, org.argeo.slc.core.test;resolution:=optional, org.argeo.slc.core.test.tree;resolution:=optional, - org.argeo.slc.runtime;resolution:=optional, org.argeo.slc.core.execution;resolution:=optional, org.argeo.slc.msg;resolution:=optional, org.argeo.slc.msg.process;resolution:=optional, diff --git a/server/org.argeo.slc.siteserver/.classpath b/server/org.argeo.slc.siteserver/.classpath index 16f01e2ee..e76cb95e2 100644 --- a/server/org.argeo.slc.siteserver/.classpath +++ b/server/org.argeo.slc.siteserver/.classpath @@ -1,7 +1,7 @@ - + diff --git a/server/org.argeo.slc.siteserver/pom.xml b/server/org.argeo.slc.siteserver/pom.xml index 28e3c033c..870d5717d 100644 --- a/server/org.argeo.slc.siteserver/pom.xml +++ b/server/org.argeo.slc.siteserver/pom.xml @@ -11,7 +11,7 @@ pom Argeo SLC Site server - 1.1.3 + 1.1.2 2.5.5 @@ -144,6 +144,12 @@ javax.xml.bind com.springsource.javax.xml.bind + + + org.aopalliance + com.springsource.org.aopalliance + 1.0.0 + - org.springframework.osgi spring-osgi-web @@ -251,11 +257,6 @@ ${spring-osgi.version} - - org.aopalliance - com.springsource.org.aopalliance - 1.0.0 - org.springframework @@ -274,7 +275,6 @@ ${spring.version} - com.sun.xml @@ -290,6 +290,12 @@ 6.1.9 + + com.thoughtworks.xstream + com.springsource.com.thoughtworks.xstream + 1.2.2 + + org.argeo.slc -- 2.39.5