Adapt to JDK 1.6

git-svn-id: https://svn.argeo.org/slc/trunk@2211 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

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 (file)
index bc534bc..0000000
--- 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 (file)
index 292c720..0000000
--- 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 (file)
index e69de29..0000000

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 1319750885eab2ba0e658670d640ff47114c1aea..807963e14f400a851b65a2abd153edc2d9cca2ee 100644 (file)
--- 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 fcf9d8b20722971091dabfba73ec220641c02044..9c3b2cab32ef891eef216cce470a7d9317e4ecb1 100644 (file)
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -530,6 +530,11 @@ limitations under the License.
                                <artifactId>com.springsource.net.sf.cglib</artifactId>
                                <version>2.1.3</version>
                        </dependency>
+                       <dependency>
+                               <groupId>org.objectweb.asm</groupId>
+                               <artifactId>com.springsource.org.objectweb.asm</artifactId>
+                               <version>2.2.0</version>
+                       </dependency>
                        <dependency>
                                <groupId>org.objectweb.asm</groupId>
                                <artifactId>com.springsource.org.objectweb.asm.attrs</artifactId>
@@ -787,7 +792,7 @@ limitations under the License.
                        <dependency>
                                <groupId>org.argeo.dep.osgi</groupId>
                                <artifactId>org.argeo.dep.osgi.activemq</artifactId>
-                               <version>5.2.0.argeo.1</version>
+                               <version>5.2.0.argeo.2</version>
                        </dependency>
 
                        <dependency>

diff --git a/runtime/org.argeo.slc.support.hibernate/pom.xml b/runtime/org.argeo.slc.support.hibernate/pom.xml
index 2de824bdc271ab4c7f23249cad79fd5527ed7420..6b3b43828192040659265c227ac86e23a22da458 100644 (file)
--- a/runtime/org.argeo.slc.support.hibernate/pom.xml
+++ b/runtime/org.argeo.slc.support.hibernate/pom.xml
@@ -38,11 +38,12 @@
                                                </Export-Package>
                                                <Import-Package>*,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 16f01e2ee7b671c44c26c453773dab706e98da1e..e76cb95e244c16f7807bcf10749640cbacd170ae 100644 (file)
--- a/server/org.argeo.slc.siteserver/.classpath
+++ b/server/org.argeo.slc.siteserver/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" output="target/classes" path="src/main/java"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
        <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
        <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/server/org.argeo.slc.siteserver/pom.xml b/server/org.argeo.slc.siteserver/pom.xml
index 28e3c033c9a4c1a5321719a3a90afb608f6c67a7..870d5717dda1db82111e172099bd6e10b60e9115 100644 (file)
--- a/server/org.argeo.slc.siteserver/pom.xml
+++ b/server/org.argeo.slc.siteserver/pom.xml
@@ -11,7 +11,7 @@
        <packaging>pom</packaging>
        <name>Argeo SLC Site server</name>
        <properties>
-               <spring-osgi.version>1.1.3</spring-osgi.version>
+               <spring-osgi.version>1.1.2</spring-osgi.version>
                <spring.version>2.5.5</spring.version>
        </properties>
        <build>
@@ -144,6 +144,12 @@
                        <groupId>javax.xml.bind</groupId>
                        <artifactId>com.springsource.javax.xml.bind</artifactId>
                </dependency>
+
+               <dependency>
+                       <groupId>org.aopalliance</groupId>
+                       <artifactId>com.springsource.org.aopalliance</artifactId>
+                       <version>1.0.0</version>
+               </dependency>
                <!--
                        <dependency> <groupId>org.springframework.osgi</groupId>
                        <artifactId>org.springframework.osgi.web.extender</artifactId>
@@ -154,7 +160,6 @@
                        <groupId>org.springframework.osgi</groupId>
                        <artifactId>org.springframework.osgi.web</artifactId> </dependency>
                -->
-
                <!--
                        Using springsource repo <dependency>
                        <groupId>org.springframework.osgi</groupId>
@@ -233,6 +238,7 @@
                        <type>jar</type>
                </dependency>
 
+               <!-- -->
                <dependency>
                        <groupId>org.springframework.osgi</groupId>
                        <artifactId>spring-osgi-web</artifactId>
@@ -251,11 +257,6 @@
                        <version>${spring-osgi.version}</version>
                </dependency>
 
-               <dependency>
-                       <groupId>org.aopalliance</groupId>
-                       <artifactId>com.springsource.org.aopalliance</artifactId>
-                       <version>1.0.0</version>
-               </dependency>
 
                <dependency>
                        <groupId>org.springframework</groupId>
@@ -274,7 +275,6 @@
                        <version>${spring.version}</version>
                </dependency>
 
-
                <!-- Required in JDK 1.5 -->
                <dependency>
                        <groupId>com.sun.xml</groupId>
@@ -290,6 +290,12 @@
                        <version>6.1.9</version>
                </dependency>
 
+               <dependency>
+                       <groupId>com.thoughtworks.xstream</groupId>
+                       <artifactId>com.springsource.com.thoughtworks.xstream</artifactId>
+                       <version>1.2.2</version>
+               </dependency>
+               
                <!-- To launch OSGi -->
                <dependency>
                        <groupId>org.argeo.slc</groupId>