You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2015/02/17 12:29:07 UTC
[03/50] [abbrv] incubator-taverna-server git commit: SOAP API changes.
SOAP API changes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/commit/ef0aeb09
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/tree/ef0aeb09
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/diff/ef0aeb09
Branch: refs/heads/master
Commit: ef0aeb09d6167a963a6f47700d48cca7fe693818
Parents: ef9a289
Author: Donal Fellows <do...@manchester.ac.uk>
Authored: Wed Mar 26 15:49:26 2014 +0000
Committer: Donal Fellows <do...@manchester.ac.uk>
Committed: Wed Mar 26 15:49:26 2014 +0000
----------------------------------------------------------------------
.../taverna/server/master/TavernaServer.java | 23 ++++++++++++++
.../server/master/common/InputDescription.java | 6 ++++
.../server/master/soap/TavernaServerSOAP.java | 32 ++++++++++++++++++++
3 files changed, 61 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/ef0aeb09/server-webapp/src/main/java/org/taverna/server/master/TavernaServer.java
----------------------------------------------------------------------
diff --git a/server-webapp/src/main/java/org/taverna/server/master/TavernaServer.java b/server-webapp/src/main/java/org/taverna/server/master/TavernaServer.java
index e2fe148..27e4255 100644
--- a/server-webapp/src/main/java/org/taverna/server/master/TavernaServer.java
+++ b/server-webapp/src/main/java/org/taverna/server/master/TavernaServer.java
@@ -65,6 +65,7 @@ import org.taverna.server.master.common.Status;
import org.taverna.server.master.common.Trust;
import org.taverna.server.master.common.Workflow;
import org.taverna.server.master.common.version.Version;
+import org.taverna.server.master.exceptions.BadPropertyValueException;
import org.taverna.server.master.exceptions.BadStateChangeException;
import org.taverna.server.master.exceptions.FilesystemAccessException;
import org.taverna.server.master.exceptions.InvalidCredentialException;
@@ -1141,6 +1142,28 @@ public abstract class TavernaServer implements TavernaServerSOAP,
@CallCounted
@PerfLogged
@RolesAllowed(USER)
+ public void setRunInputPortListDelimiter(String runName, String portName,
+ String delimiter) throws UnknownRunException, NoUpdateException,
+ BadStateChangeException, BadPropertyValueException {
+ TavernaRun w = support.getRun(runName);
+ support.permitUpdate(w);
+ Input i = support.getInput(w, portName);
+ if (i == null)
+ i = w.makeInput(portName);
+ if (delimiter != null) {
+ if (delimiter.length() > 1)
+ throw new BadPropertyValueException("delimiter too long");
+ if (delimiter.charAt(0) < 1 || delimiter.charAt(0) > 127)
+ throw new BadPropertyValueException(
+ "delimiter character must be non-NUL ASCII");
+ }
+ i.setDelimiter(delimiter);
+ }
+
+ @Override
+ @CallCounted
+ @PerfLogged
+ @RolesAllowed(USER)
public void setRunOutputBaclavaFile(String runName, String outputFile)
throws UnknownRunException, NoUpdateException,
FilesystemAccessException, BadStateChangeException {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/ef0aeb09/server-webapp/src/main/java/org/taverna/server/master/common/InputDescription.java
----------------------------------------------------------------------
diff --git a/server-webapp/src/main/java/org/taverna/server/master/common/InputDescription.java b/server-webapp/src/main/java/org/taverna/server/master/common/InputDescription.java
index f0e11f0..5e773a4 100644
--- a/server-webapp/src/main/java/org/taverna/server/master/common/InputDescription.java
+++ b/server-webapp/src/main/java/org/taverna/server/master/common/InputDescription.java
@@ -74,6 +74,11 @@ public class InputDescription extends VersionedElement {
@XmlAttribute(name = "portFile", required = false)
public String file;
/**
+ * The file assigned to this port.
+ */
+ @XmlAttribute(name = "listDelimiter", required = false)
+ public String delimiter;
+ /**
* The value assigned to this port.
*/
@XmlValue
@@ -99,6 +104,7 @@ public class InputDescription extends VersionedElement {
file = null;
value = input.getValue();
}
+ delimiter = input.getDelimiter();
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/ef0aeb09/server-webapp/src/main/java/org/taverna/server/master/soap/TavernaServerSOAP.java
----------------------------------------------------------------------
diff --git a/server-webapp/src/main/java/org/taverna/server/master/soap/TavernaServerSOAP.java b/server-webapp/src/main/java/org/taverna/server/master/soap/TavernaServerSOAP.java
index 7d0f818..4d02275 100644
--- a/server-webapp/src/main/java/org/taverna/server/master/soap/TavernaServerSOAP.java
+++ b/server-webapp/src/main/java/org/taverna/server/master/soap/TavernaServerSOAP.java
@@ -333,6 +333,38 @@ public interface TavernaServerSOAP {
BadStateChangeException, BadPropertyValueException;
/**
+ * Tells the given run to use the given list delimiter (a single-character
+ * string value) for splitting the input on the given port. Note that
+ * nullability of the delimiter is supported here.
+ *
+ * @param runName
+ * The handle of the run.
+ * @param portName
+ * The port to set the list delimiter for.
+ * @param delimiter
+ * The single-character value (in range U+00001..U+0007F) to use
+ * as the delimiter, or <tt>null</tt> for no delimiter at all.
+ * @throws UnknownRunException
+ * If the server doesn't know about the run or if the user is
+ * not permitted to see it.
+ * @throws NoUpdateException
+ * If the user isn't allowed to manipulate the run.
+ * @throws BadStateChangeException
+ * If the run is not in the {@link Status#Initialized
+ * Initialized} state.
+ * @throws BadPropertyValueException
+ * If the delimiter may not be changed to the given literal
+ * value.
+ */
+ @WSDLDocumentation("Tells the given run to use the given list delimiter (a single-character string value) for splitting the input on the given port. Note that nullability of the delimiter is supported here.")
+ void setRunInputPortListDelimiter(
+ @WebParam(name = "runName") String runName,
+ @WebParam(name = "portName") String portName,
+ @WebParam(name = "delimiter") String delimiter)
+ throws UnknownRunException, NoUpdateException,
+ BadStateChangeException, BadPropertyValueException;
+
+ /**
* Get the Baclava file where the output of the run will be written.
*
* @param runName