Repository: incubator-taverna-server Updated Branches: refs/heads/master 75fab3e10 -> 7afe2476b
Use org.apache.taverna taverna-language package name 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/667b4e5c Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/tree/667b4e5c Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/diff/667b4e5c Branch: refs/heads/master Commit: 667b4e5c08bfc8d5af86a4adf2986fb5cd5d871a Parents: 75fab3e Author: Stian Soiland-Reyes <[email protected]> Authored: Mon Feb 22 14:39:35 2016 +0000 Committer: Stian Soiland-Reyes <[email protected]> Committed: Mon Feb 22 14:41:03 2016 +0000 ---------------------------------------------------------------------- .../server/execution_delegate/ExecutionDelegate.java | 2 +- .../server/master/ContentsDescriptorBuilder.java | 8 ++++---- .../org/taverna/server/master/TavernaServerSupport.java | 2 +- .../java/org/taverna/server/master/common/Workflow.java | 12 ++++++------ .../master/localworker/AbstractRemoteRunFactory.java | 2 +- .../master/rest/handler/Scufl2DocumentHandler.java | 6 +++--- .../org/taverna/server/master/soap/WrappedWorkflow.java | 6 +++--- .../server/localworker/impl/TavernaRunManager.java | 5 +++-- 8 files changed, 22 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/667b4e5c/taverna-server-execution-delegate/src/main/java/org/taverna/server/execution_delegate/ExecutionDelegate.java ---------------------------------------------------------------------- diff --git a/taverna-server-execution-delegate/src/main/java/org/taverna/server/execution_delegate/ExecutionDelegate.java b/taverna-server-execution-delegate/src/main/java/org/taverna/server/execution_delegate/ExecutionDelegate.java index 7ea9998..f83d9c0 100644 --- a/taverna-server-execution-delegate/src/main/java/org/taverna/server/execution_delegate/ExecutionDelegate.java +++ b/taverna-server-execution-delegate/src/main/java/org/taverna/server/execution_delegate/ExecutionDelegate.java @@ -21,7 +21,7 @@ import uk.org.taverna.platform.report.ActivityReport; import uk.org.taverna.platform.report.ProcessorReport; import uk.org.taverna.platform.report.StatusReport; import uk.org.taverna.platform.report.WorkflowReport; -import uk.org.taverna.scufl2.api.common.AbstractNamed; +import org.apache.taverna.scufl2.api.common.AbstractNamed; public class ExecutionDelegate extends UnicastRemoteObject implements RemoteExecution { http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/667b4e5c/taverna-server-webapp/src/main/java/org/taverna/server/master/ContentsDescriptorBuilder.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/ContentsDescriptorBuilder.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/ContentsDescriptorBuilder.java index f5259bd..aee4425 100644 --- a/taverna-server-webapp/src/main/java/org/taverna/server/master/ContentsDescriptorBuilder.java +++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/ContentsDescriptorBuilder.java @@ -42,10 +42,10 @@ import org.taverna.server.port_description.ListValue; import org.taverna.server.port_description.OutputDescription; import org.taverna.server.port_description.OutputDescription.OutputPort; -import uk.org.taverna.scufl2.api.container.WorkflowBundle; -import uk.org.taverna.scufl2.api.core.Workflow; -import uk.org.taverna.scufl2.api.port.InputWorkflowPort; -import uk.org.taverna.scufl2.api.port.OutputWorkflowPort; +import org.apache.taverna.scufl2.api.container.WorkflowBundle; +import org.apache.taverna.scufl2.api.core.Workflow; +import org.apache.taverna.scufl2.api.port.InputWorkflowPort; +import org.apache.taverna.scufl2.api.port.OutputWorkflowPort; /** * A class that is used to build descriptions of the contents of a workflow http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/667b4e5c/taverna-server-webapp/src/main/java/org/taverna/server/master/TavernaServerSupport.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/TavernaServerSupport.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/TavernaServerSupport.java index ce36bd3..99a666f 100644 --- a/taverna-server-webapp/src/main/java/org/taverna/server/master/TavernaServerSupport.java +++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/TavernaServerSupport.java @@ -80,7 +80,7 @@ import org.taverna.server.master.utils.FilenameUtils; import org.taverna.server.master.utils.InvocationCounter; import org.taverna.server.master.utils.UsernamePrincipal; -import uk.org.taverna.scufl2.api.profiles.Profile; +import org.apache.taverna.scufl2.api.profiles.Profile; /** * Web application support utilities. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/667b4e5c/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Workflow.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Workflow.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Workflow.java index ba6a68c..1b00eb2 100644 --- a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Workflow.java +++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Workflow.java @@ -45,12 +45,12 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import org.xml.sax.SAXException; -import uk.org.taverna.scufl2.api.common.NamedSet; -import uk.org.taverna.scufl2.api.container.WorkflowBundle; -import uk.org.taverna.scufl2.api.io.ReaderException; -import uk.org.taverna.scufl2.api.io.WorkflowBundleIO; -import uk.org.taverna.scufl2.api.io.WriterException; -import uk.org.taverna.scufl2.api.profiles.Profile; +import org.apache.taverna.scufl2.api.common.NamedSet; +import org.apache.taverna.scufl2.api.container.WorkflowBundle; +import org.apache.taverna.scufl2.api.io.ReaderException; +import org.apache.taverna.scufl2.api.io.WorkflowBundleIO; +import org.apache.taverna.scufl2.api.io.WriterException; +import org.apache.taverna.scufl2.api.profiles.Profile; import org.w3c.dom.Node; import org.w3c.dom.NodeList; http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/667b4e5c/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/AbstractRemoteRunFactory.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/AbstractRemoteRunFactory.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/AbstractRemoteRunFactory.java index fc7f881..8911e92 100644 --- a/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/AbstractRemoteRunFactory.java +++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/AbstractRemoteRunFactory.java @@ -59,7 +59,7 @@ import org.taverna.server.master.worker.FactoryBean; import org.taverna.server.master.worker.RemoteRunDelegate; import org.taverna.server.master.worker.RunFactoryConfiguration; -import uk.org.taverna.scufl2.api.io.WriterException; +import org.apache.taverna.scufl2.api.io.WriterException; /** * Bridge to remote runs via RMI. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/667b4e5c/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/Scufl2DocumentHandler.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/Scufl2DocumentHandler.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/Scufl2DocumentHandler.java index edeac63..6d7e0ca 100644 --- a/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/Scufl2DocumentHandler.java +++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/rest/handler/Scufl2DocumentHandler.java @@ -20,9 +20,9 @@ import javax.ws.rs.ext.Provider; import org.taverna.server.master.common.Workflow; -import uk.org.taverna.scufl2.api.io.ReaderException; -import uk.org.taverna.scufl2.api.io.WorkflowBundleIO; -import uk.org.taverna.scufl2.api.io.WriterException; +import org.apache.taverna.scufl2.api.io.ReaderException; +import org.apache.taverna.scufl2.api.io.WorkflowBundleIO; +import org.apache.taverna.scufl2.api.io.WriterException; /** * Handler that allows a .scufl2 document to be read from and written to a REST http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/667b4e5c/taverna-server-webapp/src/main/java/org/taverna/server/master/soap/WrappedWorkflow.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/soap/WrappedWorkflow.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/soap/WrappedWorkflow.java index cd06115..854eaff 100644 --- a/taverna-server-webapp/src/main/java/org/taverna/server/master/soap/WrappedWorkflow.java +++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/soap/WrappedWorkflow.java @@ -23,9 +23,9 @@ import javax.xml.bind.annotation.XmlType; import org.taverna.server.master.common.Workflow; -import uk.org.taverna.scufl2.api.io.ReaderException; -import uk.org.taverna.scufl2.api.io.WorkflowBundleIO; -import uk.org.taverna.scufl2.api.io.WriterException; +import org.apache.taverna.scufl2.api.io.ReaderException; +import org.apache.taverna.scufl2.api.io.WorkflowBundleIO; +import org.apache.taverna.scufl2.api.io.WriterException; /** * An MTOM-capable description of how to transfer the contents of a file. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/667b4e5c/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/TavernaRunManager.java ---------------------------------------------------------------------- diff --git a/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/TavernaRunManager.java b/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/TavernaRunManager.java index 03ee69d..ae89988 100644 --- a/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/TavernaRunManager.java +++ b/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/TavernaRunManager.java @@ -31,6 +31,7 @@ import java.util.List; import java.util.Map; import java.util.UUID; +import org.apache.taverna.scufl2.api.io.WorkflowBundleIO; import org.taverna.server.localworker.api.RunAccounting; import org.taverna.server.localworker.api.Worker; import org.taverna.server.localworker.api.WorkerFactory; @@ -40,7 +41,6 @@ import org.taverna.server.localworker.server.UsageRecordReceiver; import org.w3c.dom.Document; import org.w3c.dom.Element; -import uk.org.taverna.scufl2.api.io.WorkflowBundleIO; /** * The registered factory for runs, this class is responsible for constructing @@ -99,7 +99,7 @@ public class TavernaRunManager extends UnicastRemoteObject implements throw new RemoteException("no creator"); try { URI wfid = io.readBundle(new ByteArrayInputStream(workflow), null) - .getMainWorkflow().getWorkflowIdentifier(); + .getMainWorkflow().getIdentifier(); out.println("Creating run from workflow <" + wfid + "> for <" + creator + ">"); return new LocalWorker(command, workflow, urReceiver, id, @@ -176,6 +176,7 @@ public class TavernaRunManager extends UnicastRemoteObject implements * the workflow, or if we can't build the worker instance, or * register it. Also if the arguments are wrong. */ + @SuppressWarnings("deprecation") public static void main(String[] args) throws Exception { if (args.length < 2) throw new Exception("wrong # args: must be \"" + usage + "\"");
