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/23 11:10:27 UTC
[52/54] incubator-taverna-engine git commit:
org.apache.taverna.scufl2 imports
org.apache.taverna.scufl2 imports
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/commit/4ee7aa06
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/tree/4ee7aa06
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/diff/4ee7aa06
Branch: refs/heads/master
Commit: 4ee7aa069c234061bfd9e5a6e6fe1498bb94f073
Parents: 246a16e
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Sat Feb 21 23:28:01 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Sat Feb 21 23:28:07 2015 +0000
----------------------------------------------------------------------
.../__classPrefix__ConfigurationPanel.java | 2 +-
.../config/__classPrefix__ConfigureAction.java | 2 +-
.../__classPrefix__ServiceDesc.java | 2 +-
...classPrefix__ActivityContextViewFactory.java | 2 +-
.../ui/view/__classPrefix__ContextualView.java | 2 +-
.../capability/api/ActivityService.java | 4 +-
.../capability/api/ConfigurationException.java | 4 +-
.../activity/impl/ActivityServiceImpl.java | 4 +-
.../execution/api/AbstractExecution.java | 14 ++---
.../execution/api/AbstractExecutionService.java | 6 +--
.../platform/execution/api/Execution.java | 6 +--
.../api/ExecutionEnvironmentService.java | 2 +-
.../execution/api/ExecutionService.java | 6 +--
.../execution/api/WorkflowCompiler.java | 4 +-
.../execution/api/AbstractExecutionTest.java | 10 ++--
.../impl/ExecutionEnvironmentServiceImpl.java | 14 ++---
.../execution/impl/local/LocalExecution.java | 10 ++--
.../impl/local/LocalExecutionService.java | 6 +--
.../impl/local/LocalProcessorReport.java | 2 +-
.../impl/local/WorkflowToDataflowMapper.java | 56 ++++++++++----------
.../impl/local/LocalExecutionTest.java | 2 +-
.../execution/impl/remote/RemoteExecution.java | 10 ++--
.../impl/remote/RemoteExecutionService.java | 6 +--
.../uk/org/taverna/platform/PlatformIT.java | 4 +-
.../java/uk/org/taverna/platform/RunIT.java | 4 +-
.../uk/org/taverna/platform/ActivityIT.java | 2 +-
.../org/taverna/platform/CommandLineToolIT.java | 8 +--
.../uk/org/taverna/platform/ExecutionIT.java | 8 +--
.../org/taverna/platform/LocalExecutionIT.java | 6 +--
.../uk/org/taverna/platform/PlatformIT.java | 22 ++++----
.../java/uk/org/taverna/platform/RunIT.java | 2 +-
.../uk/org/taverna/platform/RunParallelIT.java | 2 +-
.../uk/org/taverna/platform/RunWorkflowsIT.java | 2 +-
.../provtaverna/export/W3ProvenanceExport.java | 16 +++---
.../lineageservice/EventProcessor.java | 2 +-
.../taverna/platform/report/ActivityReport.java | 2 +-
.../org/taverna/platform/report/Invocation.java | 2 +-
.../platform/report/ProcessorReport.java | 2 +-
.../taverna/platform/report/StatusReport.java | 4 +-
.../taverna/platform/report/WorkflowReport.java | 2 +-
.../platform/report/StatusReportTest.java | 2 +-
.../taverna/platform/run/api/RunProfile.java | 10 ++--
.../taverna/platform/run/api/RunService.java | 6 +--
.../platform/run/api/RunProfileTest.java | 16 +++---
.../uk/org/taverna/platform/run/impl/Run.java | 8 +--
.../platform/run/impl/RunServiceImpl.java | 10 ++--
.../platform/run/impl/WorkflowReportJSON.java | 14 ++---
.../platform/run/impl/DummyWorkflowReport.java | 12 ++---
.../org/taverna/platform/run/impl/RunTest.java | 2 +-
.../run/impl/WorkflowReportJSONTest.java | 4 +-
.../commons/services/ServiceRegistry.java | 4 +-
.../services/impl/ServiceRegistryImpl.java | 4 +-
52 files changed, 179 insertions(+), 179 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/config/__classPrefix__ConfigurationPanel.java
----------------------------------------------------------------------
diff --git a/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/config/__classPrefix__ConfigurationPanel.java b/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/config/__classPrefix__ConfigurationPanel.java
index d92efb7..8f81c8d 100644
--- a/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/config/__classPrefix__ConfigurationPanel.java
+++ b/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/config/__classPrefix__ConfigurationPanel.java
@@ -13,7 +13,7 @@ import javax.swing.JTextField;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ActivityConfigurationPanel;
import uk.org.taverna.commons.services.ServiceRegistry;
-import uk.org.taverna.scufl2.api.activity.Activity;
+import org.apache.taverna.scufl2.api.activity.Activity;
@SuppressWarnings("serial")
public class ${classPrefix}ConfigurationPanel extends ActivityConfigurationPanel {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/config/__classPrefix__ConfigureAction.java
----------------------------------------------------------------------
diff --git a/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/config/__classPrefix__ConfigureAction.java b/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/config/__classPrefix__ConfigureAction.java
index c7d5d10..0a68bcd 100644
--- a/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/config/__classPrefix__ConfigureAction.java
+++ b/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/config/__classPrefix__ConfigureAction.java
@@ -6,7 +6,7 @@ package ${package}.ui.config;
import java.awt.event.ActionEvent;
import uk.org.taverna.commons.services.ServiceRegistry;
-import uk.org.taverna.scufl2.api.activity.Activity;
+import org.apache.taverna.scufl2.api.activity.Activity;
import net.sf.taverna.t2.servicedescriptions.ServiceDescriptionRegistry;
import net.sf.taverna.t2.workbench.activityicons.ActivityIconManager;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/serviceprovider/__classPrefix__ServiceDesc.java
----------------------------------------------------------------------
diff --git a/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/serviceprovider/__classPrefix__ServiceDesc.java b/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/serviceprovider/__classPrefix__ServiceDesc.java
index 5de7bc4..6724103 100644
--- a/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/serviceprovider/__classPrefix__ServiceDesc.java
+++ b/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/serviceprovider/__classPrefix__ServiceDesc.java
@@ -9,7 +9,7 @@ import java.util.List;
import javax.swing.Icon;
-import uk.org.taverna.scufl2.api.configurations.Configuration;
+import org.apache.taverna.scufl2.api.configurations.Configuration;
import com.fasterxml.jackson.databind.node.ObjectNode;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/view/__classPrefix__ActivityContextViewFactory.java
----------------------------------------------------------------------
diff --git a/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/view/__classPrefix__ActivityContextViewFactory.java b/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/view/__classPrefix__ActivityContextViewFactory.java
index de87ef3..b4563bd 100644
--- a/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/view/__classPrefix__ActivityContextViewFactory.java
+++ b/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/view/__classPrefix__ActivityContextViewFactory.java
@@ -8,7 +8,7 @@ import java.util.Arrays;
import java.util.List;
import uk.org.taverna.commons.services.ServiceRegistry;
-import uk.org.taverna.scufl2.api.activity.Activity;
+import org.apache.taverna.scufl2.api.activity.Activity;
import net.sf.taverna.t2.servicedescriptions.ServiceDescriptionRegistry;
import net.sf.taverna.t2.workbench.activityicons.ActivityIconManager;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/view/__classPrefix__ContextualView.java
----------------------------------------------------------------------
diff --git a/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/view/__classPrefix__ContextualView.java b/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/view/__classPrefix__ContextualView.java
index b7066a0..d970dc7 100644
--- a/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/view/__classPrefix__ContextualView.java
+++ b/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/view/__classPrefix__ContextualView.java
@@ -20,7 +20,7 @@ import net.sf.taverna.t2.workbench.edits.EditManager;
import net.sf.taverna.t2.workbench.file.FileManager;
import net.sf.taverna.t2.workbench.ui.actions.activity.ActivityContextualView;
-import uk.org.taverna.scufl2.api.activity.Activity;
+import org.apache.taverna.scufl2.api.activity.Activity;
import ${package}.ui.config.${classPrefix}ConfigureAction;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-capability-api/src/main/java/uk/org/taverna/platform/capability/api/ActivityService.java
----------------------------------------------------------------------
diff --git a/taverna-capability-api/src/main/java/uk/org/taverna/platform/capability/api/ActivityService.java b/taverna-capability-api/src/main/java/uk/org/taverna/platform/capability/api/ActivityService.java
index 8fd1619..683ea0e 100644
--- a/taverna-capability-api/src/main/java/uk/org/taverna/platform/capability/api/ActivityService.java
+++ b/taverna-capability-api/src/main/java/uk/org/taverna/platform/capability/api/ActivityService.java
@@ -24,8 +24,8 @@ import java.net.URI;
import java.util.Set;
import net.sf.taverna.t2.workflowmodel.processor.activity.Activity;
-import uk.org.taverna.scufl2.api.port.InputActivityPort;
-import uk.org.taverna.scufl2.api.port.OutputActivityPort;
+import org.apache.taverna.scufl2.api.port.InputActivityPort;
+import org.apache.taverna.scufl2.api.port.OutputActivityPort;
import com.fasterxml.jackson.databind.JsonNode;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-capability-api/src/main/java/uk/org/taverna/platform/capability/api/ConfigurationException.java
----------------------------------------------------------------------
diff --git a/taverna-capability-api/src/main/java/uk/org/taverna/platform/capability/api/ConfigurationException.java b/taverna-capability-api/src/main/java/uk/org/taverna/platform/capability/api/ConfigurationException.java
index be0e8a5..6abf43a 100644
--- a/taverna-capability-api/src/main/java/uk/org/taverna/platform/capability/api/ConfigurationException.java
+++ b/taverna-capability-api/src/main/java/uk/org/taverna/platform/capability/api/ConfigurationException.java
@@ -21,9 +21,9 @@
package uk.org.taverna.platform.capability.api;
/**
- * Thrown when a {@link uk.org.taverna.scufl2.api.common.Configurable
+ * Thrown when a {@link org.apache.taverna.scufl2.api.common.Configurable
* Configurable} cannot be configured by a
- * {@link uk.org.taverna.scufl2.api.configurations.Configuration Configuration}.
+ * {@link org.apache.taverna.scufl2.api.configurations.Configuration Configuration}.
*
* @author David Withers
*/
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-capability-impl/src/main/java/uk/org/taverna/platform/capability/activity/impl/ActivityServiceImpl.java
----------------------------------------------------------------------
diff --git a/taverna-capability-impl/src/main/java/uk/org/taverna/platform/capability/activity/impl/ActivityServiceImpl.java b/taverna-capability-impl/src/main/java/uk/org/taverna/platform/capability/activity/impl/ActivityServiceImpl.java
index 91f910c..8a2f73e 100644
--- a/taverna-capability-impl/src/main/java/uk/org/taverna/platform/capability/activity/impl/ActivityServiceImpl.java
+++ b/taverna-capability-impl/src/main/java/uk/org/taverna/platform/capability/activity/impl/ActivityServiceImpl.java
@@ -32,8 +32,8 @@ import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityOutputPort;
import uk.org.taverna.platform.capability.api.ActivityConfigurationException;
import uk.org.taverna.platform.capability.api.ActivityNotFoundException;
import uk.org.taverna.platform.capability.api.ActivityService;
-import uk.org.taverna.scufl2.api.port.InputActivityPort;
-import uk.org.taverna.scufl2.api.port.OutputActivityPort;
+import org.apache.taverna.scufl2.api.port.InputActivityPort;
+import org.apache.taverna.scufl2.api.port.OutputActivityPort;
import com.fasterxml.jackson.databind.JsonNode;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-execution-api/src/main/java/uk/org/taverna/platform/execution/api/AbstractExecution.java
----------------------------------------------------------------------
diff --git a/taverna-execution-api/src/main/java/uk/org/taverna/platform/execution/api/AbstractExecution.java b/taverna-execution-api/src/main/java/uk/org/taverna/platform/execution/api/AbstractExecution.java
index c3802ce..5b464ef 100644
--- a/taverna-execution-api/src/main/java/uk/org/taverna/platform/execution/api/AbstractExecution.java
+++ b/taverna-execution-api/src/main/java/uk/org/taverna/platform/execution/api/AbstractExecution.java
@@ -27,13 +27,13 @@ import org.purl.wf4ever.robundle.Bundle;
import uk.org.taverna.platform.report.ActivityReport;
import uk.org.taverna.platform.report.ProcessorReport;
import uk.org.taverna.platform.report.WorkflowReport;
-import uk.org.taverna.scufl2.api.activity.Activity;
-import uk.org.taverna.scufl2.api.common.Scufl2Tools;
-import uk.org.taverna.scufl2.api.container.WorkflowBundle;
-import uk.org.taverna.scufl2.api.core.Processor;
-import uk.org.taverna.scufl2.api.core.Workflow;
-import uk.org.taverna.scufl2.api.profiles.ProcessorBinding;
-import uk.org.taverna.scufl2.api.profiles.Profile;
+import org.apache.taverna.scufl2.api.activity.Activity;
+import org.apache.taverna.scufl2.api.common.Scufl2Tools;
+import org.apache.taverna.scufl2.api.container.WorkflowBundle;
+import org.apache.taverna.scufl2.api.core.Processor;
+import org.apache.taverna.scufl2.api.core.Workflow;
+import org.apache.taverna.scufl2.api.profiles.ProcessorBinding;
+import org.apache.taverna.scufl2.api.profiles.Profile;
/**
* Abstract implementation of an {@link Execution}.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-execution-api/src/main/java/uk/org/taverna/platform/execution/api/AbstractExecutionService.java
----------------------------------------------------------------------
diff --git a/taverna-execution-api/src/main/java/uk/org/taverna/platform/execution/api/AbstractExecutionService.java b/taverna-execution-api/src/main/java/uk/org/taverna/platform/execution/api/AbstractExecutionService.java
index f9357df..d463795 100755
--- a/taverna-execution-api/src/main/java/uk/org/taverna/platform/execution/api/AbstractExecutionService.java
+++ b/taverna-execution-api/src/main/java/uk/org/taverna/platform/execution/api/AbstractExecutionService.java
@@ -27,9 +27,9 @@ import java.util.Map;
import org.purl.wf4ever.robundle.Bundle;
import uk.org.taverna.platform.report.WorkflowReport;
-import uk.org.taverna.scufl2.api.container.WorkflowBundle;
-import uk.org.taverna.scufl2.api.core.Workflow;
-import uk.org.taverna.scufl2.api.profiles.Profile;
+import org.apache.taverna.scufl2.api.container.WorkflowBundle;
+import org.apache.taverna.scufl2.api.core.Workflow;
+import org.apache.taverna.scufl2.api.profiles.Profile;
/**
* A common super type for concrete implementations of <code>ExecutionService</code>s.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-execution-api/src/main/java/uk/org/taverna/platform/execution/api/Execution.java
----------------------------------------------------------------------
diff --git a/taverna-execution-api/src/main/java/uk/org/taverna/platform/execution/api/Execution.java b/taverna-execution-api/src/main/java/uk/org/taverna/platform/execution/api/Execution.java
index 28a982d..8e2f03a 100644
--- a/taverna-execution-api/src/main/java/uk/org/taverna/platform/execution/api/Execution.java
+++ b/taverna-execution-api/src/main/java/uk/org/taverna/platform/execution/api/Execution.java
@@ -23,9 +23,9 @@ package uk.org.taverna.platform.execution.api;
import org.purl.wf4ever.robundle.Bundle;
import uk.org.taverna.platform.report.WorkflowReport;
-import uk.org.taverna.scufl2.api.container.WorkflowBundle;
-import uk.org.taverna.scufl2.api.core.Workflow;
-import uk.org.taverna.scufl2.api.profiles.Profile;
+import org.apache.taverna.scufl2.api.container.WorkflowBundle;
+import org.apache.taverna.scufl2.api.core.Workflow;
+import org.apache.taverna.scufl2.api.profiles.Profile;
/**
* Interface for a single execution of a Taverna workflow.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-execution-api/src/main/java/uk/org/taverna/platform/execution/api/ExecutionEnvironmentService.java
----------------------------------------------------------------------
diff --git a/taverna-execution-api/src/main/java/uk/org/taverna/platform/execution/api/ExecutionEnvironmentService.java b/taverna-execution-api/src/main/java/uk/org/taverna/platform/execution/api/ExecutionEnvironmentService.java
index 5559069..9f0b5fd 100644
--- a/taverna-execution-api/src/main/java/uk/org/taverna/platform/execution/api/ExecutionEnvironmentService.java
+++ b/taverna-execution-api/src/main/java/uk/org/taverna/platform/execution/api/ExecutionEnvironmentService.java
@@ -22,7 +22,7 @@ package uk.org.taverna.platform.execution.api;
import java.util.Set;
-import uk.org.taverna.scufl2.api.profiles.Profile;
+import org.apache.taverna.scufl2.api.profiles.Profile;
/**
* Service for finding <code>ExecutionEnvironment</code>s.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-execution-api/src/main/java/uk/org/taverna/platform/execution/api/ExecutionService.java
----------------------------------------------------------------------
diff --git a/taverna-execution-api/src/main/java/uk/org/taverna/platform/execution/api/ExecutionService.java b/taverna-execution-api/src/main/java/uk/org/taverna/platform/execution/api/ExecutionService.java
index 2ae7067..2b67788 100755
--- a/taverna-execution-api/src/main/java/uk/org/taverna/platform/execution/api/ExecutionService.java
+++ b/taverna-execution-api/src/main/java/uk/org/taverna/platform/execution/api/ExecutionService.java
@@ -25,9 +25,9 @@ import java.util.Set;
import org.purl.wf4ever.robundle.Bundle;
import uk.org.taverna.platform.report.WorkflowReport;
-import uk.org.taverna.scufl2.api.container.WorkflowBundle;
-import uk.org.taverna.scufl2.api.core.Workflow;
-import uk.org.taverna.scufl2.api.profiles.Profile;
+import org.apache.taverna.scufl2.api.container.WorkflowBundle;
+import org.apache.taverna.scufl2.api.core.Workflow;
+import org.apache.taverna.scufl2.api.profiles.Profile;
/**
* Service for executing Taverna workflows. There may be several <code>ExecutionService</code>s
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-execution-api/src/main/java/uk/org/taverna/platform/execution/api/WorkflowCompiler.java
----------------------------------------------------------------------
diff --git a/taverna-execution-api/src/main/java/uk/org/taverna/platform/execution/api/WorkflowCompiler.java b/taverna-execution-api/src/main/java/uk/org/taverna/platform/execution/api/WorkflowCompiler.java
index 70b8fcd..a183cd1 100644
--- a/taverna-execution-api/src/main/java/uk/org/taverna/platform/execution/api/WorkflowCompiler.java
+++ b/taverna-execution-api/src/main/java/uk/org/taverna/platform/execution/api/WorkflowCompiler.java
@@ -1,8 +1,8 @@
package uk.org.taverna.platform.execution.api;
import net.sf.taverna.t2.workflowmodel.Dataflow;
-import uk.org.taverna.scufl2.api.container.WorkflowBundle;
-import uk.org.taverna.scufl2.api.core.Workflow;
+import org.apache.taverna.scufl2.api.container.WorkflowBundle;
+import org.apache.taverna.scufl2.api.core.Workflow;
/**
* A workflow compilation service converts a workflow (in a
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-execution-api/src/test/java/uk/org/taverna/platform/execution/api/AbstractExecutionTest.java
----------------------------------------------------------------------
diff --git a/taverna-execution-api/src/test/java/uk/org/taverna/platform/execution/api/AbstractExecutionTest.java b/taverna-execution-api/src/test/java/uk/org/taverna/platform/execution/api/AbstractExecutionTest.java
index 635527e..92f705b 100644
--- a/taverna-execution-api/src/test/java/uk/org/taverna/platform/execution/api/AbstractExecutionTest.java
+++ b/taverna-execution-api/src/test/java/uk/org/taverna/platform/execution/api/AbstractExecutionTest.java
@@ -32,11 +32,11 @@ import uk.org.taverna.databundle.DataBundles;
import uk.org.taverna.platform.report.ActivityReport;
import uk.org.taverna.platform.report.ProcessorReport;
import uk.org.taverna.platform.report.WorkflowReport;
-import uk.org.taverna.scufl2.api.activity.Activity;
-import uk.org.taverna.scufl2.api.container.WorkflowBundle;
-import uk.org.taverna.scufl2.api.core.Processor;
-import uk.org.taverna.scufl2.api.core.Workflow;
-import uk.org.taverna.scufl2.api.profiles.Profile;
+import org.apache.taverna.scufl2.api.activity.Activity;
+import org.apache.taverna.scufl2.api.container.WorkflowBundle;
+import org.apache.taverna.scufl2.api.core.Processor;
+import org.apache.taverna.scufl2.api.core.Workflow;
+import org.apache.taverna.scufl2.api.profiles.Profile;
/**
* @author David Withers
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-execution-impl/src/main/java/uk/org/taverna/platform/execution/impl/ExecutionEnvironmentServiceImpl.java
----------------------------------------------------------------------
diff --git a/taverna-execution-impl/src/main/java/uk/org/taverna/platform/execution/impl/ExecutionEnvironmentServiceImpl.java b/taverna-execution-impl/src/main/java/uk/org/taverna/platform/execution/impl/ExecutionEnvironmentServiceImpl.java
index 13eeec2..c05848f 100644
--- a/taverna-execution-impl/src/main/java/uk/org/taverna/platform/execution/impl/ExecutionEnvironmentServiceImpl.java
+++ b/taverna-execution-impl/src/main/java/uk/org/taverna/platform/execution/impl/ExecutionEnvironmentServiceImpl.java
@@ -33,13 +33,13 @@ import uk.org.taverna.platform.capability.api.DispatchLayerNotFoundException;
import uk.org.taverna.platform.execution.api.ExecutionEnvironment;
import uk.org.taverna.platform.execution.api.ExecutionEnvironmentService;
import uk.org.taverna.platform.execution.api.ExecutionService;
-import uk.org.taverna.scufl2.api.activity.Activity;
-import uk.org.taverna.scufl2.api.common.NamedSet;
-import uk.org.taverna.scufl2.api.common.Scufl2Tools;
-import uk.org.taverna.scufl2.api.configurations.Configuration;
-import uk.org.taverna.scufl2.api.core.Processor;
-import uk.org.taverna.scufl2.api.profiles.ProcessorBinding;
-import uk.org.taverna.scufl2.api.profiles.Profile;
+import org.apache.taverna.scufl2.api.activity.Activity;
+import org.apache.taverna.scufl2.api.common.NamedSet;
+import org.apache.taverna.scufl2.api.common.Scufl2Tools;
+import org.apache.taverna.scufl2.api.configurations.Configuration;
+import org.apache.taverna.scufl2.api.core.Processor;
+import org.apache.taverna.scufl2.api.profiles.ProcessorBinding;
+import org.apache.taverna.scufl2.api.profiles.Profile;
import com.fasterxml.jackson.databind.JsonNode;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-execution-local/src/main/java/uk/org/taverna/platform/execution/impl/local/LocalExecution.java
----------------------------------------------------------------------
diff --git a/taverna-execution-local/src/main/java/uk/org/taverna/platform/execution/impl/local/LocalExecution.java b/taverna-execution-local/src/main/java/uk/org/taverna/platform/execution/impl/local/LocalExecution.java
index e176d4d..e4786ca 100644
--- a/taverna-execution-local/src/main/java/uk/org/taverna/platform/execution/impl/local/LocalExecution.java
+++ b/taverna-execution-local/src/main/java/uk/org/taverna/platform/execution/impl/local/LocalExecution.java
@@ -57,9 +57,9 @@ import uk.org.taverna.platform.execution.api.InvalidWorkflowException;
import uk.org.taverna.platform.report.ActivityReport;
import uk.org.taverna.platform.report.ProcessorReport;
import uk.org.taverna.platform.report.WorkflowReport;
-import uk.org.taverna.scufl2.api.container.WorkflowBundle;
-import uk.org.taverna.scufl2.api.core.Workflow;
-import uk.org.taverna.scufl2.api.profiles.Profile;
+import org.apache.taverna.scufl2.api.container.WorkflowBundle;
+import org.apache.taverna.scufl2.api.core.Workflow;
+import org.apache.taverna.scufl2.api.profiles.Profile;
/**
* An {@link uk.org.taverna.platform.execution.api.Execution Execution} for
@@ -192,13 +192,13 @@ public class LocalExecution extends AbstractExecution implements ResultListener
@Override
public ProcessorReport createProcessorReport(
- uk.org.taverna.scufl2.api.core.Processor processor) {
+ org.apache.taverna.scufl2.api.core.Processor processor) {
return new LocalProcessorReport(processor);
}
@Override
public ActivityReport createActivityReport(
- uk.org.taverna.scufl2.api.activity.Activity activity) {
+ org.apache.taverna.scufl2.api.activity.Activity activity) {
return new ActivityReport(activity);
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-execution-local/src/main/java/uk/org/taverna/platform/execution/impl/local/LocalExecutionService.java
----------------------------------------------------------------------
diff --git a/taverna-execution-local/src/main/java/uk/org/taverna/platform/execution/impl/local/LocalExecutionService.java b/taverna-execution-local/src/main/java/uk/org/taverna/platform/execution/impl/local/LocalExecutionService.java
index 9038e0f..5cd238b 100644
--- a/taverna-execution-local/src/main/java/uk/org/taverna/platform/execution/impl/local/LocalExecutionService.java
+++ b/taverna-execution-local/src/main/java/uk/org/taverna/platform/execution/impl/local/LocalExecutionService.java
@@ -38,9 +38,9 @@ import uk.org.taverna.platform.execution.api.Execution;
import uk.org.taverna.platform.execution.api.ExecutionEnvironment;
import uk.org.taverna.platform.execution.api.InvalidWorkflowException;
import uk.org.taverna.platform.execution.api.WorkflowCompiler;
-import uk.org.taverna.scufl2.api.container.WorkflowBundle;
-import uk.org.taverna.scufl2.api.core.Workflow;
-import uk.org.taverna.scufl2.api.profiles.Profile;
+import org.apache.taverna.scufl2.api.container.WorkflowBundle;
+import org.apache.taverna.scufl2.api.core.Workflow;
+import org.apache.taverna.scufl2.api.profiles.Profile;
/**
* Service for executing Taverna workflows on a local Taverna Dataflow Engine.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-execution-local/src/main/java/uk/org/taverna/platform/execution/impl/local/LocalProcessorReport.java
----------------------------------------------------------------------
diff --git a/taverna-execution-local/src/main/java/uk/org/taverna/platform/execution/impl/local/LocalProcessorReport.java b/taverna-execution-local/src/main/java/uk/org/taverna/platform/execution/impl/local/LocalProcessorReport.java
index 0677eaf..2db354c 100644
--- a/taverna-execution-local/src/main/java/uk/org/taverna/platform/execution/impl/local/LocalProcessorReport.java
+++ b/taverna-execution-local/src/main/java/uk/org/taverna/platform/execution/impl/local/LocalProcessorReport.java
@@ -10,7 +10,7 @@ import net.sf.taverna.t2.monitor.MonitorableProperty;
import net.sf.taverna.t2.monitor.NoSuchPropertyException;
import net.sf.taverna.t2.monitor.SteerableProperty;
import uk.org.taverna.platform.report.ProcessorReport;
-import uk.org.taverna.scufl2.api.core.Processor;
+import org.apache.taverna.scufl2.api.core.Processor;
/**
* ProcessorReport implementation based on MonitorableProperty objects.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-execution-local/src/main/java/uk/org/taverna/platform/execution/impl/local/WorkflowToDataflowMapper.java
----------------------------------------------------------------------
diff --git a/taverna-execution-local/src/main/java/uk/org/taverna/platform/execution/impl/local/WorkflowToDataflowMapper.java b/taverna-execution-local/src/main/java/uk/org/taverna/platform/execution/impl/local/WorkflowToDataflowMapper.java
index 986705a..1bce24b 100644
--- a/taverna-execution-local/src/main/java/uk/org/taverna/platform/execution/impl/local/WorkflowToDataflowMapper.java
+++ b/taverna-execution-local/src/main/java/uk/org/taverna/platform/execution/impl/local/WorkflowToDataflowMapper.java
@@ -54,34 +54,34 @@ import uk.org.taverna.platform.capability.api.DispatchLayerConfigurationExceptio
import uk.org.taverna.platform.capability.api.DispatchLayerNotFoundException;
import uk.org.taverna.platform.capability.api.DispatchLayerService;
import uk.org.taverna.platform.execution.api.InvalidWorkflowException;
-import uk.org.taverna.scufl2.api.activity.Activity;
-import uk.org.taverna.scufl2.api.common.Scufl2Tools;
-import uk.org.taverna.scufl2.api.configurations.Configuration;
-import uk.org.taverna.scufl2.api.container.WorkflowBundle;
-import uk.org.taverna.scufl2.api.core.BlockingControlLink;
-import uk.org.taverna.scufl2.api.core.ControlLink;
-import uk.org.taverna.scufl2.api.core.DataLink;
-import uk.org.taverna.scufl2.api.core.Processor;
-import uk.org.taverna.scufl2.api.core.Workflow;
-import uk.org.taverna.scufl2.api.iterationstrategy.CrossProduct;
-import uk.org.taverna.scufl2.api.iterationstrategy.DotProduct;
-import uk.org.taverna.scufl2.api.iterationstrategy.IterationStrategyNode;
-import uk.org.taverna.scufl2.api.iterationstrategy.IterationStrategyStack;
-import uk.org.taverna.scufl2.api.iterationstrategy.IterationStrategyTopNode;
-import uk.org.taverna.scufl2.api.iterationstrategy.PortNode;
-import uk.org.taverna.scufl2.api.port.InputActivityPort;
-import uk.org.taverna.scufl2.api.port.InputProcessorPort;
-import uk.org.taverna.scufl2.api.port.InputWorkflowPort;
-import uk.org.taverna.scufl2.api.port.OutputActivityPort;
-import uk.org.taverna.scufl2.api.port.OutputProcessorPort;
-import uk.org.taverna.scufl2.api.port.OutputWorkflowPort;
-import uk.org.taverna.scufl2.api.port.Port;
-import uk.org.taverna.scufl2.api.port.ReceiverPort;
-import uk.org.taverna.scufl2.api.port.SenderPort;
-import uk.org.taverna.scufl2.api.profiles.ProcessorBinding;
-import uk.org.taverna.scufl2.api.profiles.ProcessorInputPortBinding;
-import uk.org.taverna.scufl2.api.profiles.ProcessorOutputPortBinding;
-import uk.org.taverna.scufl2.api.profiles.Profile;
+import org.apache.taverna.scufl2.api.activity.Activity;
+import org.apache.taverna.scufl2.api.common.Scufl2Tools;
+import org.apache.taverna.scufl2.api.configurations.Configuration;
+import org.apache.taverna.scufl2.api.container.WorkflowBundle;
+import org.apache.taverna.scufl2.api.core.BlockingControlLink;
+import org.apache.taverna.scufl2.api.core.ControlLink;
+import org.apache.taverna.scufl2.api.core.DataLink;
+import org.apache.taverna.scufl2.api.core.Processor;
+import org.apache.taverna.scufl2.api.core.Workflow;
+import org.apache.taverna.scufl2.api.iterationstrategy.CrossProduct;
+import org.apache.taverna.scufl2.api.iterationstrategy.DotProduct;
+import org.apache.taverna.scufl2.api.iterationstrategy.IterationStrategyNode;
+import org.apache.taverna.scufl2.api.iterationstrategy.IterationStrategyStack;
+import org.apache.taverna.scufl2.api.iterationstrategy.IterationStrategyTopNode;
+import org.apache.taverna.scufl2.api.iterationstrategy.PortNode;
+import org.apache.taverna.scufl2.api.port.InputActivityPort;
+import org.apache.taverna.scufl2.api.port.InputProcessorPort;
+import org.apache.taverna.scufl2.api.port.InputWorkflowPort;
+import org.apache.taverna.scufl2.api.port.OutputActivityPort;
+import org.apache.taverna.scufl2.api.port.OutputProcessorPort;
+import org.apache.taverna.scufl2.api.port.OutputWorkflowPort;
+import org.apache.taverna.scufl2.api.port.Port;
+import org.apache.taverna.scufl2.api.port.ReceiverPort;
+import org.apache.taverna.scufl2.api.port.SenderPort;
+import org.apache.taverna.scufl2.api.profiles.ProcessorBinding;
+import org.apache.taverna.scufl2.api.profiles.ProcessorInputPortBinding;
+import org.apache.taverna.scufl2.api.profiles.ProcessorOutputPortBinding;
+import org.apache.taverna.scufl2.api.profiles.Profile;
import com.fasterxml.jackson.databind.JsonNode;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-execution-local/src/test/java/uk/org/taverna/platform/execution/impl/local/LocalExecutionTest.java
----------------------------------------------------------------------
diff --git a/taverna-execution-local/src/test/java/uk/org/taverna/platform/execution/impl/local/LocalExecutionTest.java b/taverna-execution-local/src/test/java/uk/org/taverna/platform/execution/impl/local/LocalExecutionTest.java
index 58a667e..80b4d65 100644
--- a/taverna-execution-local/src/test/java/uk/org/taverna/platform/execution/impl/local/LocalExecutionTest.java
+++ b/taverna-execution-local/src/test/java/uk/org/taverna/platform/execution/impl/local/LocalExecutionTest.java
@@ -71,7 +71,7 @@ public class LocalExecutionTest {
/**
* Test method for
- * {@link uk.org.taverna.platform.execution.impl.local.LocalExecution#DataflowExecution(uk.org.taverna.scufl2.api.core.Workflow, java.util.Map, net.sf.taverna.t2.reference.ReferenceService)}
+ * {@link uk.org.taverna.platform.execution.impl.local.LocalExecution#DataflowExecution(org.apache.taverna.scufl2.api.core.Workflow, java.util.Map, net.sf.taverna.t2.reference.ReferenceService)}
* .
*
* @throws Exception
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-execution-remote/src/main/java/uk/org/taverna/platform/execution/impl/remote/RemoteExecution.java
----------------------------------------------------------------------
diff --git a/taverna-execution-remote/src/main/java/uk/org/taverna/platform/execution/impl/remote/RemoteExecution.java b/taverna-execution-remote/src/main/java/uk/org/taverna/platform/execution/impl/remote/RemoteExecution.java
index cf94d39..8231409 100644
--- a/taverna-execution-remote/src/main/java/uk/org/taverna/platform/execution/impl/remote/RemoteExecution.java
+++ b/taverna-execution-remote/src/main/java/uk/org/taverna/platform/execution/impl/remote/RemoteExecution.java
@@ -26,11 +26,11 @@ import uk.org.taverna.platform.execution.api.AbstractExecution;
import uk.org.taverna.platform.report.ActivityReport;
import uk.org.taverna.platform.report.ProcessorReport;
import uk.org.taverna.platform.report.WorkflowReport;
-import uk.org.taverna.scufl2.api.activity.Activity;
-import uk.org.taverna.scufl2.api.container.WorkflowBundle;
-import uk.org.taverna.scufl2.api.core.Processor;
-import uk.org.taverna.scufl2.api.core.Workflow;
-import uk.org.taverna.scufl2.api.profiles.Profile;
+import org.apache.taverna.scufl2.api.activity.Activity;
+import org.apache.taverna.scufl2.api.container.WorkflowBundle;
+import org.apache.taverna.scufl2.api.core.Processor;
+import org.apache.taverna.scufl2.api.core.Workflow;
+import org.apache.taverna.scufl2.api.profiles.Profile;
/**
* An {@link uk.org.taverna.platform.execution.api.Execution Execution} for executing a Taverna workflow on a Taverna Server.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-execution-remote/src/main/java/uk/org/taverna/platform/execution/impl/remote/RemoteExecutionService.java
----------------------------------------------------------------------
diff --git a/taverna-execution-remote/src/main/java/uk/org/taverna/platform/execution/impl/remote/RemoteExecutionService.java b/taverna-execution-remote/src/main/java/uk/org/taverna/platform/execution/impl/remote/RemoteExecutionService.java
index 6ca8db7..6910a3d 100644
--- a/taverna-execution-remote/src/main/java/uk/org/taverna/platform/execution/impl/remote/RemoteExecutionService.java
+++ b/taverna-execution-remote/src/main/java/uk/org/taverna/platform/execution/impl/remote/RemoteExecutionService.java
@@ -29,9 +29,9 @@ import uk.org.taverna.platform.execution.api.AbstractExecutionService;
import uk.org.taverna.platform.execution.api.Execution;
import uk.org.taverna.platform.execution.api.ExecutionEnvironment;
import uk.org.taverna.platform.execution.api.InvalidWorkflowException;
-import uk.org.taverna.scufl2.api.container.WorkflowBundle;
-import uk.org.taverna.scufl2.api.core.Workflow;
-import uk.org.taverna.scufl2.api.profiles.Profile;
+import org.apache.taverna.scufl2.api.container.WorkflowBundle;
+import org.apache.taverna.scufl2.api.core.Workflow;
+import org.apache.taverna.scufl2.api.profiles.Profile;
/**
* Service for executing Taverna workflows on a Taverna Server.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-integration-tests/src/test/java/uk/org/taverna/platform/PlatformIT.java
----------------------------------------------------------------------
diff --git a/taverna-integration-tests/src/test/java/uk/org/taverna/platform/PlatformIT.java b/taverna-integration-tests/src/test/java/uk/org/taverna/platform/PlatformIT.java
index 24bcbdb..789ec33 100644
--- a/taverna-integration-tests/src/test/java/uk/org/taverna/platform/PlatformIT.java
+++ b/taverna-integration-tests/src/test/java/uk/org/taverna/platform/PlatformIT.java
@@ -37,8 +37,8 @@ import uk.org.taverna.databundle.DataBundles;
import uk.org.taverna.databundle.ErrorDocument;
import uk.org.taverna.platform.report.State;
import uk.org.taverna.platform.report.WorkflowReport;
-import uk.org.taverna.scufl2.api.container.WorkflowBundle;
-import uk.org.taverna.scufl2.api.io.WorkflowBundleIO;
+import org.apache.taverna.scufl2.api.container.WorkflowBundle;
+import org.apache.taverna.scufl2.api.io.WorkflowBundleIO;
@Ignore
public class PlatformIT {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-integration-tests/src/test/java/uk/org/taverna/platform/RunIT.java
----------------------------------------------------------------------
diff --git a/taverna-integration-tests/src/test/java/uk/org/taverna/platform/RunIT.java b/taverna-integration-tests/src/test/java/uk/org/taverna/platform/RunIT.java
index 72cbe40..b10d384 100644
--- a/taverna-integration-tests/src/test/java/uk/org/taverna/platform/RunIT.java
+++ b/taverna-integration-tests/src/test/java/uk/org/taverna/platform/RunIT.java
@@ -53,8 +53,8 @@ import uk.org.taverna.platform.report.State;
import uk.org.taverna.platform.report.WorkflowReport;
import uk.org.taverna.platform.run.api.RunProfile;
import uk.org.taverna.platform.run.api.RunService;
-import uk.org.taverna.scufl2.api.container.WorkflowBundle;
-import uk.org.taverna.scufl2.api.io.WorkflowBundleIO;
+import org.apache.taverna.scufl2.api.container.WorkflowBundle;
+import org.apache.taverna.scufl2.api.io.WorkflowBundleIO;
public class RunIT extends PlatformIT {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/ActivityIT.java
----------------------------------------------------------------------
diff --git a/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/ActivityIT.java b/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/ActivityIT.java
index bb82107..5d578dc 100644
--- a/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/ActivityIT.java
+++ b/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/ActivityIT.java
@@ -30,7 +30,7 @@ import org.osgi.framework.ServiceReference;
import uk.org.taverna.platform.capability.activity.ActivityConfigurationException;
import uk.org.taverna.platform.capability.activity.ActivityNotFoundException;
import uk.org.taverna.platform.capability.activity.ActivityService;
-import uk.org.taverna.scufl2.api.configurations.ConfigurationDefinition;
+import org.apache.taverna.scufl2.api.configurations.ConfigurationDefinition;
public class ActivityIT extends PlatformIT {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/CommandLineToolIT.java
----------------------------------------------------------------------
diff --git a/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/CommandLineToolIT.java b/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/CommandLineToolIT.java
index f2df658..58b9fe8 100644
--- a/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/CommandLineToolIT.java
+++ b/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/CommandLineToolIT.java
@@ -26,8 +26,8 @@ import org.osgi.framework.ServiceReference;
import uk.org.taverna.commandline.args.CommandLineArguments;
import uk.org.taverna.platform.run.api.RunService;
-import uk.org.taverna.scufl2.api.io.WorkflowBundleIO;
-import uk.org.taverna.scufl2.api.io.WorkflowBundleReader;
+import org.apache.taverna.scufl2.api.io.WorkflowBundleIO;
+import org.apache.taverna.scufl2.api.io.WorkflowBundleReader;
public class CommandLineToolIT extends PlatformIT {
@@ -45,7 +45,7 @@ public class CommandLineToolIT extends PlatformIT {
if (workflowReader == null) {
ServiceReference workflowBundleReaderServiceReference = bundleContext
- .getServiceReferences("uk.org.taverna.scufl2.api.io.WorkflowBundleReader",
+ .getServiceReferences("org.apache.taverna.scufl2.api.io.WorkflowBundleReader",
"(mediaType=application/vnd.taverna.t2flow+xml)")[0];
workflowBundleReader = (WorkflowBundleReader) bundleContext
.getService(workflowBundleReaderServiceReference);
@@ -53,7 +53,7 @@ public class CommandLineToolIT extends PlatformIT {
if (workflowBundleIO == null) {
ServiceReference workflowBundleIOServiceReference = bundleContext
- .getServiceReference("uk.org.taverna.scufl2.api.io.WorkflowBundleIO");
+ .getServiceReference("org.apache.taverna.scufl2.api.io.WorkflowBundleIO");
workflowBundleIO = (WorkflowBundleIO) bundleContext
.getService(workflowBundleIOServiceReference);
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/ExecutionIT.java
----------------------------------------------------------------------
diff --git a/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/ExecutionIT.java b/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/ExecutionIT.java
index 76a25b3..8e4ad1b 100644
--- a/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/ExecutionIT.java
+++ b/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/ExecutionIT.java
@@ -39,10 +39,10 @@ import uk.org.taverna.platform.execution.api.Execution;
import uk.org.taverna.platform.execution.api.ExecutionEnvironment;
import uk.org.taverna.platform.execution.api.ExecutionEnvironmentService;
import uk.org.taverna.platform.execution.api.InvalidWorkflowException;
-import uk.org.taverna.scufl2.api.configurations.ConfigurationDefinition;
-import uk.org.taverna.scufl2.api.container.WorkflowBundle;
-import uk.org.taverna.scufl2.api.core.Workflow;
-import uk.org.taverna.scufl2.api.profiles.Profile;
+import org.apache.taverna.scufl2.api.configurations.ConfigurationDefinition;
+import org.apache.taverna.scufl2.api.container.WorkflowBundle;
+import org.apache.taverna.scufl2.api.core.Workflow;
+import org.apache.taverna.scufl2.api.profiles.Profile;
public class ExecutionIT extends PlatformIT {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/LocalExecutionIT.java
----------------------------------------------------------------------
diff --git a/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/LocalExecutionIT.java b/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/LocalExecutionIT.java
index 92068d5..3c2c5a7 100644
--- a/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/LocalExecutionIT.java
+++ b/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/LocalExecutionIT.java
@@ -33,9 +33,9 @@ import uk.org.taverna.platform.execution.api.ExecutionEnvironment;
import uk.org.taverna.platform.execution.api.ExecutionService;
import uk.org.taverna.platform.report.State;
import uk.org.taverna.platform.report.WorkflowReport;
-import uk.org.taverna.scufl2.api.container.WorkflowBundle;
-import uk.org.taverna.scufl2.api.core.Workflow;
-import uk.org.taverna.scufl2.api.profiles.Profile;
+import org.apache.taverna.scufl2.api.container.WorkflowBundle;
+import org.apache.taverna.scufl2.api.core.Workflow;
+import org.apache.taverna.scufl2.api.profiles.Profile;
public class LocalExecutionIT extends PlatformIT {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/PlatformIT.java
----------------------------------------------------------------------
diff --git a/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/PlatformIT.java b/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/PlatformIT.java
index 40b35e9..517c21f 100644
--- a/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/PlatformIT.java
+++ b/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/PlatformIT.java
@@ -47,9 +47,9 @@ import uk.org.taverna.configuration.database.DatabaseConfiguration;
import uk.org.taverna.platform.data.api.Data;
import uk.org.taverna.platform.report.State;
import uk.org.taverna.platform.report.WorkflowReport;
-import uk.org.taverna.scufl2.api.container.WorkflowBundle;
-import uk.org.taverna.scufl2.api.io.WorkflowBundleReader;
-import uk.org.taverna.scufl2.translator.t2flow.T2FlowReader;
+import org.apache.taverna.scufl2.api.container.WorkflowBundle;
+import org.apache.taverna.scufl2.api.io.WorkflowBundleReader;
+import org.apache.taverna.scufl2.translator.t2flow.T2FlowReader;
public class PlatformIT extends AbstractConfigurableBundleCreatorTests {
@@ -197,13 +197,13 @@ public class PlatformIT extends AbstractConfigurableBundleCreatorTests {
"uk.org.taverna.osgi.services, xml-parser-service, 0.0.1-SNAPSHOT",
"uk.org.taverna.osgi.services, xml-transformer-service, 0.0.1-SNAPSHOT",
// FIXME: Add the other scufl2 modules
- "uk.org.taverna.scufl2, scufl2-api, 0.9.2",
- "uk.org.taverna.scufl2, scufl2-rdfxml, 0.9.2",
- "uk.org.taverna.scufl2, scufl2-ucfpackage, 0.9.2",
- "uk.org.taverna.scufl2, scufl2-t2flow, 0.9.2",
- "uk.org.taverna.scufl2, scufl2-validation, 0.9.2",
- "uk.org.taverna.scufl2, scufl2-validation-correctness, 0.9.2",
- "uk.org.taverna.scufl2, scufl2-validation-structural, 0.9.2",
+ "org.apache.taverna.scufl2, scufl2-api, 0.9.2",
+ "org.apache.taverna.scufl2, scufl2-rdfxml, 0.9.2",
+ "org.apache.taverna.scufl2, scufl2-ucfpackage, 0.9.2",
+ "org.apache.taverna.scufl2, scufl2-t2flow, 0.9.2",
+ "org.apache.taverna.scufl2, scufl2-validation, 0.9.2",
+ "org.apache.taverna.scufl2, scufl2-validation-correctness, 0.9.2",
+ "org.apache.taverna.scufl2, scufl2-validation-structural, 0.9.2",
"net.sf.taverna.t2, results, 2.0-SNAPSHOT",
"net.sf.taverna.t2, baclava, 0.1-SNAPSHOT",
// "net.sf.taverna.t2.taverna-commandline, taverna-commandline-common, 2.0-SNAPSHOT"
@@ -239,7 +239,7 @@ public class PlatformIT extends AbstractConfigurableBundleCreatorTests {
if (workflowBundleReader == null) {
ServiceReference[] workflowBundleReaderReferences = bundleContext.getServiceReferences(
- "uk.org.taverna.scufl2.api.io.WorkflowBundleReader", null);
+ "org.apache.taverna.scufl2.api.io.WorkflowBundleReader", null);
for (ServiceReference serviceReference : workflowBundleReaderReferences) {
workflowBundleReader = (WorkflowBundleReader) bundleContext
.getService(serviceReference);
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/RunIT.java
----------------------------------------------------------------------
diff --git a/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/RunIT.java b/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/RunIT.java
index 9911e7c..c1931af 100644
--- a/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/RunIT.java
+++ b/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/RunIT.java
@@ -41,7 +41,7 @@ import uk.org.taverna.platform.report.State;
import uk.org.taverna.platform.report.WorkflowReport;
import uk.org.taverna.platform.run.api.RunProfile;
import uk.org.taverna.platform.run.api.RunService;
-import uk.org.taverna.scufl2.api.container.WorkflowBundle;
+import org.apache.taverna.scufl2.api.container.WorkflowBundle;
public class RunIT extends PlatformIT {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/RunParallelIT.java
----------------------------------------------------------------------
diff --git a/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/RunParallelIT.java b/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/RunParallelIT.java
index 7ba4a4f..b450c94 100644
--- a/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/RunParallelIT.java
+++ b/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/RunParallelIT.java
@@ -33,7 +33,7 @@ import uk.org.taverna.platform.report.State;
import uk.org.taverna.platform.report.WorkflowReport;
import uk.org.taverna.platform.run.api.RunProfile;
import uk.org.taverna.platform.run.api.RunService;
-import uk.org.taverna.scufl2.api.container.WorkflowBundle;
+import org.apache.taverna.scufl2.api.container.WorkflowBundle;
public class RunParallelIT extends PlatformIT {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/RunWorkflowsIT.java
----------------------------------------------------------------------
diff --git a/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/RunWorkflowsIT.java b/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/RunWorkflowsIT.java
index 6c36821..dee97f0 100644
--- a/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/RunWorkflowsIT.java
+++ b/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/RunWorkflowsIT.java
@@ -32,7 +32,7 @@ import uk.org.taverna.platform.report.State;
import uk.org.taverna.platform.report.WorkflowReport;
import uk.org.taverna.platform.run.api.RunProfile;
import uk.org.taverna.platform.run.api.RunService;
-import uk.org.taverna.scufl2.api.container.WorkflowBundle;
+import org.apache.taverna.scufl2.api.container.WorkflowBundle;
public class RunWorkflowsIT extends PlatformIT {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-prov/src/main/java/org/purl/wf4ever/provtaverna/export/W3ProvenanceExport.java
----------------------------------------------------------------------
diff --git a/taverna-prov/src/main/java/org/purl/wf4ever/provtaverna/export/W3ProvenanceExport.java b/taverna-prov/src/main/java/org/purl/wf4ever/provtaverna/export/W3ProvenanceExport.java
index 110ff72..d776539 100644
--- a/taverna-prov/src/main/java/org/purl/wf4ever/provtaverna/export/W3ProvenanceExport.java
+++ b/taverna-prov/src/main/java/org/purl/wf4ever/provtaverna/export/W3ProvenanceExport.java
@@ -1,6 +1,6 @@
package org.purl.wf4ever.provtaverna.export;
-import static uk.org.taverna.scufl2.translator.t2flow.T2FlowParser.ravenURI;
+import static org.apache.taverna.scufl2.translator.t2flow.T2FlowParser.ravenURI;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -56,13 +56,13 @@ import org.purl.wf4ever.robundle.manifest.PathAnnotation;
import org.purl.wf4ever.robundle.manifest.PathMetadata;
import uk.org.taverna.databundle.DataBundles;
-import uk.org.taverna.scufl2.api.common.URITools;
-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.WorkflowBundleReader;
-import uk.org.taverna.scufl2.api.io.WorkflowBundleWriter;
-import uk.org.taverna.scufl2.translator.t2flow.T2FlowReader;
+import org.apache.taverna.scufl2.api.common.URITools;
+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.WorkflowBundleReader;
+import org.apache.taverna.scufl2.api.io.WorkflowBundleWriter;
+import org.apache.taverna.scufl2.translator.t2flow.T2FlowReader;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype;
import com.hp.hpl.jena.ontology.Individual;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-provenanceconnector/src/main/java/net/sf/taverna/t2/provenance/lineageservice/EventProcessor.java
----------------------------------------------------------------------
diff --git a/taverna-provenanceconnector/src/main/java/net/sf/taverna/t2/provenance/lineageservice/EventProcessor.java b/taverna-provenanceconnector/src/main/java/net/sf/taverna/t2/provenance/lineageservice/EventProcessor.java
index 291da99..aa0c07d 100644
--- a/taverna-provenanceconnector/src/main/java/net/sf/taverna/t2/provenance/lineageservice/EventProcessor.java
+++ b/taverna-provenanceconnector/src/main/java/net/sf/taverna/t2/provenance/lineageservice/EventProcessor.java
@@ -114,7 +114,7 @@ import org.jdom.Namespace;
import org.jdom.input.SAXBuilder;
import org.jdom.output.XMLOutputter;
-import uk.org.taverna.scufl2.api.io.WorkflowBundleIO;
+import org.apache.taverna.scufl2.api.io.WorkflowBundleIO;
/**
* @author Paolo Missier
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-report-api/src/main/java/uk/org/taverna/platform/report/ActivityReport.java
----------------------------------------------------------------------
diff --git a/taverna-report-api/src/main/java/uk/org/taverna/platform/report/ActivityReport.java b/taverna-report-api/src/main/java/uk/org/taverna/platform/report/ActivityReport.java
index 0375dcd..4a9d1ea 100644
--- a/taverna-report-api/src/main/java/uk/org/taverna/platform/report/ActivityReport.java
+++ b/taverna-report-api/src/main/java/uk/org/taverna/platform/report/ActivityReport.java
@@ -20,7 +20,7 @@
******************************************************************************/
package uk.org.taverna.platform.report;
-import uk.org.taverna.scufl2.api.activity.Activity;
+import org.apache.taverna.scufl2.api.activity.Activity;
/**
* Report about the {@link State} of an {@link Activity} invocation.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-report-api/src/main/java/uk/org/taverna/platform/report/Invocation.java
----------------------------------------------------------------------
diff --git a/taverna-report-api/src/main/java/uk/org/taverna/platform/report/Invocation.java b/taverna-report-api/src/main/java/uk/org/taverna/platform/report/Invocation.java
index 166b226..fc95157 100644
--- a/taverna-report-api/src/main/java/uk/org/taverna/platform/report/Invocation.java
+++ b/taverna-report-api/src/main/java/uk/org/taverna/platform/report/Invocation.java
@@ -28,7 +28,7 @@ import java.util.SortedSet;
import java.util.TreeMap;
import java.util.TreeSet;
-import uk.org.taverna.scufl2.api.port.Port;
+import org.apache.taverna.scufl2.api.port.Port;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-report-api/src/main/java/uk/org/taverna/platform/report/ProcessorReport.java
----------------------------------------------------------------------
diff --git a/taverna-report-api/src/main/java/uk/org/taverna/platform/report/ProcessorReport.java b/taverna-report-api/src/main/java/uk/org/taverna/platform/report/ProcessorReport.java
index 97a74a1..1912eb3 100644
--- a/taverna-report-api/src/main/java/uk/org/taverna/platform/report/ProcessorReport.java
+++ b/taverna-report-api/src/main/java/uk/org/taverna/platform/report/ProcessorReport.java
@@ -26,7 +26,7 @@ import java.util.Set;
import java.util.SortedMap;
import java.util.TreeMap;
-import uk.org.taverna.scufl2.api.core.Processor;
+import org.apache.taverna.scufl2.api.core.Processor;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-report-api/src/main/java/uk/org/taverna/platform/report/StatusReport.java
----------------------------------------------------------------------
diff --git a/taverna-report-api/src/main/java/uk/org/taverna/platform/report/StatusReport.java b/taverna-report-api/src/main/java/uk/org/taverna/platform/report/StatusReport.java
index a49ea7b..254230f 100644
--- a/taverna-report-api/src/main/java/uk/org/taverna/platform/report/StatusReport.java
+++ b/taverna-report-api/src/main/java/uk/org/taverna/platform/report/StatusReport.java
@@ -29,8 +29,8 @@ import java.util.NavigableSet;
import java.util.SortedSet;
import java.util.TreeSet;
-import uk.org.taverna.scufl2.api.common.Ported;
-import uk.org.taverna.scufl2.api.common.URITools;
+import org.apache.taverna.scufl2.api.common.Ported;
+import org.apache.taverna.scufl2.api.common.URITools;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-report-api/src/main/java/uk/org/taverna/platform/report/WorkflowReport.java
----------------------------------------------------------------------
diff --git a/taverna-report-api/src/main/java/uk/org/taverna/platform/report/WorkflowReport.java b/taverna-report-api/src/main/java/uk/org/taverna/platform/report/WorkflowReport.java
index 8148793..fc000fc 100644
--- a/taverna-report-api/src/main/java/uk/org/taverna/platform/report/WorkflowReport.java
+++ b/taverna-report-api/src/main/java/uk/org/taverna/platform/report/WorkflowReport.java
@@ -29,7 +29,7 @@ import java.util.logging.Logger;
import org.purl.wf4ever.robundle.Bundle;
-import uk.org.taverna.scufl2.api.core.Workflow;
+import org.apache.taverna.scufl2.api.core.Workflow;
import com.fasterxml.jackson.annotation.JsonIgnore;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-report-api/src/test/java/uk/org/taverna/platform/report/StatusReportTest.java
----------------------------------------------------------------------
diff --git a/taverna-report-api/src/test/java/uk/org/taverna/platform/report/StatusReportTest.java b/taverna-report-api/src/test/java/uk/org/taverna/platform/report/StatusReportTest.java
index 9cee3a8..3c39cbb 100644
--- a/taverna-report-api/src/test/java/uk/org/taverna/platform/report/StatusReportTest.java
+++ b/taverna-report-api/src/test/java/uk/org/taverna/platform/report/StatusReportTest.java
@@ -31,7 +31,7 @@ import java.util.Date;
import org.junit.Before;
import org.junit.Test;
-import uk.org.taverna.scufl2.api.core.Workflow;
+import org.apache.taverna.scufl2.api.core.Workflow;
/**
* Unit tests for StatusReport.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-run-api/src/main/java/uk/org/taverna/platform/run/api/RunProfile.java
----------------------------------------------------------------------
diff --git a/taverna-run-api/src/main/java/uk/org/taverna/platform/run/api/RunProfile.java b/taverna-run-api/src/main/java/uk/org/taverna/platform/run/api/RunProfile.java
index 9954685..b3a94ad 100644
--- a/taverna-run-api/src/main/java/uk/org/taverna/platform/run/api/RunProfile.java
+++ b/taverna-run-api/src/main/java/uk/org/taverna/platform/run/api/RunProfile.java
@@ -3,11 +3,11 @@ package uk.org.taverna.platform.run.api;
import org.purl.wf4ever.robundle.Bundle;
import uk.org.taverna.platform.execution.api.ExecutionEnvironment;
-import uk.org.taverna.scufl2.api.container.WorkflowBundle;
+import org.apache.taverna.scufl2.api.container.WorkflowBundle;
/**
* A <code>RunProfile</code> specifies the parameters required to run a
- * {@link uk.org.taverna.scufl2.api.core.Workflow}.
+ * {@link org.apache.taverna.scufl2.api.core.Workflow}.
*
* @author David Withers
*/
@@ -20,7 +20,7 @@ public class RunProfile {
/**
* Constructs a <code>RunProfile</code> that specifies the parameters
- * required to run a {@link uk.org.taverna.scufl2.api.core.Workflow}. The
+ * required to run a {@link org.apache.taverna.scufl2.api.core.Workflow}. The
* main <code>Workflow</code> and <code>Profile</code> from the
* <code>WorkflowBundle</code> are used.
*
@@ -41,7 +41,7 @@ public class RunProfile {
/**
* Constructs a <code>RunProfile</code> that specifies the parameters
- * required to run a {@link uk.org.taverna.scufl2.api.core.Workflow}.
+ * required to run a {@link org.apache.taverna.scufl2.api.core.Workflow}.
*
* @param executionEnvironment
* the {@link ExecutionEnvironment} used to execute the
@@ -54,7 +54,7 @@ public class RunProfile {
* the main <code>Workflow</code> from the
* <code>WorkflowBundle</code>
* @param profile
- * the {@link uk.org.taverna.scufl2.api.profiles.Profile} to use
+ * the {@link org.apache.taverna.scufl2.api.profiles.Profile} to use
* when running the <code>Workflow</code>. If null uses the main
* <code>Profile</code> from the <code>WorkflowBundle</code>
* @param dataBundle
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-run-api/src/main/java/uk/org/taverna/platform/run/api/RunService.java
----------------------------------------------------------------------
diff --git a/taverna-run-api/src/main/java/uk/org/taverna/platform/run/api/RunService.java b/taverna-run-api/src/main/java/uk/org/taverna/platform/run/api/RunService.java
index 9dda709..1e98021 100644
--- a/taverna-run-api/src/main/java/uk/org/taverna/platform/run/api/RunService.java
+++ b/taverna-run-api/src/main/java/uk/org/taverna/platform/run/api/RunService.java
@@ -12,9 +12,9 @@ import uk.org.taverna.platform.execution.api.InvalidExecutionIdException;
import uk.org.taverna.platform.execution.api.InvalidWorkflowException;
import uk.org.taverna.platform.report.State;
import uk.org.taverna.platform.report.WorkflowReport;
-import uk.org.taverna.scufl2.api.container.WorkflowBundle;
-import uk.org.taverna.scufl2.api.core.Workflow;
-import uk.org.taverna.scufl2.api.profiles.Profile;
+import org.apache.taverna.scufl2.api.container.WorkflowBundle;
+import org.apache.taverna.scufl2.api.core.Workflow;
+import org.apache.taverna.scufl2.api.profiles.Profile;
/**
* Service for managing runs of Taverna workflows.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-run-api/src/test/java/uk/org/taverna/platform/run/api/RunProfileTest.java
----------------------------------------------------------------------
diff --git a/taverna-run-api/src/test/java/uk/org/taverna/platform/run/api/RunProfileTest.java b/taverna-run-api/src/test/java/uk/org/taverna/platform/run/api/RunProfileTest.java
index e6225ee..5399ea6 100644
--- a/taverna-run-api/src/test/java/uk/org/taverna/platform/run/api/RunProfileTest.java
+++ b/taverna-run-api/src/test/java/uk/org/taverna/platform/run/api/RunProfileTest.java
@@ -33,9 +33,9 @@ import uk.org.taverna.databundle.DataBundles;
import uk.org.taverna.platform.execution.api.ExecutionEnvironment;
import uk.org.taverna.platform.execution.impl.local.LocalExecutionEnvironment;
import uk.org.taverna.platform.execution.impl.local.LocalExecutionService;
-import uk.org.taverna.scufl2.api.container.WorkflowBundle;
-import uk.org.taverna.scufl2.api.core.Workflow;
-import uk.org.taverna.scufl2.api.profiles.Profile;
+import org.apache.taverna.scufl2.api.container.WorkflowBundle;
+import org.apache.taverna.scufl2.api.core.Workflow;
+import org.apache.taverna.scufl2.api.profiles.Profile;
/**
*
@@ -74,7 +74,7 @@ public class RunProfileTest {
/**
* Test method for
- * {@link uk.org.taverna.platform.run.api.RunProfile#RunProfile(uk.org.taverna.scufl2.api.container.WorkflowBundle, java.util.Map, net.sf.taverna.t2.reference.ReferenceService, uk.org.taverna.platform.execution.api.ExecutionService)}
+ * {@link uk.org.taverna.platform.run.api.RunProfile#RunProfile(org.apache.taverna.scufl2.api.container.WorkflowBundle, java.util.Map, net.sf.taverna.t2.reference.ReferenceService, uk.org.taverna.platform.execution.api.ExecutionService)}
* .
*/
@Test
@@ -84,7 +84,7 @@ public class RunProfileTest {
/**
* Test method for
- * {@link uk.org.taverna.platform.run.api.RunProfile#RunProfile(uk.org.taverna.scufl2.api.container.WorkflowBundle, uk.org.taverna.scufl2.api.core.Workflow, uk.org.taverna.scufl2.api.profiles.Profile, java.util.Map, net.sf.taverna.t2.reference.ReferenceService, uk.org.taverna.platform.execution.api.ExecutionService)}
+ * {@link uk.org.taverna.platform.run.api.RunProfile#RunProfile(org.apache.taverna.scufl2.api.container.WorkflowBundle, org.apache.taverna.scufl2.api.core.Workflow, org.apache.taverna.scufl2.api.profiles.Profile, java.util.Map, net.sf.taverna.t2.reference.ReferenceService, uk.org.taverna.platform.execution.api.ExecutionService)}
* .
*/
@Test
@@ -105,7 +105,7 @@ public class RunProfileTest {
/**
* Test method for
- * {@link uk.org.taverna.platform.run.api.RunProfile#setWorkflowBundle(uk.org.taverna.scufl2.api.container.WorkflowBundle)}
+ * {@link uk.org.taverna.platform.run.api.RunProfile#setWorkflowBundle(org.apache.taverna.scufl2.api.container.WorkflowBundle)}
* .
*/
@Test
@@ -132,7 +132,7 @@ public class RunProfileTest {
/**
* Test method for
- * {@link uk.org.taverna.platform.run.api.RunProfile#setWorkflow(uk.org.taverna.scufl2.api.core.Workflow)}
+ * {@link uk.org.taverna.platform.run.api.RunProfile#setWorkflow(org.apache.taverna.scufl2.api.core.Workflow)}
* .
*/
@Test
@@ -165,7 +165,7 @@ public class RunProfileTest {
/**
* Test method for
- * {@link uk.org.taverna.platform.run.api.RunProfile#setProfile(uk.org.taverna.scufl2.api.profiles.Profile)}
+ * {@link uk.org.taverna.platform.run.api.RunProfile#setProfile(org.apache.taverna.scufl2.api.profiles.Profile)}
* .
*/
@Test
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-run-impl/src/main/java/uk/org/taverna/platform/run/impl/Run.java
----------------------------------------------------------------------
diff --git a/taverna-run-impl/src/main/java/uk/org/taverna/platform/run/impl/Run.java b/taverna-run-impl/src/main/java/uk/org/taverna/platform/run/impl/Run.java
index 453df96..475796f 100755
--- a/taverna-run-impl/src/main/java/uk/org/taverna/platform/run/impl/Run.java
+++ b/taverna-run-impl/src/main/java/uk/org/taverna/platform/run/impl/Run.java
@@ -46,10 +46,10 @@ import uk.org.taverna.platform.report.WorkflowReport;
import uk.org.taverna.platform.run.api.RunProfile;
import uk.org.taverna.platform.run.api.RunProfileException;
import uk.org.taverna.platform.run.api.RunStateException;
-import uk.org.taverna.scufl2.api.container.WorkflowBundle;
-import uk.org.taverna.scufl2.api.core.Workflow;
-import uk.org.taverna.scufl2.api.io.ReaderException;
-import uk.org.taverna.scufl2.api.profiles.Profile;
+import org.apache.taverna.scufl2.api.container.WorkflowBundle;
+import org.apache.taverna.scufl2.api.core.Workflow;
+import org.apache.taverna.scufl2.api.io.ReaderException;
+import org.apache.taverna.scufl2.api.profiles.Profile;
/**
* A single run of a {@link Workflow}.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-run-impl/src/main/java/uk/org/taverna/platform/run/impl/RunServiceImpl.java
----------------------------------------------------------------------
diff --git a/taverna-run-impl/src/main/java/uk/org/taverna/platform/run/impl/RunServiceImpl.java b/taverna-run-impl/src/main/java/uk/org/taverna/platform/run/impl/RunServiceImpl.java
index 5ee2a75..e6da8d2 100755
--- a/taverna-run-impl/src/main/java/uk/org/taverna/platform/run/impl/RunServiceImpl.java
+++ b/taverna-run-impl/src/main/java/uk/org/taverna/platform/run/impl/RunServiceImpl.java
@@ -53,11 +53,11 @@ import uk.org.taverna.platform.run.api.RunProfile;
import uk.org.taverna.platform.run.api.RunProfileException;
import uk.org.taverna.platform.run.api.RunService;
import uk.org.taverna.platform.run.api.RunStateException;
-import uk.org.taverna.scufl2.api.container.WorkflowBundle;
-import uk.org.taverna.scufl2.api.core.Workflow;
-import uk.org.taverna.scufl2.api.io.ReaderException;
-import uk.org.taverna.scufl2.api.io.WorkflowBundleIO;
-import uk.org.taverna.scufl2.api.profiles.Profile;
+import org.apache.taverna.scufl2.api.container.WorkflowBundle;
+import org.apache.taverna.scufl2.api.core.Workflow;
+import org.apache.taverna.scufl2.api.io.ReaderException;
+import org.apache.taverna.scufl2.api.io.WorkflowBundleIO;
+import org.apache.taverna.scufl2.api.profiles.Profile;
/**
* Implementation of the <code>RunService</code>.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-run-impl/src/main/java/uk/org/taverna/platform/run/impl/WorkflowReportJSON.java
----------------------------------------------------------------------
diff --git a/taverna-run-impl/src/main/java/uk/org/taverna/platform/run/impl/WorkflowReportJSON.java b/taverna-run-impl/src/main/java/uk/org/taverna/platform/run/impl/WorkflowReportJSON.java
index c1a3395..fb1cd43 100644
--- a/taverna-run-impl/src/main/java/uk/org/taverna/platform/run/impl/WorkflowReportJSON.java
+++ b/taverna-run-impl/src/main/java/uk/org/taverna/platform/run/impl/WorkflowReportJSON.java
@@ -41,13 +41,13 @@ import uk.org.taverna.platform.report.ProcessorReport;
import uk.org.taverna.platform.report.State;
import uk.org.taverna.platform.report.StatusReport;
import uk.org.taverna.platform.report.WorkflowReport;
-import uk.org.taverna.scufl2.api.activity.Activity;
-import uk.org.taverna.scufl2.api.common.URITools;
-import uk.org.taverna.scufl2.api.common.WorkflowBean;
-import uk.org.taverna.scufl2.api.container.WorkflowBundle;
-import uk.org.taverna.scufl2.api.core.Processor;
-import uk.org.taverna.scufl2.api.core.Workflow;
-import uk.org.taverna.scufl2.api.io.ReaderException;
+import org.apache.taverna.scufl2.api.activity.Activity;
+import org.apache.taverna.scufl2.api.common.URITools;
+import org.apache.taverna.scufl2.api.common.WorkflowBean;
+import org.apache.taverna.scufl2.api.container.WorkflowBundle;
+import org.apache.taverna.scufl2.api.core.Processor;
+import org.apache.taverna.scufl2.api.core.Workflow;
+import org.apache.taverna.scufl2.api.io.ReaderException;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-run-impl/src/test/java/uk/org/taverna/platform/run/impl/DummyWorkflowReport.java
----------------------------------------------------------------------
diff --git a/taverna-run-impl/src/test/java/uk/org/taverna/platform/run/impl/DummyWorkflowReport.java b/taverna-run-impl/src/test/java/uk/org/taverna/platform/run/impl/DummyWorkflowReport.java
index 84fc2d7..3dfed87 100644
--- a/taverna-run-impl/src/test/java/uk/org/taverna/platform/run/impl/DummyWorkflowReport.java
+++ b/taverna-run-impl/src/test/java/uk/org/taverna/platform/run/impl/DummyWorkflowReport.java
@@ -15,12 +15,12 @@ import uk.org.taverna.platform.report.ActivityReport;
import uk.org.taverna.platform.report.Invocation;
import uk.org.taverna.platform.report.ProcessorReport;
import uk.org.taverna.platform.report.WorkflowReport;
-import uk.org.taverna.scufl2.api.common.Scufl2Tools;
-import uk.org.taverna.scufl2.api.container.WorkflowBundle;
-import uk.org.taverna.scufl2.api.core.Processor;
-import uk.org.taverna.scufl2.api.io.ReaderException;
-import uk.org.taverna.scufl2.api.io.WorkflowBundleIO;
-import uk.org.taverna.scufl2.api.profiles.ProcessorBinding;
+import org.apache.taverna.scufl2.api.common.Scufl2Tools;
+import org.apache.taverna.scufl2.api.container.WorkflowBundle;
+import org.apache.taverna.scufl2.api.core.Processor;
+import org.apache.taverna.scufl2.api.io.ReaderException;
+import org.apache.taverna.scufl2.api.io.WorkflowBundleIO;
+import org.apache.taverna.scufl2.api.profiles.ProcessorBinding;
public class DummyWorkflowReport {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-run-impl/src/test/java/uk/org/taverna/platform/run/impl/RunTest.java
----------------------------------------------------------------------
diff --git a/taverna-run-impl/src/test/java/uk/org/taverna/platform/run/impl/RunTest.java b/taverna-run-impl/src/test/java/uk/org/taverna/platform/run/impl/RunTest.java
index 80f22c8..f0da91d 100644
--- a/taverna-run-impl/src/test/java/uk/org/taverna/platform/run/impl/RunTest.java
+++ b/taverna-run-impl/src/test/java/uk/org/taverna/platform/run/impl/RunTest.java
@@ -20,7 +20,7 @@ import uk.org.taverna.platform.execution.api.ExecutionEnvironment;
import uk.org.taverna.platform.execution.api.ExecutionService;
import uk.org.taverna.platform.report.State;
import uk.org.taverna.platform.run.api.RunProfile;
-import uk.org.taverna.scufl2.api.io.WorkflowBundleIO;
+import org.apache.taverna.scufl2.api.io.WorkflowBundleIO;
public class RunTest extends DummyWorkflowReport {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-run-impl/src/test/java/uk/org/taverna/platform/run/impl/WorkflowReportJSONTest.java
----------------------------------------------------------------------
diff --git a/taverna-run-impl/src/test/java/uk/org/taverna/platform/run/impl/WorkflowReportJSONTest.java b/taverna-run-impl/src/test/java/uk/org/taverna/platform/run/impl/WorkflowReportJSONTest.java
index 502f606..fb8f61f 100644
--- a/taverna-run-impl/src/test/java/uk/org/taverna/platform/run/impl/WorkflowReportJSONTest.java
+++ b/taverna-run-impl/src/test/java/uk/org/taverna/platform/run/impl/WorkflowReportJSONTest.java
@@ -22,8 +22,8 @@ import uk.org.taverna.platform.report.Invocation;
import uk.org.taverna.platform.report.ProcessorReport;
import uk.org.taverna.platform.report.State;
import uk.org.taverna.platform.report.WorkflowReport;
-import uk.org.taverna.scufl2.api.common.URITools;
-import uk.org.taverna.scufl2.api.core.Processor;
+import org.apache.taverna.scufl2.api.common.URITools;
+import org.apache.taverna.scufl2.api.core.Processor;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-services-api/src/main/java/uk/org/taverna/commons/services/ServiceRegistry.java
----------------------------------------------------------------------
diff --git a/taverna-services-api/src/main/java/uk/org/taverna/commons/services/ServiceRegistry.java b/taverna-services-api/src/main/java/uk/org/taverna/commons/services/ServiceRegistry.java
index a40a1d7..62e45b4 100644
--- a/taverna-services-api/src/main/java/uk/org/taverna/commons/services/ServiceRegistry.java
+++ b/taverna-services-api/src/main/java/uk/org/taverna/commons/services/ServiceRegistry.java
@@ -23,8 +23,8 @@ package uk.org.taverna.commons.services;
import java.net.URI;
import java.util.Set;
-import uk.org.taverna.scufl2.api.port.InputActivityPort;
-import uk.org.taverna.scufl2.api.port.OutputActivityPort;
+import org.apache.taverna.scufl2.api.port.InputActivityPort;
+import org.apache.taverna.scufl2.api.port.OutputActivityPort;
import com.fasterxml.jackson.databind.JsonNode;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4ee7aa06/taverna-services-impl/src/main/java/uk/org/taverna/commons/services/impl/ServiceRegistryImpl.java
----------------------------------------------------------------------
diff --git a/taverna-services-impl/src/main/java/uk/org/taverna/commons/services/impl/ServiceRegistryImpl.java b/taverna-services-impl/src/main/java/uk/org/taverna/commons/services/impl/ServiceRegistryImpl.java
index 6847f75..2532005 100644
--- a/taverna-services-impl/src/main/java/uk/org/taverna/commons/services/impl/ServiceRegistryImpl.java
+++ b/taverna-services-impl/src/main/java/uk/org/taverna/commons/services/impl/ServiceRegistryImpl.java
@@ -29,8 +29,8 @@ import uk.org.taverna.commons.services.ServiceRegistry;
import uk.org.taverna.platform.capability.api.ActivityConfigurationException;
import uk.org.taverna.platform.capability.api.ActivityNotFoundException;
import uk.org.taverna.platform.capability.api.ActivityService;
-import uk.org.taverna.scufl2.api.port.InputActivityPort;
-import uk.org.taverna.scufl2.api.port.OutputActivityPort;
+import org.apache.taverna.scufl2.api.port.InputActivityPort;
+import org.apache.taverna.scufl2.api.port.OutputActivityPort;
import com.fasterxml.jackson.databind.JsonNode;