From c5f9754e3a0ce4f901027f88248ab26be063ec42 Mon Sep 17 00:00:00 2001
From: Gabriel Landais <glandais@kereval.com>
Date: Wed, 3 Aug 2011 15:25:28 +0000
Subject: [PATCH] PROXY-14
git-svn-id: https://scm.gforge.inria.fr/authscm/ycadoret/svn/gazelle/Maven/gazelle-proxy/trunk@23272 356b4b1a-1d2b-0410-8bf1-ffa24008f01e
---
.../net/ihe/gazelle/proxy/model/tm/TestInstance.java | 2 --
.../java/net/ihe/gazelle/proxy/ws/IProxyForTM.java | 6 ++++++
.../java/net/ihe/gazelle/proxy/ws/ProxyForTM.java | 9 +++++++++
gazelle-proxy-ws/pom.xml | 12 ------------
4 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/gazelle-proxy-datamodel/src/main/java/net/ihe/gazelle/proxy/model/tm/TestInstance.java b/gazelle-proxy-datamodel/src/main/java/net/ihe/gazelle/proxy/model/tm/TestInstance.java
index 5588da0f..357f2374 100644
--- a/gazelle-proxy-datamodel/src/main/java/net/ihe/gazelle/proxy/model/tm/TestInstance.java
+++ b/gazelle-proxy-datamodel/src/main/java/net/ihe/gazelle/proxy/model/tm/TestInstance.java
@@ -14,8 +14,6 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
-import org.hibernate.annotations.Fetch;
-
@Entity
@Table(name = "tm_testInstance", schema = "public")
@XmlAccessorType(XmlAccessType.NONE)
diff --git a/gazelle-proxy-ejb/src/main/java/net/ihe/gazelle/proxy/ws/IProxyForTM.java b/gazelle-proxy-ejb/src/main/java/net/ihe/gazelle/proxy/ws/IProxyForTM.java
index c37f9d5b..c8660f24 100644
--- a/gazelle-proxy-ejb/src/main/java/net/ihe/gazelle/proxy/ws/IProxyForTM.java
+++ b/gazelle-proxy-ejb/src/main/java/net/ihe/gazelle/proxy/ws/IProxyForTM.java
@@ -1,8 +1,11 @@
package net.ihe.gazelle.proxy.ws;
+import java.util.List;
+
import javax.jws.WebMethod;
import javax.jws.WebService;
+import net.ihe.gazelle.proxy.model.tm.Configuration;
import net.ihe.gazelle.proxy.model.tm.TestInstance;
@WebService
@@ -14,4 +17,7 @@ public interface IProxyForTM {
@WebMethod
void markTestStep(int testStepId);
+ @WebMethod
+ void startAllChannels(List<Configuration> configurations);
+
}
diff --git a/gazelle-proxy-ejb/src/main/java/net/ihe/gazelle/proxy/ws/ProxyForTM.java b/gazelle-proxy-ejb/src/main/java/net/ihe/gazelle/proxy/ws/ProxyForTM.java
index 8265ac93..caa2047a 100644
--- a/gazelle-proxy-ejb/src/main/java/net/ihe/gazelle/proxy/ws/ProxyForTM.java
+++ b/gazelle-proxy-ejb/src/main/java/net/ihe/gazelle/proxy/ws/ProxyForTM.java
@@ -30,6 +30,15 @@ public class ProxyForTM implements IProxyForTM {
super();
}
+ public void startAllChannels(List<Configuration> configurations) {
+ for (Configuration configuration : configurations) {
+ configuration.setTestInstance(null);
+ if (configuration.getProxyPort() > 0) {
+ startChannel(configuration);
+ }
+ }
+ }
+
@WebMethod
public void startTestInstance(TestInstance testInstance) {
Calendar endTI = Calendar.getInstance();
diff --git a/gazelle-proxy-ws/pom.xml b/gazelle-proxy-ws/pom.xml
index becec2fb..b3a17c79 100644
--- a/gazelle-proxy-ws/pom.xml
+++ b/gazelle-proxy-ws/pom.xml
@@ -34,18 +34,6 @@
<genWsdl>true</genWsdl>
</configuration>
</execution>
- <!-- <execution> -->
- <!-- <id>genJava</id> -->
- <!-- <phase>generate-sources</phase> -->
- <!-- <goals> -->
- <!-- <goal>wsimport</goal> -->
- <!-- </goals> -->
- <!-- <configuration> -->
- <!-- <packageName>net.ihe.gazelle.proxy.ws.client</packageName> -->
- <!-- <wsdlDirectory>${basedir}/target/jaxws/wsgen/wsdl</wsdlDirectory> -->
- <!-- </configuration> -->
- <!-- </execution> -->
-
</executions>
<dependencies>
--
GitLab