Remove Hibernate dependencies

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

diff --git a/eclipse/plugins/org.argeo.slc.client.core/META-INF/MANIFEST.MF b/eclipse/plugins/org.argeo.slc.client.core/META-INF/MANIFEST.MF
index ad655215e5816a1aeb895a7cef56f533da902bda..90fb8d0924197b4e26c2b825546e70406bd3249e 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.client.core/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.argeo.slc.client.core/META-INF/MANIFEST.MF
@@ -3,13 +3,9 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Core
 Bundle-SymbolicName: org.argeo.slc.client.core
 Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: com.springsource.org.hibernate;resolution:=optional
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.argeo.slc.client.core
 Import-Package: org.apache.commons.io;version="1.4.0",
  org.apache.commons.logging;version="1.1.1",
  org.argeo.slc.dao.process,
- org.argeo.slc.process,
- org.hibernate.hql.ast,
- org.hibernate.jdbc,
- org.osgi.framework;version="1.3.0"
+ org.argeo.slc.process

diff --git a/eclipse/plugins/org.argeo.slc.client.core/src/main/java/org/argeo/slc/client/core/ProcessListTableContent.java b/eclipse/plugins/org.argeo.slc.client.core/src/main/java/org/argeo/slc/client/core/ProcessListTableContent.java
index 68f6d7c8519cfc9281d333acf5cf74c4e58ccea1..2561eea9e64d234021b2b3a98e67fb438b35a2a4 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.client.core/src/main/java/org/argeo/slc/client/core/ProcessListTableContent.java
+++ b/eclipse/plugins/org.argeo.slc.client.core/src/main/java/org/argeo/slc/client/core/ProcessListTableContent.java
@@ -1,5 +1,6 @@
 package org.argeo.slc.client.core;
 
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
@@ -12,7 +13,7 @@ public class ProcessListTableContent implements TableContent {
        private static final Log log = LogFactory
                        .getLog(ProcessListTableContent.class);
 
-       private List<SlcExecution> slcExecutions;
+       private List<SlcExecution> slcExecutions = new ArrayList<SlcExecution>();
 
        // IoC
        private SlcExecutionDao slcExecutionDao;
@@ -29,24 +30,38 @@ public class ProcessListTableContent implements TableContent {
        }
 
        @Override
-       public String getLabel(Object o, int i) {
-               // TODO Auto-generated method stub
+       public synchronized String getLabel(Object o, int i) {
+               SlcExecution se = (SlcExecution) o;
+               switch (i) {
+
+               case 0:
+                       return "DATE";
+               case 1:
+                       return se.getHost();
+               case 2:
+                       return se.getUuid();
+               case 3:
+                       return "TYPE";
+               }
                return "test";
        }
 
-       public List<SlcExecution> getContent() {
+       public synchronized List<SlcExecution> getContent() {
                return this.slcExecutions;
        }
 
-       public void setContent() {
+       public synchronized void setContent() {
+               // Thread.currentThread().setContextClassLoader(null);
                List<SlcExecution> lst = slcExecutionDao.listSlcExecutions();
                if (lst.get(0) != null) {
-                       log.debug(lst.get(0).getStartDate());
+                       // log.debug(lst.get(0).getStartDate());
                        log.debug(lst.get(0).getHost());
                        log.debug(lst.get(0).getStatus());
                        log.debug(lst.get(0).getUuid());
                }
-               Iterator<SlcExecution> it = slcExecutions.iterator();
+
+               slcExecutions.clear();
+               Iterator<SlcExecution> it = lst.iterator();
                while (it.hasNext()) {
                        slcExecutions.add(it.next());
                }

diff --git a/eclipse/plugins/org.argeo.slc.client.hibernate/META-INF/MANIFEST.MF b/eclipse/plugins/org.argeo.slc.client.hibernate/META-INF/MANIFEST.MF
index 5e3de1d766c8543fbff64039e8ec64d3d2e0548c..4efd22a12141fb15705843a81cf4f726a604354c 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.client.hibernate/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.argeo.slc.client.hibernate/META-INF/MANIFEST.MF
@@ -4,7 +4,4 @@ Bundle-Name: Hibernate Interface for RCP Client
 Bundle-SymbolicName: org.argeo.slc.client.hibernate
 Bundle-Version: 1.0.0.qualifier
 Import-Package: org.argeo.slc.client.core,
- org.argeo.slc.dao.process;version="0.13.0.SNAPSHOT-r3777",
- org.hibernate.hql.ast,
- org.hibernate.jdbc
-
+ org.argeo.slc.dao.process;version="0.13.0.SNAPSHOT-r3777"

diff --git a/eclipse/plugins/org.argeo.slc.client.hibernate/META-INF/spring/core-osgi.xml b/eclipse/plugins/org.argeo.slc.client.hibernate/META-INF/spring/core-osgi.xml
index 5fe88485825e9a2745974afd105b241535cc8447..2b3f8f5c542498a1c2fc7c9fcec2dffaf3fc16bc 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.client.hibernate/META-INF/spring/core-osgi.xml
+++ b/eclipse/plugins/org.argeo.slc.client.hibernate/META-INF/spring/core-osgi.xml
@@ -8,7 +8,7 @@
 \r
        <!-- References Needed -->\r
        <reference id="slcExecutionDao" interface="org.argeo.slc.dao.process.SlcExecutionDao"\r
-       context-class-loader="service-provider" />\r
+               context-class-loader="service-provider" />\r
 \r
        <!-- Services exposed by the bundle -->\r
        <service ref="processListTableContent" interface="org.argeo.slc.client.core.TableContent" />\r

diff --git a/eclipse/plugins/org.argeo.slc.client.ui/META-INF/MANIFEST.MF b/eclipse/plugins/org.argeo.slc.client.ui/META-INF/MANIFEST.MF
index 25a4ede3aa23e107113e9d224888de60776adef2..4c5a0a656ab53ff571607a0ad4292157307ec805 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.client.ui/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.argeo.slc.client.ui/META-INF/MANIFEST.MF
@@ -5,9 +5,7 @@ Bundle-SymbolicName: org.argeo.slc.client.ui;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.argeo.slc.client.ui.ClientUiPlugin
 Require-Bundle: org.eclipse.ui;resolution:=optional,
- org.eclipse.core.runtime;resolution:=optional,
- com.springsource.org.hibernate;resolution:=optional,
- org.argeo.slc.specs
+ org.eclipse.core.runtime;resolution:=optional
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.argeo.slc.client.ui,
@@ -17,6 +15,7 @@ Import-Package: org.apache.commons.io;version="1.4.0",
  org.apache.commons.logging;version="1.1.1",
  org.argeo.eclipse.spring,
  org.argeo.eclipse.ui,
+ org.argeo.slc,
  org.argeo.slc.build;version="0.13.0.SNAPSHOT-r3685",
  org.argeo.slc.client.core,
  org.argeo.slc.core.attachment,
@@ -31,8 +30,6 @@ Import-Package: org.apache.commons.io;version="1.4.0",
  org.argeo.slc.services;version="0.13.0.SNAPSHOT-r3773",
  org.argeo.slc.services.impl;version="0.13.0.SNAPSHOT-r3777",
  org.argeo.slc.test,
- org.hibernate.hql.ast,
- org.hibernate.jdbc,
  org.springframework.beans.factory,
  org.springframework.context,
  org.springframework.core.io.support

diff --git a/eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/osgi.xml b/eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/osgi.xml
index 0632203ba030a478cedc0f6ecb0a0e8eb9772bd5..b7f2bf14ed141b8d6f3be66132b4cc7fed500a5c 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/osgi.xml
+++ b/eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/osgi.xml
@@ -8,8 +8,9 @@
 \r
        <!-- DAO -->\r
        <reference id="testResultCollectionDao"\r
-               interface="org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao" />\r
-       \r
+               interface="org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao"\r
+               context-class-loader="service-provider" />\r
+\r
        <!-- Services -->\r
        <reference id="slcExecutionService" interface="org.argeo.slc.services.SlcExecutionService" />\r
        <reference id="testManagerService" interface="org.argeo.slc.services.TestManagerService" />\r

diff --git a/modules/server/org.argeo.slc.server.hibernate/META-INF/MANIFEST.MF b/modules/server/org.argeo.slc.server.hibernate/META-INF/MANIFEST.MF
index 38e83331cf827732485f45f62bf01515f29ae9dd..5d1829949e641bff96ed69c99e33a26c6e15c6d1 100644 (file)
--- a/modules/server/org.argeo.slc.server.hibernate/META-INF/MANIFEST.MF
+++ b/modules/server/org.argeo.slc.server.hibernate/META-INF/MANIFEST.MF
@@ -20,6 +20,8 @@ Import-Package: org.aopalliance.aop,
  org.argeo.slc.runtime,
  org.argeo.slc.test,
  org.hibernate,
+ org.hibernate.hql.ast,
+ org.hibernate.jdbc,
  org.springframework.aop,
  org.springframework.aop.framework,
  org.springframework.orm.hibernate3,