From: Mathieu Baudier Date: Wed, 22 Sep 2010 18:19:45 +0000 (+0000) Subject: Remove Hibernate dependencies X-Git-Tag: argeo-slc-2.1.7~1156 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=3783af8b638cfabcc728c2292e469500ca4b62cf;p=gpl%2Fargeo-slc.git 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 ad655215e..90fb8d092 100644 --- 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 68f6d7c85..2561eea9e 100644 --- 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 slcExecutions; + private List slcExecutions = new ArrayList(); // 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 getContent() { + public synchronized List getContent() { return this.slcExecutions; } - public void setContent() { + public synchronized void setContent() { + // Thread.currentThread().setContextClassLoader(null); List 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 it = slcExecutions.iterator(); + + slcExecutions.clear(); + Iterator 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 5e3de1d76..4efd22a12 100644 --- 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 5fe884858..2b3f8f5c5 100644 --- 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 @@ + context-class-loader="service-provider" /> 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 25a4ede3a..4c5a0a656 100644 --- 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 0632203ba..b7f2bf14e 100644 --- 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 @@ - + interface="org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao" + context-class-loader="service-provider" /> + 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 38e83331c..5d1829949 100644 --- 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,