You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by re...@apache.org on 2015/03/23 18:30:45 UTC
[1/2] incubator-taverna-common-activities git commit:
Repository: incubator-taverna-common-activities
Updated Branches:
refs/heads/master 65c045182 -> ca321addc
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-interaction-activity/src/main/resources/META-INF/spring/interaction-activity-context-osgi.xml
----------------------------------------------------------------------
diff --git a/taverna-interaction-activity/src/main/resources/META-INF/spring/interaction-activity-context-osgi.xml b/taverna-interaction-activity/src/main/resources/META-INF/spring/interaction-activity-context-osgi.xml
index f9fd999..2c75c58 100644
--- a/taverna-interaction-activity/src/main/resources/META-INF/spring/interaction-activity-context-osgi.xml
+++ b/taverna-interaction-activity/src/main/resources/META-INF/spring/interaction-activity-context-osgi.xml
@@ -6,16 +6,16 @@
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi.xsd">
- <service ref="interactionActivityHealthChecker" interface="net.sf.taverna.t2.workflowmodel.health.HealthChecker" />
+ <service ref="interactionActivityHealthChecker" interface="org.apache.taverna.workflowmodel.health.HealthChecker" />
- <service ref="interactionActivityFactory" interface="net.sf.taverna.t2.workflowmodel.processor.activity.ActivityFactory" />
+ <service ref="interactionActivityFactory" interface="org.apache.taverna.workflowmodel.processor.activity.ActivityFactory" />
<reference id="credentialManager" interface="org.apache.taverna.security.credentialmanager.CredentialManager" />
<reference id="applicationConfiguration"
- interface="uk.org.taverna.configuration.app.ApplicationConfiguration" />
+ interface="org.apache.taverna.configuration.app.ApplicationConfiguration" />
- <service ref="interactionRunDeletionListener" interface="net.sf.taverna.t2.workflowmodel.RunDeletionListener" />
+ <service ref="interactionRunDeletionListener" interface="org.apache.taverna.workflowmodel.RunDeletionListener" />
</beans:beans>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-interaction-activity/src/main/resources/META-INF/spring/interaction-activity-context.xml
----------------------------------------------------------------------
diff --git a/taverna-interaction-activity/src/main/resources/META-INF/spring/interaction-activity-context.xml b/taverna-interaction-activity/src/main/resources/META-INF/spring/interaction-activity-context.xml
index a629d65..71f423a 100644
--- a/taverna-interaction-activity/src/main/resources/META-INF/spring/interaction-activity-context.xml
+++ b/taverna-interaction-activity/src/main/resources/META-INF/spring/interaction-activity-context.xml
@@ -3,9 +3,9 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean id="interactionActivityHealthChecker" class="net.sf.taverna.t2.activities.interaction.InteractionActivityHealthChecker" />
+ <bean id="interactionActivityHealthChecker" class="org.apache.taverna.activities.interaction.InteractionActivityHealthChecker" />
- <bean id="interactionActivityFactory" class="net.sf.taverna.t2.activities.interaction.InteractionActivityFactory">
+ <bean id="interactionActivityFactory" class="org.apache.taverna.activities.interaction.InteractionActivityFactory">
<property name="credentialManager" ref="credentialManager" />
<property name="interactionRecorder" ref="interactionRecorder" />
<property name="interactionUtils" ref="interactionUtils" />
@@ -15,46 +15,46 @@
<property name="interactionVelocity" ref="interactionVelocity" />
</bean>
- <bean id="interactionUtils" class="net.sf.taverna.t2.activities.interaction.InteractionUtils">
+ <bean id="interactionUtils" class="org.apache.taverna.activities.interaction.InteractionUtils">
<property name="appConfig" ref="applicationConfiguration" />
<property name="interactionRecorder" ref="interactionRecorder" />
<property name="interactionPreference" ref="interactionPreference" />
</bean>
- <bean id="interactionRecorder" class="net.sf.taverna.t2.activities.interaction.InteractionRecorder">
+ <bean id="interactionRecorder" class="org.apache.taverna.activities.interaction.InteractionRecorder">
<property name="interactionUtils" ref="interactionUtils" />
</bean>
- <bean id="interactionRunDeletionListener" class="net.sf.taverna.t2.activities.interaction.InteractionRunDeletionListener">
+ <bean id="interactionRunDeletionListener" class="org.apache.taverna.activities.interaction.InteractionRunDeletionListener">
<property name="interactionRecorder" ref="interactionRecoder"/>
</bean>
- <bean id="responseFeedListener" class="net.sf.taverna.t2.activities.interaction.ResponseFeedListener">
+ <bean id="responseFeedListener" class="org.apache.taverna.activities.interaction.ResponseFeedListener">
<property name="interactionRecorder" ref="interactionRecorder"/>
<property name="interactionPreference" ref="interactionPreference" />
</bean>
- <bean id="showRequestFeedListener" class="net.sf.taverna.t2.activities.interaction.feed.ShowRequestFeedListener">
+ <bean id="showRequestFeedListener" class="org.apache.taverna.activities.interaction.feed.ShowRequestFeedListener">
<property name="interactionPreference" ref="interactionPreference" />
</bean>
- <bean id="interactionJetty" class="net.sf.taverna.t2.activities.interaction.jetty.InteractionJetty">
+ <bean id="interactionJetty" class="org.apache.taverna.activities.interaction.jetty.InteractionJetty">
<property name="interactionUtils" ref="interactionUtils" />
<property name="responseFeedListener" ref="responseFeedListener"/>
<property name="showRequestFeedListener" ref="showRequestFeedListener"/>
<property name="interactionPreference" ref="interactionPreference" />
</bean>
- <bean id="hackedFilesystemAdapter" class="net.sf.taverna.t2.activities.interaction.jetty.HackedFilesystemAdapter">
+ <bean id="hackedFilesystemAdapter" class="org.apache.taverna.activities.interaction.jetty.HackedFilesystemAdapter">
<property name="interactionJetty" ref="interactionJetty"/>
</bean>
- <bean id="interactionPreference" class="net.sf.taverna.t2.activities.interaction.preference.InteractionPreference">
+ <bean id="interactionPreference" class="org.apache.taverna.activities.interaction.preference.InteractionPreference">
<constructor-arg ref="applicationConfiguration" />
</bean>
<bean id="interactionVelocity"
- class="net.sf.taverna.t2.activities.interaction.velocity.InteractionVelocity"
+ class="org.apache.taverna.activities.interaction.velocity.InteractionVelocity"
init-method="checkVelocity">
</bean>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-rest-activity/src/main/java/org/apache/taverna/activities/rest/HTTPRequest.java
----------------------------------------------------------------------
diff --git a/taverna-rest-activity/src/main/java/org/apache/taverna/activities/rest/HTTPRequest.java b/taverna-rest-activity/src/main/java/org/apache/taverna/activities/rest/HTTPRequest.java
index 6e78e89..b0397bf 100644
--- a/taverna-rest-activity/src/main/java/org/apache/taverna/activities/rest/HTTPRequest.java
+++ b/taverna-rest-activity/src/main/java/org/apache/taverna/activities/rest/HTTPRequest.java
@@ -24,8 +24,8 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.taverna.activities.rest.RESTActivity.HTTP_METHOD;
-import net.sf.taverna.t2.workflowmodel.processor.config.ConfigurationBean;
-import net.sf.taverna.t2.workflowmodel.processor.config.ConfigurationProperty;
+import org.apache.taverna.workflowmodel.processor.config.ConfigurationBean;
+import org.apache.taverna.workflowmodel.processor.config.ConfigurationProperty;
/**
* HTTP Request configuration bean.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-rest-activity/src/main/java/org/apache/taverna/activities/rest/HTTPRequestHeader.java
----------------------------------------------------------------------
diff --git a/taverna-rest-activity/src/main/java/org/apache/taverna/activities/rest/HTTPRequestHeader.java b/taverna-rest-activity/src/main/java/org/apache/taverna/activities/rest/HTTPRequestHeader.java
index abaff68..106741c 100644
--- a/taverna-rest-activity/src/main/java/org/apache/taverna/activities/rest/HTTPRequestHeader.java
+++ b/taverna-rest-activity/src/main/java/org/apache/taverna/activities/rest/HTTPRequestHeader.java
@@ -19,8 +19,8 @@
package org.apache.taverna.activities.rest;
-import net.sf.taverna.t2.workflowmodel.processor.config.ConfigurationBean;
-import net.sf.taverna.t2.workflowmodel.processor.config.ConfigurationProperty;
+import org.apache.taverna.workflowmodel.processor.config.ConfigurationBean;
+import org.apache.taverna.workflowmodel.processor.config.ConfigurationProperty;
/**
* HTTP Request Header configuration bean
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-rest-activity/src/main/java/org/apache/taverna/activities/rest/RESTActivity.java
----------------------------------------------------------------------
diff --git a/taverna-rest-activity/src/main/java/org/apache/taverna/activities/rest/RESTActivity.java b/taverna-rest-activity/src/main/java/org/apache/taverna/activities/rest/RESTActivity.java
index 87b29be..bd80f0f 100644
--- a/taverna-rest-activity/src/main/java/org/apache/taverna/activities/rest/RESTActivity.java
+++ b/taverna-rest-activity/src/main/java/org/apache/taverna/activities/rest/RESTActivity.java
@@ -27,13 +27,13 @@ import java.util.Map;
import org.apache.taverna.activities.rest.HTTPRequestHandler.HTTPRequestResponse;
import org.apache.taverna.activities.rest.URISignatureHandler.URISignatureParsingException;
-import net.sf.taverna.t2.invocation.InvocationContext;
-import net.sf.taverna.t2.reference.ErrorDocument;
-import net.sf.taverna.t2.reference.ReferenceService;
-import net.sf.taverna.t2.reference.T2Reference;
-import net.sf.taverna.t2.workflowmodel.processor.activity.AbstractAsynchronousActivity;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityConfigurationException;
-import net.sf.taverna.t2.workflowmodel.processor.activity.AsynchronousActivityCallback;
+import org.apache.taverna.invocation.InvocationContext;
+import org.apache.taverna.reference.ErrorDocument;
+import org.apache.taverna.reference.ReferenceService;
+import org.apache.taverna.reference.T2Reference;
+import org.apache.taverna.workflowmodel.processor.activity.AbstractAsynchronousActivity;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityConfigurationException;
+import org.apache.taverna.workflowmodel.processor.activity.AsynchronousActivityCallback;
import org.apache.http.client.CredentialsProvider;
import org.apache.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-rest-activity/src/main/java/org/apache/taverna/activities/rest/RESTActivityConfigurationBean.java
----------------------------------------------------------------------
diff --git a/taverna-rest-activity/src/main/java/org/apache/taverna/activities/rest/RESTActivityConfigurationBean.java b/taverna-rest-activity/src/main/java/org/apache/taverna/activities/rest/RESTActivityConfigurationBean.java
index f52128b..0ca8467 100644
--- a/taverna-rest-activity/src/main/java/org/apache/taverna/activities/rest/RESTActivityConfigurationBean.java
+++ b/taverna-rest-activity/src/main/java/org/apache/taverna/activities/rest/RESTActivityConfigurationBean.java
@@ -31,8 +31,8 @@ import com.fasterxml.jackson.databind.JsonNode;
import org.apache.taverna.activities.rest.RESTActivity.DATA_FORMAT;
import org.apache.taverna.activities.rest.RESTActivity.HTTP_METHOD;
-import net.sf.taverna.t2.workflowmodel.processor.config.ConfigurationBean;
-import net.sf.taverna.t2.workflowmodel.processor.config.ConfigurationProperty;
+import org.apache.taverna.workflowmodel.processor.config.ConfigurationBean;
+import org.apache.taverna.workflowmodel.processor.config.ConfigurationProperty;
/**
* Beans of this class store configuration information for REST activities.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-rest-activity/src/main/java/org/apache/taverna/activities/rest/RESTActivityFactory.java
----------------------------------------------------------------------
diff --git a/taverna-rest-activity/src/main/java/org/apache/taverna/activities/rest/RESTActivityFactory.java b/taverna-rest-activity/src/main/java/org/apache/taverna/activities/rest/RESTActivityFactory.java
index e931a75..54471ba 100644
--- a/taverna-rest-activity/src/main/java/org/apache/taverna/activities/rest/RESTActivityFactory.java
+++ b/taverna-rest-activity/src/main/java/org/apache/taverna/activities/rest/RESTActivityFactory.java
@@ -28,11 +28,11 @@ import java.util.Set;
import org.apache.taverna.activities.rest.URISignatureHandler.URISignatureParsingException;
import org.apache.taverna.security.credentialmanager.CredentialManager;
-import net.sf.taverna.t2.workflowmodel.Edits;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityConfigurationException;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityFactory;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityInputPort;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityOutputPort;
+import org.apache.taverna.workflowmodel.Edits;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityConfigurationException;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityFactory;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityInputPort;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityOutputPort;
import org.apache.http.client.CredentialsProvider;
import org.apache.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-rest-activity/src/main/java/org/apache/taverna/activities/rest/RESTActivityHealthCheck.java
----------------------------------------------------------------------
diff --git a/taverna-rest-activity/src/main/java/org/apache/taverna/activities/rest/RESTActivityHealthCheck.java b/taverna-rest-activity/src/main/java/org/apache/taverna/activities/rest/RESTActivityHealthCheck.java
index 7986fe5..35c95b2 100644
--- a/taverna-rest-activity/src/main/java/org/apache/taverna/activities/rest/RESTActivityHealthCheck.java
+++ b/taverna-rest-activity/src/main/java/org/apache/taverna/activities/rest/RESTActivityHealthCheck.java
@@ -19,8 +19,8 @@
package org.apache.taverna.activities.rest;
-import net.sf.taverna.t2.visit.VisitKind;
-import net.sf.taverna.t2.visit.Visitor;
+import org.apache.taverna.visit.VisitKind;
+import org.apache.taverna.visit.Visitor;
/**
* A <code>RESTActivityHealthCheck</code> is a kind of visit that determines
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-rest-activity/src/main/java/org/apache/taverna/activities/rest/RESTActivityHealthChecker.java
----------------------------------------------------------------------
diff --git a/taverna-rest-activity/src/main/java/org/apache/taverna/activities/rest/RESTActivityHealthChecker.java b/taverna-rest-activity/src/main/java/org/apache/taverna/activities/rest/RESTActivityHealthChecker.java
index 7dd73be..03fc7c8 100644
--- a/taverna-rest-activity/src/main/java/org/apache/taverna/activities/rest/RESTActivityHealthChecker.java
+++ b/taverna-rest-activity/src/main/java/org/apache/taverna/activities/rest/RESTActivityHealthChecker.java
@@ -22,10 +22,10 @@ package org.apache.taverna.activities.rest;
import java.util.ArrayList;
import java.util.List;
-import net.sf.taverna.t2.visit.VisitReport;
-import net.sf.taverna.t2.visit.VisitReport.Status;
-import net.sf.taverna.t2.workflowmodel.health.HealthCheck;
-import net.sf.taverna.t2.workflowmodel.health.HealthChecker;
+import org.apache.taverna.visit.VisitReport;
+import org.apache.taverna.visit.VisitReport.Status;
+import org.apache.taverna.workflowmodel.health.HealthCheck;
+import org.apache.taverna.workflowmodel.health.HealthChecker;
/**
* A {@link HealthChecker} for a {@link RESTActivity}.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-rest-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.report.explainer.VisitExplainer
----------------------------------------------------------------------
diff --git a/taverna-rest-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.report.explainer.VisitExplainer b/taverna-rest-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.report.explainer.VisitExplainer
deleted file mode 100644
index 86b3ad6..0000000
--- a/taverna-rest-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.report.explainer.VisitExplainer
+++ /dev/null
@@ -1 +0,0 @@
-net.sf.taverna.t2.activities.rest.RESTActivityHealthCheckVisitExplainer
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-rest-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.health.HealthChecker
----------------------------------------------------------------------
diff --git a/taverna-rest-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.health.HealthChecker b/taverna-rest-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.health.HealthChecker
deleted file mode 100644
index 737de29..0000000
--- a/taverna-rest-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.health.HealthChecker
+++ /dev/null
@@ -1 +0,0 @@
-net.sf.taverna.t2.activities.rest.RESTActivityHealthChecker
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-rest-activity/src/main/resources/META-INF/services/org.apache.taverna.workbench.report.explainer.VisitExplainer
----------------------------------------------------------------------
diff --git a/taverna-rest-activity/src/main/resources/META-INF/services/org.apache.taverna.workbench.report.explainer.VisitExplainer b/taverna-rest-activity/src/main/resources/META-INF/services/org.apache.taverna.workbench.report.explainer.VisitExplainer
new file mode 100644
index 0000000..86b3ad6
--- /dev/null
+++ b/taverna-rest-activity/src/main/resources/META-INF/services/org.apache.taverna.workbench.report.explainer.VisitExplainer
@@ -0,0 +1 @@
+net.sf.taverna.t2.activities.rest.RESTActivityHealthCheckVisitExplainer
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-rest-activity/src/main/resources/META-INF/services/org.apache.taverna.workflowmodel.health.HealthChecker
----------------------------------------------------------------------
diff --git a/taverna-rest-activity/src/main/resources/META-INF/services/org.apache.taverna.workflowmodel.health.HealthChecker b/taverna-rest-activity/src/main/resources/META-INF/services/org.apache.taverna.workflowmodel.health.HealthChecker
new file mode 100644
index 0000000..737de29
--- /dev/null
+++ b/taverna-rest-activity/src/main/resources/META-INF/services/org.apache.taverna.workflowmodel.health.HealthChecker
@@ -0,0 +1 @@
+net.sf.taverna.t2.activities.rest.RESTActivityHealthChecker
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-rest-activity/src/main/resources/META-INF/spring/rest-activity-context-osgi.xml
----------------------------------------------------------------------
diff --git a/taverna-rest-activity/src/main/resources/META-INF/spring/rest-activity-context-osgi.xml b/taverna-rest-activity/src/main/resources/META-INF/spring/rest-activity-context-osgi.xml
index 1e829ea..d965e24 100644
--- a/taverna-rest-activity/src/main/resources/META-INF/spring/rest-activity-context-osgi.xml
+++ b/taverna-rest-activity/src/main/resources/META-INF/spring/rest-activity-context-osgi.xml
@@ -6,11 +6,11 @@
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi.xsd">
- <service ref="RESTActivityHealthChecker" interface="net.sf.taverna.t2.workflowmodel.health.HealthChecker" />
+ <service ref="RESTActivityHealthChecker" interface="org.apache.taverna.workflowmodel.health.HealthChecker" />
- <service ref="restActivityFactory" interface="net.sf.taverna.t2.workflowmodel.processor.activity.ActivityFactory" />
+ <service ref="restActivityFactory" interface="org.apache.taverna.workflowmodel.processor.activity.ActivityFactory" />
<reference id="credentialManager" interface="org.apache.taverna.security.credentialmanager.CredentialManager" />
- <reference id="edits" interface="net.sf.taverna.t2.workflowmodel.Edits" />
+ <reference id="edits" interface="org.apache.taverna.workflowmodel.Edits" />
</beans:beans>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-spreadsheet-import-activity/src/main/java/org/apache/taverna/activities/spreadsheet/Range.java
----------------------------------------------------------------------
diff --git a/taverna-spreadsheet-import-activity/src/main/java/org/apache/taverna/activities/spreadsheet/Range.java b/taverna-spreadsheet-import-activity/src/main/java/org/apache/taverna/activities/spreadsheet/Range.java
index 9e755bf..17e4988 100644
--- a/taverna-spreadsheet-import-activity/src/main/java/org/apache/taverna/activities/spreadsheet/Range.java
+++ b/taverna-spreadsheet-import-activity/src/main/java/org/apache/taverna/activities/spreadsheet/Range.java
@@ -22,8 +22,8 @@ package org.apache.taverna.activities.spreadsheet;
import java.util.ArrayList;
import java.util.List;
-import net.sf.taverna.t2.workflowmodel.processor.config.ConfigurationBean;
-import net.sf.taverna.t2.workflowmodel.processor.config.ConfigurationProperty;
+import org.apache.taverna.workflowmodel.processor.config.ConfigurationBean;
+import org.apache.taverna.workflowmodel.processor.config.ConfigurationProperty;
/**
* A range of integer values.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-spreadsheet-import-activity/src/main/java/org/apache/taverna/activities/spreadsheet/SpreadsheetImportActivity.java
----------------------------------------------------------------------
diff --git a/taverna-spreadsheet-import-activity/src/main/java/org/apache/taverna/activities/spreadsheet/SpreadsheetImportActivity.java b/taverna-spreadsheet-import-activity/src/main/java/org/apache/taverna/activities/spreadsheet/SpreadsheetImportActivity.java
index 9639bc4..f731643 100644
--- a/taverna-spreadsheet-import-activity/src/main/java/org/apache/taverna/activities/spreadsheet/SpreadsheetImportActivity.java
+++ b/taverna-spreadsheet-import-activity/src/main/java/org/apache/taverna/activities/spreadsheet/SpreadsheetImportActivity.java
@@ -34,19 +34,19 @@ import java.util.Map.Entry;
import java.util.Set;
import java.util.SortedMap;
-import net.sf.taverna.t2.invocation.InvocationContext;
-import net.sf.taverna.t2.reference.ExternalReferenceSPI;
-import net.sf.taverna.t2.reference.Identified;
-import net.sf.taverna.t2.reference.ReferenceService;
-import net.sf.taverna.t2.reference.ReferenceServiceException;
-import net.sf.taverna.t2.reference.ReferenceSet;
-import net.sf.taverna.t2.reference.T2Reference;
-import net.sf.taverna.t2.reference.ValueCarryingExternalReference;
-import net.sf.taverna.t2.workflowmodel.OutputPort;
-import net.sf.taverna.t2.workflowmodel.Port;
-import net.sf.taverna.t2.workflowmodel.processor.activity.AbstractAsynchronousActivity;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityConfigurationException;
-import net.sf.taverna.t2.workflowmodel.processor.activity.AsynchronousActivityCallback;
+import org.apache.taverna.invocation.InvocationContext;
+import org.apache.taverna.reference.ExternalReferenceSPI;
+import org.apache.taverna.reference.Identified;
+import org.apache.taverna.reference.ReferenceService;
+import org.apache.taverna.reference.ReferenceServiceException;
+import org.apache.taverna.reference.ReferenceSet;
+import org.apache.taverna.reference.T2Reference;
+import org.apache.taverna.reference.ValueCarryingExternalReference;
+import org.apache.taverna.workflowmodel.OutputPort;
+import org.apache.taverna.workflowmodel.Port;
+import org.apache.taverna.workflowmodel.processor.activity.AbstractAsynchronousActivity;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityConfigurationException;
+import org.apache.taverna.workflowmodel.processor.activity.AsynchronousActivityCallback;
import org.apache.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-spreadsheet-import-activity/src/main/java/org/apache/taverna/activities/spreadsheet/SpreadsheetImportActivityFactory.java
----------------------------------------------------------------------
diff --git a/taverna-spreadsheet-import-activity/src/main/java/org/apache/taverna/activities/spreadsheet/SpreadsheetImportActivityFactory.java b/taverna-spreadsheet-import-activity/src/main/java/org/apache/taverna/activities/spreadsheet/SpreadsheetImportActivityFactory.java
index 3c6e4ac..b1b6592 100644
--- a/taverna-spreadsheet-import-activity/src/main/java/org/apache/taverna/activities/spreadsheet/SpreadsheetImportActivityFactory.java
+++ b/taverna-spreadsheet-import-activity/src/main/java/org/apache/taverna/activities/spreadsheet/SpreadsheetImportActivityFactory.java
@@ -27,11 +27,11 @@ import java.util.Set;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
-import net.sf.taverna.t2.workflowmodel.Edits;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityConfigurationException;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityFactory;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityInputPort;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityOutputPort;
+import org.apache.taverna.workflowmodel.Edits;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityConfigurationException;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityFactory;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityInputPort;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityOutputPort;
/**
* An {@link ActivityFactory} for creating <code>SpreadsheetImportActivity</code>.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-spreadsheet-import-activity/src/main/java/org/apache/taverna/activities/spreadsheet/SpreadsheetImportConfiguration.java
----------------------------------------------------------------------
diff --git a/taverna-spreadsheet-import-activity/src/main/java/org/apache/taverna/activities/spreadsheet/SpreadsheetImportConfiguration.java b/taverna-spreadsheet-import-activity/src/main/java/org/apache/taverna/activities/spreadsheet/SpreadsheetImportConfiguration.java
index 0c33732..02d7252 100644
--- a/taverna-spreadsheet-import-activity/src/main/java/org/apache/taverna/activities/spreadsheet/SpreadsheetImportConfiguration.java
+++ b/taverna-spreadsheet-import-activity/src/main/java/org/apache/taverna/activities/spreadsheet/SpreadsheetImportConfiguration.java
@@ -23,8 +23,8 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import net.sf.taverna.t2.workflowmodel.processor.config.ConfigurationBean;
-import net.sf.taverna.t2.workflowmodel.processor.config.ConfigurationProperty;
+import org.apache.taverna.workflowmodel.processor.config.ConfigurationBean;
+import org.apache.taverna.workflowmodel.processor.config.ConfigurationProperty;
/**
* Configuration for the SpreadsheetImport activity.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-spreadsheet-import-activity/src/main/java/org/apache/taverna/activities/spreadsheet/SpreadsheetImportHealthChecker.java
----------------------------------------------------------------------
diff --git a/taverna-spreadsheet-import-activity/src/main/java/org/apache/taverna/activities/spreadsheet/SpreadsheetImportHealthChecker.java b/taverna-spreadsheet-import-activity/src/main/java/org/apache/taverna/activities/spreadsheet/SpreadsheetImportHealthChecker.java
index d244747..c4d4da1 100644
--- a/taverna-spreadsheet-import-activity/src/main/java/org/apache/taverna/activities/spreadsheet/SpreadsheetImportHealthChecker.java
+++ b/taverna-spreadsheet-import-activity/src/main/java/org/apache/taverna/activities/spreadsheet/SpreadsheetImportHealthChecker.java
@@ -23,11 +23,11 @@ import java.util.List;
import com.fasterxml.jackson.databind.JsonNode;
-import net.sf.taverna.t2.workflowmodel.Processor;
-import net.sf.taverna.t2.workflowmodel.health.HealthCheck;
-import net.sf.taverna.t2.workflowmodel.health.HealthChecker;
-import net.sf.taverna.t2.visit.VisitReport;
-import net.sf.taverna.t2.visit.VisitReport.Status;
+import org.apache.taverna.workflowmodel.Processor;
+import org.apache.taverna.workflowmodel.health.HealthCheck;
+import org.apache.taverna.workflowmodel.health.HealthChecker;
+import org.apache.taverna.visit.VisitReport;
+import org.apache.taverna.visit.VisitReport.Status;
/**
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-spreadsheet-import-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.health.HealthChecker
----------------------------------------------------------------------
diff --git a/taverna-spreadsheet-import-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.health.HealthChecker b/taverna-spreadsheet-import-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.health.HealthChecker
deleted file mode 100644
index 5fc5813..0000000
--- a/taverna-spreadsheet-import-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.health.HealthChecker
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.taverna.activities.spreadsheet.SpreadsheetImportHealthChecker
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-spreadsheet-import-activity/src/main/resources/META-INF/services/org.apache.taverna.workflowmodel.health.HealthChecker
----------------------------------------------------------------------
diff --git a/taverna-spreadsheet-import-activity/src/main/resources/META-INF/services/org.apache.taverna.workflowmodel.health.HealthChecker b/taverna-spreadsheet-import-activity/src/main/resources/META-INF/services/org.apache.taverna.workflowmodel.health.HealthChecker
new file mode 100644
index 0000000..5fc5813
--- /dev/null
+++ b/taverna-spreadsheet-import-activity/src/main/resources/META-INF/services/org.apache.taverna.workflowmodel.health.HealthChecker
@@ -0,0 +1 @@
+org.apache.taverna.activities.spreadsheet.SpreadsheetImportHealthChecker
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-spreadsheet-import-activity/src/main/resources/META-INF/spring/spreadsheetimport-activity-context-osgi.xml
----------------------------------------------------------------------
diff --git a/taverna-spreadsheet-import-activity/src/main/resources/META-INF/spring/spreadsheetimport-activity-context-osgi.xml b/taverna-spreadsheet-import-activity/src/main/resources/META-INF/spring/spreadsheetimport-activity-context-osgi.xml
index 577b30b..13794d9 100644
--- a/taverna-spreadsheet-import-activity/src/main/resources/META-INF/spring/spreadsheetimport-activity-context-osgi.xml
+++ b/taverna-spreadsheet-import-activity/src/main/resources/META-INF/spring/spreadsheetimport-activity-context-osgi.xml
@@ -6,10 +6,10 @@
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi.xsd">
- <service ref="spreadsheetImportActivityHealthChecker" interface="net.sf.taverna.t2.workflowmodel.health.HealthChecker" />
+ <service ref="spreadsheetImportActivityHealthChecker" interface="org.apache.taverna.workflowmodel.health.HealthChecker" />
- <service ref="spreadsheetImportActivityFactory" interface="net.sf.taverna.t2.workflowmodel.processor.activity.ActivityFactory" />
+ <service ref="spreadsheetImportActivityFactory" interface="org.apache.taverna.workflowmodel.processor.activity.ActivityFactory" />
- <reference id="edits" interface="net.sf.taverna.t2.workflowmodel.Edits" />
+ <reference id="edits" interface="org.apache.taverna.workflowmodel.Edits" />
</beans:beans>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-spreadsheet-import-activity/src/test/java/org/apache/taverna/activities/spreadsheet/SpreadsheetImportActivityTest.java
----------------------------------------------------------------------
diff --git a/taverna-spreadsheet-import-activity/src/test/java/org/apache/taverna/activities/spreadsheet/SpreadsheetImportActivityTest.java b/taverna-spreadsheet-import-activity/src/test/java/org/apache/taverna/activities/spreadsheet/SpreadsheetImportActivityTest.java
index 3d17b38..8b3ad4a 100644
--- a/taverna-spreadsheet-import-activity/src/test/java/org/apache/taverna/activities/spreadsheet/SpreadsheetImportActivityTest.java
+++ b/taverna-spreadsheet-import-activity/src/test/java/org/apache/taverna/activities/spreadsheet/SpreadsheetImportActivityTest.java
@@ -30,13 +30,13 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import net.sf.taverna.t2.activities.testutils.ActivityInvoker;
-import net.sf.taverna.t2.workflowmodel.Edits;
-import net.sf.taverna.t2.workflowmodel.Port;
-import net.sf.taverna.t2.workflowmodel.impl.EditsImpl;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityConfigurationException;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityInputPort;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityOutputPort;
+import org.apache.taverna.activities.testutils.ActivityInvoker;
+import org.apache.taverna.workflowmodel.Edits;
+import org.apache.taverna.workflowmodel.Port;
+import org.apache.taverna.workflowmodel.impl.EditsImpl;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityConfigurationException;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityInputPort;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityOutputPort;
import org.junit.Before;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-spreadsheet-import-activity/src/test/java/org/apache/taverna/activities/spreadsheet/SpreadsheetImportHealthCheckerTest.java
----------------------------------------------------------------------
diff --git a/taverna-spreadsheet-import-activity/src/test/java/org/apache/taverna/activities/spreadsheet/SpreadsheetImportHealthCheckerTest.java b/taverna-spreadsheet-import-activity/src/test/java/org/apache/taverna/activities/spreadsheet/SpreadsheetImportHealthCheckerTest.java
index 91d0e3b..39ce7ca 100644
--- a/taverna-spreadsheet-import-activity/src/test/java/org/apache/taverna/activities/spreadsheet/SpreadsheetImportHealthCheckerTest.java
+++ b/taverna-spreadsheet-import-activity/src/test/java/org/apache/taverna/activities/spreadsheet/SpreadsheetImportHealthCheckerTest.java
@@ -25,8 +25,8 @@ import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
-import net.sf.taverna.t2.visit.VisitReport.Status;
-import net.sf.taverna.t2.workflowmodel.impl.EditsImpl;
+import org.apache.taverna.visit.VisitReport.Status;
+import org.apache.taverna.workflowmodel.impl.EditsImpl;
import org.junit.Before;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/WSDLActivity.java
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/WSDLActivity.java b/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/WSDLActivity.java
index dfc64fb..f8539c5 100644
--- a/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/WSDLActivity.java
+++ b/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/WSDLActivity.java
@@ -33,17 +33,17 @@ import java.util.Map;
import javax.wsdl.WSDLException;
import javax.xml.parsers.ParserConfigurationException;
-//import net.sf.taverna.t2.activities.wsdl.security.SecurityProfiles;
-import net.sf.taverna.t2.reference.ReferenceService;
-import net.sf.taverna.t2.reference.ReferenceServiceException;
-import net.sf.taverna.t2.reference.T2Reference;
+//import org.apache.taverna.activities.wsdl.security.SecurityProfiles;
+import org.apache.taverna.reference.ReferenceService;
+import org.apache.taverna.reference.ReferenceServiceException;
+import org.apache.taverna.reference.T2Reference;
import org.apache.taverna.security.credentialmanager.CredentialManager;
-import net.sf.taverna.t2.workflowmodel.OutputPort;
-import net.sf.taverna.t2.workflowmodel.processor.activity.AbstractAsynchronousActivity;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityConfigurationException;
-import net.sf.taverna.t2.workflowmodel.processor.activity.AsynchronousActivityCallback;
-import net.sf.taverna.t2.workflowmodel.health.RemoteHealthChecker;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityOutputPort;
+import org.apache.taverna.workflowmodel.OutputPort;
+import org.apache.taverna.workflowmodel.processor.activity.AbstractAsynchronousActivity;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityConfigurationException;
+import org.apache.taverna.workflowmodel.processor.activity.AsynchronousActivityCallback;
+import org.apache.taverna.workflowmodel.health.RemoteHealthChecker;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityOutputPort;
import org.apache.taverna.wsdl.parser.TypeDescriptor;
import org.apache.taverna.wsdl.parser.UnknownOperationException;
import org.apache.taverna.wsdl.parser.WSDLParser;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/WSDLActivityConfigurationBean.java
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/WSDLActivityConfigurationBean.java b/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/WSDLActivityConfigurationBean.java
index 9c2d384..5b12672 100644
--- a/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/WSDLActivityConfigurationBean.java
+++ b/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/WSDLActivityConfigurationBean.java
@@ -21,8 +21,8 @@ package org.apache.taverna.activities.wsdl;
import java.net.URI;
-import net.sf.taverna.t2.workflowmodel.processor.config.ConfigurationBean;
-import net.sf.taverna.t2.workflowmodel.processor.config.ConfigurationProperty;
+import org.apache.taverna.workflowmodel.processor.config.ConfigurationBean;
+import org.apache.taverna.workflowmodel.processor.config.ConfigurationProperty;
/**
* A standard Java Bean that provides the details required to configure a WSDLActivity.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/WSDLActivityDescriptorChecker.java
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/WSDLActivityDescriptorChecker.java b/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/WSDLActivityDescriptorChecker.java
index e83f1b7..aea61f3 100644
--- a/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/WSDLActivityDescriptorChecker.java
+++ b/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/WSDLActivityDescriptorChecker.java
@@ -29,24 +29,23 @@ import java.util.Map.Entry;
import org.apache.log4j.Logger;
-import net.sf.taverna.t2.visit.VisitReport;
-import net.sf.taverna.t2.visit.VisitReport.Status;
-import net.sf.taverna.t2.workflowmodel.Dataflow;
-import net.sf.taverna.t2.workflowmodel.DataflowInputPort;
-import net.sf.taverna.t2.workflowmodel.Datalink;
-import net.sf.taverna.t2.workflowmodel.Merge;
-import net.sf.taverna.t2.workflowmodel.MergeInputPort;
-import net.sf.taverna.t2.workflowmodel.MergeOutputPort;
-import net.sf.taverna.t2.workflowmodel.MergePort;
-import net.sf.taverna.t2.workflowmodel.Port;
-import net.sf.taverna.t2.workflowmodel.Processor;
-import net.sf.taverna.t2.workflowmodel.ProcessorInputPort;
-import net.sf.taverna.t2.workflowmodel.ProcessorPort;
-import net.sf.taverna.t2.workflowmodel.health.HealthCheck;
-import net.sf.taverna.t2.workflowmodel.health.HealthChecker;
-import net.sf.taverna.t2.workflowmodel.processor.activity.Activity;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityInputPort;
-import net.sf.taverna.t2.workflowmodel.utils.Tools;
+import org.apache.taverna.visit.VisitReport;
+import org.apache.taverna.visit.VisitReport.Status;
+import org.apache.taverna.workflowmodel.Dataflow;
+import org.apache.taverna.workflowmodel.Datalink;
+import org.apache.taverna.workflowmodel.Merge;
+import org.apache.taverna.workflowmodel.MergeInputPort;
+import org.apache.taverna.workflowmodel.MergeOutputPort;
+import org.apache.taverna.workflowmodel.MergePort;
+import org.apache.taverna.workflowmodel.Port;
+import org.apache.taverna.workflowmodel.Processor;
+import org.apache.taverna.workflowmodel.ProcessorInputPort;
+import org.apache.taverna.workflowmodel.ProcessorPort;
+import org.apache.taverna.workflowmodel.health.HealthCheck;
+import org.apache.taverna.workflowmodel.health.HealthChecker;
+import org.apache.taverna.workflowmodel.processor.activity.Activity;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityInputPort;
+import org.apache.taverna.workflowmodel.utils.Tools;
import org.apache.taverna.wsdl.parser.TypeDescriptor;
import org.apache.taverna.wsdl.parser.ArrayTypeDescriptor;
import org.apache.taverna.wsdl.parser.ComplexTypeDescriptor;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/WSDLActivityFactory.java
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/WSDLActivityFactory.java b/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/WSDLActivityFactory.java
index 4419239..8b9a87e 100644
--- a/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/WSDLActivityFactory.java
+++ b/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/WSDLActivityFactory.java
@@ -31,10 +31,10 @@ import javax.wsdl.WSDLException;
import javax.xml.parsers.ParserConfigurationException;
import org.apache.taverna.security.credentialmanager.CredentialManager;
-import net.sf.taverna.t2.workflowmodel.Edits;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityFactory;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityInputPort;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityOutputPort;
+import org.apache.taverna.workflowmodel.Edits;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityFactory;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityInputPort;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityOutputPort;
import org.apache.taverna.wsdl.parser.TypeDescriptor;
import org.apache.taverna.wsdl.parser.UnknownOperationException;
import org.apache.taverna.wsdl.parser.WSDLParser;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/WSDLActivityHealthChecker.java
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/WSDLActivityHealthChecker.java b/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/WSDLActivityHealthChecker.java
index aef546c..35203f0 100644
--- a/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/WSDLActivityHealthChecker.java
+++ b/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/WSDLActivityHealthChecker.java
@@ -26,12 +26,12 @@ import java.util.List;
import javax.wsdl.WSDLException;
import javax.xml.parsers.ParserConfigurationException;
-import net.sf.taverna.t2.visit.VisitReport;
-import net.sf.taverna.t2.visit.VisitReport.Status;
-import net.sf.taverna.t2.workflowmodel.health.HealthCheck;
-import net.sf.taverna.t2.workflowmodel.health.RemoteHealthChecker;
-import net.sf.taverna.t2.workflowmodel.processor.activity.Activity;
-import net.sf.taverna.t2.workflowmodel.processor.activity.DisabledActivity;
+import org.apache.taverna.visit.VisitReport;
+import org.apache.taverna.visit.VisitReport.Status;
+import org.apache.taverna.workflowmodel.health.HealthCheck;
+import org.apache.taverna.workflowmodel.health.RemoteHealthChecker;
+import org.apache.taverna.workflowmodel.processor.activity.Activity;
+import org.apache.taverna.workflowmodel.processor.activity.DisabledActivity;
import org.apache.taverna.wsdl.parser.UnknownOperationException;
import org.apache.taverna.wsdl.parser.WSDLParser;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/WSDLOperationConfigurationBean.java
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/WSDLOperationConfigurationBean.java b/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/WSDLOperationConfigurationBean.java
index fc2586c..94bc160 100644
--- a/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/WSDLOperationConfigurationBean.java
+++ b/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/WSDLOperationConfigurationBean.java
@@ -21,8 +21,8 @@ package org.apache.taverna.activities.wsdl;
import java.net.URI;
-import net.sf.taverna.t2.workflowmodel.processor.config.ConfigurationBean;
-import net.sf.taverna.t2.workflowmodel.processor.config.ConfigurationProperty;
+import org.apache.taverna.workflowmodel.processor.config.ConfigurationBean;
+import org.apache.taverna.workflowmodel.processor.config.ConfigurationProperty;
/**
* Configuration for a WSDL operation.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/AddXMLSplitterEdit.java
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/AddXMLSplitterEdit.java b/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/AddXMLSplitterEdit.java
index 77fb5d4..f764208 100644
--- a/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/AddXMLSplitterEdit.java
+++ b/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/AddXMLSplitterEdit.java
@@ -23,20 +23,20 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.taverna.activities.wsdl.WSDLActivity;
-import net.sf.taverna.t2.workflowmodel.CompoundEdit;
-import net.sf.taverna.t2.workflowmodel.Dataflow;
-import net.sf.taverna.t2.workflowmodel.Edit;
-import net.sf.taverna.t2.workflowmodel.EditException;
-import net.sf.taverna.t2.workflowmodel.Edits;
-import net.sf.taverna.t2.workflowmodel.EventForwardingOutputPort;
-import net.sf.taverna.t2.workflowmodel.EventHandlingInputPort;
-import net.sf.taverna.t2.workflowmodel.InputPort;
-import net.sf.taverna.t2.workflowmodel.OutputPort;
-import net.sf.taverna.t2.workflowmodel.Processor;
-import net.sf.taverna.t2.workflowmodel.ProcessorInputPort;
-import net.sf.taverna.t2.workflowmodel.ProcessorOutputPort;
-import net.sf.taverna.t2.workflowmodel.processor.activity.Activity;
-import net.sf.taverna.t2.workflowmodel.utils.Tools;
+import org.apache.taverna.workflowmodel.CompoundEdit;
+import org.apache.taverna.workflowmodel.Dataflow;
+import org.apache.taverna.workflowmodel.Edit;
+import org.apache.taverna.workflowmodel.EditException;
+import org.apache.taverna.workflowmodel.Edits;
+import org.apache.taverna.workflowmodel.EventForwardingOutputPort;
+import org.apache.taverna.workflowmodel.EventHandlingInputPort;
+import org.apache.taverna.workflowmodel.InputPort;
+import org.apache.taverna.workflowmodel.OutputPort;
+import org.apache.taverna.workflowmodel.Processor;
+import org.apache.taverna.workflowmodel.ProcessorInputPort;
+import org.apache.taverna.workflowmodel.ProcessorOutputPort;
+import org.apache.taverna.workflowmodel.processor.activity.Activity;
+import org.apache.taverna.workflowmodel.utils.Tools;
import org.apache.taverna.wsdl.parser.ArrayTypeDescriptor;
import org.apache.taverna.wsdl.parser.TypeDescriptor;
@@ -212,7 +212,7 @@ public class AddXMLSplitterEdit implements Edit<Dataflow> {
"Unable to find the sink port when linking up "
+ sourcePortName + " to " + sinkPortName);
- linkUpEditList.add(net.sf.taverna.t2.workflowmodel.utils.Tools.getCreateAndConnectDatalinkEdit(dataflow, source, sink, edits));
+ linkUpEditList.add(org.apache.taverna.workflowmodel.utils.Tools.getCreateAndConnectDatalinkEdit(dataflow, source, sink, edits));
linkUpEdit = new CompoundEdit(linkUpEditList);
linkUpEdit.doEdit();
@@ -222,9 +222,9 @@ public class AddXMLSplitterEdit implements Edit<Dataflow> {
private EventHandlingInputPort getSinkPort(Processor processor, Activity<?> activity,
String portName, List<Edit<?>> editList) {
- InputPort activityPort = net.sf.taverna.t2.workflowmodel.utils.Tools.getActivityInputPort(activity, portName);
+ InputPort activityPort = org.apache.taverna.workflowmodel.utils.Tools.getActivityInputPort(activity, portName);
//check if processor port exists
- EventHandlingInputPort input = net.sf.taverna.t2.workflowmodel.utils.Tools.getProcessorInputPort(processor, activity, activityPort);
+ EventHandlingInputPort input = org.apache.taverna.workflowmodel.utils.Tools.getProcessorInputPort(processor, activity, activityPort);
if (input == null) {
//port doesn't exist so create a processor port and map it
ProcessorInputPort processorInputPort =
@@ -238,9 +238,9 @@ public class AddXMLSplitterEdit implements Edit<Dataflow> {
private EventForwardingOutputPort getSourcePort(Processor processor, Activity<?> activity,
String portName, List<Edit<?>> editList) {
- OutputPort activityPort = net.sf.taverna.t2.workflowmodel.utils.Tools.getActivityOutputPort(activity, portName);
+ OutputPort activityPort = org.apache.taverna.workflowmodel.utils.Tools.getActivityOutputPort(activity, portName);
//check if processor port exists
- EventForwardingOutputPort output = net.sf.taverna.t2.workflowmodel.utils.Tools.getProcessorOutputPort(processor, activity, activityPort);
+ EventForwardingOutputPort output = org.apache.taverna.workflowmodel.utils.Tools.getProcessorOutputPort(processor, activity, activityPort);
if (output == null) {
//port doesn't exist so create a processor port and map it
ProcessorOutputPort processorOutputPort =
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLInputSplitterActivity.java
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLInputSplitterActivity.java b/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLInputSplitterActivity.java
index a4752d4..4b8625c 100644
--- a/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLInputSplitterActivity.java
+++ b/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLInputSplitterActivity.java
@@ -29,13 +29,13 @@ import java.util.List;
import java.util.Map;
import org.apache.taverna.activities.wsdl.InputPortTypeDescriptorActivity;
-import net.sf.taverna.t2.reference.ReferenceService;
-import net.sf.taverna.t2.reference.ReferenceServiceException;
-import net.sf.taverna.t2.reference.T2Reference;
-import net.sf.taverna.t2.workflowmodel.OutputPort;
-import net.sf.taverna.t2.workflowmodel.processor.activity.AbstractAsynchronousActivity;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityConfigurationException;
-import net.sf.taverna.t2.workflowmodel.processor.activity.AsynchronousActivityCallback;
+import org.apache.taverna.reference.ReferenceService;
+import org.apache.taverna.reference.ReferenceServiceException;
+import org.apache.taverna.reference.T2Reference;
+import org.apache.taverna.workflowmodel.OutputPort;
+import org.apache.taverna.workflowmodel.processor.activity.AbstractAsynchronousActivity;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityConfigurationException;
+import org.apache.taverna.workflowmodel.processor.activity.AsynchronousActivityCallback;
import org.apache.taverna.wsdl.parser.ArrayTypeDescriptor;
import org.apache.taverna.wsdl.parser.ComplexTypeDescriptor;
import org.apache.taverna.wsdl.parser.TypeDescriptor;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLInputSplitterActivityFactory.java
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLInputSplitterActivityFactory.java b/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLInputSplitterActivityFactory.java
index 34fbbff..bef6a35 100644
--- a/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLInputSplitterActivityFactory.java
+++ b/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLInputSplitterActivityFactory.java
@@ -24,11 +24,11 @@ import java.net.URI;
import java.util.HashSet;
import java.util.Set;
-import net.sf.taverna.t2.workflowmodel.Edits;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityConfigurationException;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityFactory;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityInputPort;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityOutputPort;
+import org.apache.taverna.workflowmodel.Edits;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityConfigurationException;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityFactory;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityInputPort;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityOutputPort;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLInputSplitterHealthChecker.java
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLInputSplitterHealthChecker.java b/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLInputSplitterHealthChecker.java
index 7b26fbf..8270957 100644
--- a/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLInputSplitterHealthChecker.java
+++ b/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLInputSplitterHealthChecker.java
@@ -23,10 +23,10 @@ import java.io.IOException;
import java.io.StringReader;
import java.util.List;
-import net.sf.taverna.t2.visit.VisitReport;
-import net.sf.taverna.t2.visit.VisitReport.Status;
-import net.sf.taverna.t2.workflowmodel.health.HealthCheck;
-import net.sf.taverna.t2.workflowmodel.health.HealthChecker;
+import org.apache.taverna.visit.VisitReport;
+import org.apache.taverna.visit.VisitReport.Status;
+import org.apache.taverna.workflowmodel.health.HealthCheck;
+import org.apache.taverna.workflowmodel.health.HealthChecker;
import org.apache.taverna.wsdl.parser.TypeDescriptor;
import org.apache.taverna.wsdl.xmlsplitter.XMLSplitterSerialisationHelper;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLOutputSplitterActivity.java
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLOutputSplitterActivity.java b/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLOutputSplitterActivity.java
index d505f2b..ec272b4 100644
--- a/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLOutputSplitterActivity.java
+++ b/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLOutputSplitterActivity.java
@@ -27,13 +27,13 @@ import java.util.List;
import java.util.Map;
import org.apache.taverna.activities.wsdl.OutputPortTypeDescriptorActivity;
-import net.sf.taverna.t2.reference.ReferenceService;
-import net.sf.taverna.t2.reference.ReferenceServiceException;
-import net.sf.taverna.t2.reference.T2Reference;
-import net.sf.taverna.t2.workflowmodel.InputPort;
-import net.sf.taverna.t2.workflowmodel.processor.activity.AbstractAsynchronousActivity;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityConfigurationException;
-import net.sf.taverna.t2.workflowmodel.processor.activity.AsynchronousActivityCallback;
+import org.apache.taverna.reference.ReferenceService;
+import org.apache.taverna.reference.ReferenceServiceException;
+import org.apache.taverna.reference.T2Reference;
+import org.apache.taverna.workflowmodel.InputPort;
+import org.apache.taverna.workflowmodel.processor.activity.AbstractAsynchronousActivity;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityConfigurationException;
+import org.apache.taverna.workflowmodel.processor.activity.AsynchronousActivityCallback;
import org.apache.taverna.wsdl.parser.ArrayTypeDescriptor;
import org.apache.taverna.wsdl.parser.ComplexTypeDescriptor;
import org.apache.taverna.wsdl.parser.TypeDescriptor;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLOutputSplitterActivityFactory.java
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLOutputSplitterActivityFactory.java b/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLOutputSplitterActivityFactory.java
index 3d3a646..ce40c81 100644
--- a/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLOutputSplitterActivityFactory.java
+++ b/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLOutputSplitterActivityFactory.java
@@ -28,11 +28,11 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.util.Iterator;
-import net.sf.taverna.t2.workflowmodel.Edits;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityConfigurationException;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityFactory;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityInputPort;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityOutputPort;
+import org.apache.taverna.workflowmodel.Edits;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityConfigurationException;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityFactory;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityInputPort;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityOutputPort;
/**
* An {@link ActivityFactory} for creating <code>XMLOutputSplitterActivity</code>.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLOutputSplitterHealthChecker.java
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLOutputSplitterHealthChecker.java b/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLOutputSplitterHealthChecker.java
index 3e0910b..4f3a289 100644
--- a/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLOutputSplitterHealthChecker.java
+++ b/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLOutputSplitterHealthChecker.java
@@ -23,10 +23,10 @@ import java.io.IOException;
import java.io.StringReader;
import java.util.List;
-import net.sf.taverna.t2.visit.VisitReport;
-import net.sf.taverna.t2.visit.VisitReport.Status;
-import net.sf.taverna.t2.workflowmodel.health.HealthCheck;
-import net.sf.taverna.t2.workflowmodel.health.HealthChecker;
+import org.apache.taverna.visit.VisitReport;
+import org.apache.taverna.visit.VisitReport.Status;
+import org.apache.taverna.workflowmodel.health.HealthCheck;
+import org.apache.taverna.workflowmodel.health.HealthChecker;
import org.apache.taverna.wsdl.parser.TypeDescriptor;
import org.apache.taverna.wsdl.xmlsplitter.XMLSplitterSerialisationHelper;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLSplitterConfigurationBean.java
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLSplitterConfigurationBean.java b/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLSplitterConfigurationBean.java
index e91a60c..bb35ddc 100644
--- a/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLSplitterConfigurationBean.java
+++ b/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLSplitterConfigurationBean.java
@@ -21,9 +21,9 @@ package org.apache.taverna.activities.wsdl.xmlsplitter;
import org.jdom.Element;
-import net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityPortsDefinitionBean;
-import net.sf.taverna.t2.workflowmodel.processor.config.ConfigurationBean;
-import net.sf.taverna.t2.workflowmodel.processor.config.ConfigurationProperty;
+import org.apache.taverna.workflowmodel.processor.activity.config.ActivityPortsDefinitionBean;
+import org.apache.taverna.workflowmodel.processor.config.ConfigurationBean;
+import org.apache.taverna.workflowmodel.processor.config.ConfigurationProperty;
@ConfigurationBean(uri = "http://ns.taverna.org.uk/2010/activity/xml-splitter#Config")
public class XMLSplitterConfigurationBean extends ActivityPortsDefinitionBean {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-wsdl-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.health.HealthChecker
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.health.HealthChecker b/taverna-wsdl-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.health.HealthChecker
deleted file mode 100644
index 7e0ee46..0000000
--- a/taverna-wsdl-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.health.HealthChecker
+++ /dev/null
@@ -1,4 +0,0 @@
-org.apache.taverna.activities.wsdl.WSDLActivityHealthChecker
-org.apache.taverna.activities.wsdl.xmlsplitter.XMLOutputSplitterHealthChecker
-org.apache.taverna.activities.wsdl.xmlsplitter.XMLInputSplitterHealthChecker
-org.apache.taverna.activities.wsdl.WSDLActivityDescriptorChecker
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-wsdl-activity/src/main/resources/META-INF/services/org.apache.taverna.workflowmodel.health.HealthChecker
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/main/resources/META-INF/services/org.apache.taverna.workflowmodel.health.HealthChecker b/taverna-wsdl-activity/src/main/resources/META-INF/services/org.apache.taverna.workflowmodel.health.HealthChecker
new file mode 100644
index 0000000..7e0ee46
--- /dev/null
+++ b/taverna-wsdl-activity/src/main/resources/META-INF/services/org.apache.taverna.workflowmodel.health.HealthChecker
@@ -0,0 +1,4 @@
+org.apache.taverna.activities.wsdl.WSDLActivityHealthChecker
+org.apache.taverna.activities.wsdl.xmlsplitter.XMLOutputSplitterHealthChecker
+org.apache.taverna.activities.wsdl.xmlsplitter.XMLInputSplitterHealthChecker
+org.apache.taverna.activities.wsdl.WSDLActivityDescriptorChecker
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-wsdl-activity/src/main/resources/META-INF/spring/wsdl-activity-context-osgi.xml
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/main/resources/META-INF/spring/wsdl-activity-context-osgi.xml b/taverna-wsdl-activity/src/main/resources/META-INF/spring/wsdl-activity-context-osgi.xml
index cee7770..9371af6 100644
--- a/taverna-wsdl-activity/src/main/resources/META-INF/spring/wsdl-activity-context-osgi.xml
+++ b/taverna-wsdl-activity/src/main/resources/META-INF/spring/wsdl-activity-context-osgi.xml
@@ -6,15 +6,15 @@
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi.xsd">
- <service ref="wsdlActivityHealthChecker" interface="net.sf.taverna.t2.workflowmodel.health.HealthChecker" />
- <service ref="xmlInputSplitterHealthChecker" interface="net.sf.taverna.t2.workflowmodel.health.HealthChecker" />
- <service ref="xmlOutputSplitterHealthChecker" interface="net.sf.taverna.t2.workflowmodel.health.HealthChecker" />
+ <service ref="wsdlActivityHealthChecker" interface="org.apache.taverna.workflowmodel.health.HealthChecker" />
+ <service ref="xmlInputSplitterHealthChecker" interface="org.apache.taverna.workflowmodel.health.HealthChecker" />
+ <service ref="xmlOutputSplitterHealthChecker" interface="org.apache.taverna.workflowmodel.health.HealthChecker" />
- <service ref="wsdlActivityFactory" interface="net.sf.taverna.t2.workflowmodel.processor.activity.ActivityFactory" />
- <service ref="xmlInputSplitterActivityFactory" interface="net.sf.taverna.t2.workflowmodel.processor.activity.ActivityFactory" />
- <service ref="xmlOutputSplitterActivityFactory" interface="net.sf.taverna.t2.workflowmodel.processor.activity.ActivityFactory" />
+ <service ref="wsdlActivityFactory" interface="org.apache.taverna.workflowmodel.processor.activity.ActivityFactory" />
+ <service ref="xmlInputSplitterActivityFactory" interface="org.apache.taverna.workflowmodel.processor.activity.ActivityFactory" />
+ <service ref="xmlOutputSplitterActivityFactory" interface="org.apache.taverna.workflowmodel.processor.activity.ActivityFactory" />
<reference id="credentialManager" interface="org.apache.taverna.security.credentialmanager.CredentialManager" />
- <reference id="edits" interface="net.sf.taverna.t2.workflowmodel.Edits" />
+ <reference id="edits" interface="org.apache.taverna.workflowmodel.Edits" />
</beans:beans>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-wsdl-activity/src/test/java/org/apache/taverna/activities/wsdl/WSDLActivityTest.java
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/test/java/org/apache/taverna/activities/wsdl/WSDLActivityTest.java b/taverna-wsdl-activity/src/test/java/org/apache/taverna/activities/wsdl/WSDLActivityTest.java
index d857ede..0d4db96 100644
--- a/taverna-wsdl-activity/src/test/java/org/apache/taverna/activities/wsdl/WSDLActivityTest.java
+++ b/taverna-wsdl-activity/src/test/java/org/apache/taverna/activities/wsdl/WSDLActivityTest.java
@@ -30,9 +30,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import net.sf.taverna.t2.activities.testutils.ActivityInvoker;
-import net.sf.taverna.t2.activities.testutils.LocationConstants;
-import net.sf.taverna.t2.workflowmodel.OutputPort;
+import org.apache.taverna.activities.testutils.ActivityInvoker;
+import org.apache.taverna.activities.testutils.LocationConstants;
+import org.apache.taverna.workflowmodel.OutputPort;
import org.apache.taverna.wsdl.parser.ComplexTypeDescriptor;
import org.junit.Ignore;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-wsdl-activity/src/test/java/org/apache/taverna/activities/wsdl/xmlsplitter/AddXMLSplitterEditTest.java
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/test/java/org/apache/taverna/activities/wsdl/xmlsplitter/AddXMLSplitterEditTest.java b/taverna-wsdl-activity/src/test/java/org/apache/taverna/activities/wsdl/xmlsplitter/AddXMLSplitterEditTest.java
index e45e0fa..b1cf6c4 100644
--- a/taverna-wsdl-activity/src/test/java/org/apache/taverna/activities/wsdl/xmlsplitter/AddXMLSplitterEditTest.java
+++ b/taverna-wsdl-activity/src/test/java/org/apache/taverna/activities/wsdl/xmlsplitter/AddXMLSplitterEditTest.java
@@ -21,13 +21,13 @@ package org.apache.taverna.activities.wsdl.xmlsplitter;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import net.sf.taverna.t2.activities.testutils.LocationConstants;
+import org.apache.taverna.activities.testutils.LocationConstants;
import org.apache.taverna.activities.wsdl.WSDLActivity;
-import net.sf.taverna.t2.workflowmodel.Edits;
-import net.sf.taverna.t2.workflowmodel.Processor;
-import net.sf.taverna.t2.workflowmodel.impl.DataflowImpl;
-import net.sf.taverna.t2.workflowmodel.impl.EditsImpl;
-import net.sf.taverna.t2.workflowmodel.processor.activity.Activity;
+import org.apache.taverna.workflowmodel.Edits;
+import org.apache.taverna.workflowmodel.Processor;
+import org.apache.taverna.workflowmodel.impl.DataflowImpl;
+import org.apache.taverna.workflowmodel.impl.EditsImpl;
+import org.apache.taverna.workflowmodel.processor.activity.Activity;
import org.junit.Before;
import org.junit.Ignore;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-wsdl-activity/src/test/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLInputSplitterActivityTest.java
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/test/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLInputSplitterActivityTest.java b/taverna-wsdl-activity/src/test/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLInputSplitterActivityTest.java
index b9bfe85..f1e9f56 100644
--- a/taverna-wsdl-activity/src/test/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLInputSplitterActivityTest.java
+++ b/taverna-wsdl-activity/src/test/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLInputSplitterActivityTest.java
@@ -24,8 +24,8 @@ import static org.junit.Assert.assertTrue;
import java.io.StringReader;
-import net.sf.taverna.t2.workflowmodel.impl.EditsImpl;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityInputPort;
+import org.apache.taverna.workflowmodel.impl.EditsImpl;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityInputPort;
import org.apache.taverna.wsdl.parser.BaseTypeDescriptor;
import org.apache.taverna.wsdl.parser.ComplexTypeDescriptor;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-wsdl-activity/src/test/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLOutputSplitterActivityTest.java
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/test/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLOutputSplitterActivityTest.java b/taverna-wsdl-activity/src/test/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLOutputSplitterActivityTest.java
index 948a65d..62c569f 100644
--- a/taverna-wsdl-activity/src/test/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLOutputSplitterActivityTest.java
+++ b/taverna-wsdl-activity/src/test/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLOutputSplitterActivityTest.java
@@ -24,7 +24,7 @@ import static org.junit.Assert.assertTrue;
import java.io.StringReader;
-import net.sf.taverna.t2.workflowmodel.impl.EditsImpl;
+import org.apache.taverna.workflowmodel.impl.EditsImpl;
import org.apache.taverna.wsdl.parser.ComplexTypeDescriptor;
import org.jdom.Element;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-xpath-activity/src/main/java/org/apache/taverna/activities/xpath/XPathActivity.java
----------------------------------------------------------------------
diff --git a/taverna-xpath-activity/src/main/java/org/apache/taverna/activities/xpath/XPathActivity.java b/taverna-xpath-activity/src/main/java/org/apache/taverna/activities/xpath/XPathActivity.java
index 593516d..4f5bfbc 100644
--- a/taverna-xpath-activity/src/main/java/org/apache/taverna/activities/xpath/XPathActivity.java
+++ b/taverna-xpath-activity/src/main/java/org/apache/taverna/activities/xpath/XPathActivity.java
@@ -24,13 +24,13 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import net.sf.taverna.t2.invocation.InvocationContext;
-import net.sf.taverna.t2.reference.ErrorDocumentService;
-import net.sf.taverna.t2.reference.ReferenceService;
-import net.sf.taverna.t2.reference.T2Reference;
-import net.sf.taverna.t2.workflowmodel.processor.activity.AbstractAsynchronousActivity;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityConfigurationException;
-import net.sf.taverna.t2.workflowmodel.processor.activity.AsynchronousActivityCallback;
+import org.apache.taverna.invocation.InvocationContext;
+import org.apache.taverna.reference.ErrorDocumentService;
+import org.apache.taverna.reference.ReferenceService;
+import org.apache.taverna.reference.T2Reference;
+import org.apache.taverna.workflowmodel.processor.activity.AbstractAsynchronousActivity;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityConfigurationException;
+import org.apache.taverna.workflowmodel.processor.activity.AsynchronousActivityCallback;
import org.dom4j.Document;
import org.dom4j.DocumentException;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-xpath-activity/src/main/java/org/apache/taverna/activities/xpath/XPathActivityConfigurationBean.java
----------------------------------------------------------------------
diff --git a/taverna-xpath-activity/src/main/java/org/apache/taverna/activities/xpath/XPathActivityConfigurationBean.java b/taverna-xpath-activity/src/main/java/org/apache/taverna/activities/xpath/XPathActivityConfigurationBean.java
index 61cbff2..8331631 100644
--- a/taverna-xpath-activity/src/main/java/org/apache/taverna/activities/xpath/XPathActivityConfigurationBean.java
+++ b/taverna-xpath-activity/src/main/java/org/apache/taverna/activities/xpath/XPathActivityConfigurationBean.java
@@ -28,8 +28,8 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import net.sf.taverna.t2.workflowmodel.processor.config.ConfigurationBean;
-import net.sf.taverna.t2.workflowmodel.processor.config.ConfigurationProperty;
+import org.apache.taverna.workflowmodel.processor.config.ConfigurationBean;
+import org.apache.taverna.workflowmodel.processor.config.ConfigurationProperty;
import org.dom4j.DocumentException;
import org.dom4j.InvalidXPathException;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-xpath-activity/src/main/java/org/apache/taverna/activities/xpath/XPathActivityFactory.java
----------------------------------------------------------------------
diff --git a/taverna-xpath-activity/src/main/java/org/apache/taverna/activities/xpath/XPathActivityFactory.java b/taverna-xpath-activity/src/main/java/org/apache/taverna/activities/xpath/XPathActivityFactory.java
index acbd1cc..9b37070 100644
--- a/taverna-xpath-activity/src/main/java/org/apache/taverna/activities/xpath/XPathActivityFactory.java
+++ b/taverna-xpath-activity/src/main/java/org/apache/taverna/activities/xpath/XPathActivityFactory.java
@@ -28,11 +28,11 @@ import java.net.URI;
import java.util.HashSet;
import java.util.Set;
-import net.sf.taverna.t2.workflowmodel.Edits;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityConfigurationException;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityFactory;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityInputPort;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityOutputPort;
+import org.apache.taverna.workflowmodel.Edits;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityConfigurationException;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityFactory;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityInputPort;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityOutputPort;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-xpath-activity/src/main/java/org/apache/taverna/activities/xpath/XPathActivityHealthCheck.java
----------------------------------------------------------------------
diff --git a/taverna-xpath-activity/src/main/java/org/apache/taverna/activities/xpath/XPathActivityHealthCheck.java b/taverna-xpath-activity/src/main/java/org/apache/taverna/activities/xpath/XPathActivityHealthCheck.java
index b59e93d..78ed850 100644
--- a/taverna-xpath-activity/src/main/java/org/apache/taverna/activities/xpath/XPathActivityHealthCheck.java
+++ b/taverna-xpath-activity/src/main/java/org/apache/taverna/activities/xpath/XPathActivityHealthCheck.java
@@ -19,8 +19,8 @@
package org.apache.taverna.activities.xpath;
-import net.sf.taverna.t2.visit.VisitKind;
-import net.sf.taverna.t2.visit.Visitor;
+import org.apache.taverna.visit.VisitKind;
+import org.apache.taverna.visit.Visitor;
/**
* A <code>XPathActivityHealthCheck</code> is a kind of visit that determines if
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-xpath-activity/src/main/java/org/apache/taverna/activities/xpath/XPathActivityHealthChecker.java
----------------------------------------------------------------------
diff --git a/taverna-xpath-activity/src/main/java/org/apache/taverna/activities/xpath/XPathActivityHealthChecker.java b/taverna-xpath-activity/src/main/java/org/apache/taverna/activities/xpath/XPathActivityHealthChecker.java
index 21815d9..ed86c2b 100644
--- a/taverna-xpath-activity/src/main/java/org/apache/taverna/activities/xpath/XPathActivityHealthChecker.java
+++ b/taverna-xpath-activity/src/main/java/org/apache/taverna/activities/xpath/XPathActivityHealthChecker.java
@@ -29,21 +29,21 @@ import static org.apache.taverna.activities.xpath.XPathUtils.XPATH_EMPTY;
import static org.apache.taverna.activities.xpath.XPathUtils.XPATH_INVALID;
import static org.apache.taverna.activities.xpath.XPathUtils.isValid;
import static org.apache.taverna.activities.xpath.XPathUtils.validateXPath;
-import static net.sf.taverna.t2.visit.VisitReport.getWorstStatus;
-import static net.sf.taverna.t2.visit.VisitReport.Status.OK;
-import static net.sf.taverna.t2.visit.VisitReport.Status.SEVERE;
-import static net.sf.taverna.t2.visit.VisitReport.Status.WARNING;
-import static net.sf.taverna.t2.workflowmodel.health.HealthCheck.NO_PROBLEM;
+import static org.apache.taverna.visit.VisitReport.getWorstStatus;
+import static org.apache.taverna.visit.VisitReport.Status.OK;
+import static org.apache.taverna.visit.VisitReport.Status.SEVERE;
+import static org.apache.taverna.visit.VisitReport.Status.WARNING;
+import static org.apache.taverna.workflowmodel.health.HealthCheck.NO_PROBLEM;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import net.sf.taverna.t2.visit.VisitKind;
-import net.sf.taverna.t2.visit.VisitReport;
-import net.sf.taverna.t2.visit.VisitReport.Status;
-import net.sf.taverna.t2.workflowmodel.health.HealthChecker;
+import org.apache.taverna.visit.VisitKind;
+import org.apache.taverna.visit.VisitReport;
+import org.apache.taverna.visit.VisitReport.Status;
+import org.apache.taverna.workflowmodel.health.HealthChecker;
import com.fasterxml.jackson.databind.JsonNode;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-xpath-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.report.explainer.VisitExplainer
----------------------------------------------------------------------
diff --git a/taverna-xpath-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.report.explainer.VisitExplainer b/taverna-xpath-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.report.explainer.VisitExplainer
deleted file mode 100644
index 6e74512..0000000
--- a/taverna-xpath-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.report.explainer.VisitExplainer
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.taverna.activities.xpath.XPathActivityHealthCheckVisitExplainer
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-xpath-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.health.HealthChecker
----------------------------------------------------------------------
diff --git a/taverna-xpath-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.health.HealthChecker b/taverna-xpath-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.health.HealthChecker
deleted file mode 100644
index f4d9707..0000000
--- a/taverna-xpath-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.health.HealthChecker
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.taverna.activities.xpath.XPathActivityHealthChecker
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-xpath-activity/src/main/resources/META-INF/services/org.apache.taverna.workbench.report.explainer.VisitExplainer
----------------------------------------------------------------------
diff --git a/taverna-xpath-activity/src/main/resources/META-INF/services/org.apache.taverna.workbench.report.explainer.VisitExplainer b/taverna-xpath-activity/src/main/resources/META-INF/services/org.apache.taverna.workbench.report.explainer.VisitExplainer
new file mode 100644
index 0000000..6e74512
--- /dev/null
+++ b/taverna-xpath-activity/src/main/resources/META-INF/services/org.apache.taverna.workbench.report.explainer.VisitExplainer
@@ -0,0 +1 @@
+org.apache.taverna.activities.xpath.XPathActivityHealthCheckVisitExplainer
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-xpath-activity/src/main/resources/META-INF/services/org.apache.taverna.workflowmodel.health.HealthChecker
----------------------------------------------------------------------
diff --git a/taverna-xpath-activity/src/main/resources/META-INF/services/org.apache.taverna.workflowmodel.health.HealthChecker b/taverna-xpath-activity/src/main/resources/META-INF/services/org.apache.taverna.workflowmodel.health.HealthChecker
new file mode 100644
index 0000000..f4d9707
--- /dev/null
+++ b/taverna-xpath-activity/src/main/resources/META-INF/services/org.apache.taverna.workflowmodel.health.HealthChecker
@@ -0,0 +1 @@
+org.apache.taverna.activities.xpath.XPathActivityHealthChecker
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-xpath-activity/src/main/resources/META-INF/spring/xpath-activity-context-osgi.xml
----------------------------------------------------------------------
diff --git a/taverna-xpath-activity/src/main/resources/META-INF/spring/xpath-activity-context-osgi.xml b/taverna-xpath-activity/src/main/resources/META-INF/spring/xpath-activity-context-osgi.xml
index 69d23b2..c1cf884 100644
--- a/taverna-xpath-activity/src/main/resources/META-INF/spring/xpath-activity-context-osgi.xml
+++ b/taverna-xpath-activity/src/main/resources/META-INF/spring/xpath-activity-context-osgi.xml
@@ -6,10 +6,10 @@
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi.xsd">
- <service ref="XPathActivityHealthChecker" interface="net.sf.taverna.t2.workflowmodel.health.HealthChecker" />
+ <service ref="XPathActivityHealthChecker" interface="org.apache.taverna.workflowmodel.health.HealthChecker" />
- <service ref="xPathActivityFactory" interface="net.sf.taverna.t2.workflowmodel.processor.activity.ActivityFactory" />
+ <service ref="xPathActivityFactory" interface="org.apache.taverna.workflowmodel.processor.activity.ActivityFactory" />
- <reference id="edits" interface="net.sf.taverna.t2.workflowmodel.Edits" />
+ <reference id="edits" interface="org.apache.taverna.workflowmodel.Edits" />
</beans:beans>
[2/2] incubator-taverna-common-activities git commit:
Posted by re...@apache.org.
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/commit/ca321add
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/ca321add
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/ca321add
Branch: refs/heads/master
Commit: ca321addcc1b60a07e4358dec05b2868c331782d
Parents: 65c0451
Author: redmitry <re...@84.88.50.62>
Authored: Mon Mar 23 18:30:21 2015 +0100
Committer: redmitry <re...@84.88.50.62>
Committed: Mon Mar 23 18:30:21 2015 +0100
----------------------------------------------------------------------
.../activities/beanshell/BeanshellActivity.java | 14 ++++----
.../beanshell/BeanshellActivityFactory.java | 6 ++--
.../BeanshellActivityHealthChecker.java | 10 +++---
.../AbstractAsynchronousDependencyActivity.java | 12 +++----
...averna.t2.workflowmodel.health.HealthChecker | 1 -
...e.taverna.workflowmodel.health.HealthChecker | 1 +
.../spring/beanshell-activity-context-osgi.xml | 6 ++--
.../BeanshellActivityHealthCheckerTest.java | 10 +++---
.../beanshell/BeanshellActivityTest.java | 12 +++----
.../inb/knowarc/usecases/ScriptInput.java | 4 +--
.../inb/knowarc/usecases/ScriptInputStatic.java | 4 +--
.../inb/knowarc/usecases/ScriptInputUser.java | 4 +--
.../inb/knowarc/usecases/ScriptOutput.java | 4 +--
.../knowarc/usecases/UseCaseDescription.java | 10 +++---
.../knowarc/usecases/UseCaseEnumeration.java | 3 +-
.../usecases/invocation/UseCaseInvocation.java | 20 +++++------
.../local/LocalUseCaseInvocation.java | 18 +++++-----
.../usecases/invocation/ssh/SshReference.java | 10 +++---
.../knowarc/usecases/invocation/ssh/SshUrl.java | 2 +-
.../invocation/ssh/SshUrlToSshReference.java | 8 ++---
.../invocation/ssh/SshUseCaseInvocation.java | 18 +++++-----
.../externaltool/ExternalToolActivity.java | 24 ++++++-------
.../ExternalToolActivityConfigurationBean.java | 4 +--
.../ExternalToolActivityFactory.java | 10 +++---
.../ExternalToolActivityHealthChecker.java | 10 +++---
.../ExternalToolActivityMimeTypeChecker.java | 38 ++++++++++----------
.../ExternalToolRunDeletionListener.java | 2 +-
.../externaltool/InvocationCreator.java | 4 +--
.../local/LocalInvocationCreator.java | 4 +--
.../externaltool/manager/InvocationGroup.java | 4 +--
.../manager/InvocationGroupManager.java | 2 +-
.../impl/InvocationGroupManagerImpl.java | 6 ++--
.../externaltool/ssh/SshInvocationCreator.java | 10 +++---
...t2.activities.externaltool.InvocationCreator | 2 --
...ies.externaltool.manager.InvocationPersister | 2 --
...vities.externaltool.manager.MechanismCreator | 2 --
...sf.taverna.t2.reference.ExternalReferenceSPI | 2 --
...na.t2.reference.ValueToReferenceConverterSPI | 3 --
...taverna.t2.workflowmodel.RunDeletionListener | 1 -
...averna.t2.workflowmodel.health.HealthChecker | 2 --
...na.activities.externaltool.InvocationCreator | 2 ++
...ies.externaltool.manager.InvocationPersister | 2 ++
...vities.externaltool.manager.MechanismCreator | 2 ++
...pache.taverna.reference.ExternalReferenceSPI | 2 ++
...verna.reference.ValueToReferenceConverterSPI | 3 ++
...he.taverna.workflowmodel.RunDeletionListener | 1 +
...e.taverna.workflowmodel.health.HealthChecker | 2 ++
.../external-tool-activity-context-osgi.xml | 16 ++++-----
.../invocation/ssh/SshReference.hbm.xml | 2 +-
.../interaction/InteractionActivity.java | 12 +++----
.../interaction/InteractionActivityFactory.java | 8 ++---
.../InteractionActivityHealthChecker.java | 6 ++--
.../InteractionCallbackRequestor.java | 14 ++++----
.../InteractionRunDeletionListener.java | 2 +-
...taverna.t2.workflowmodel.RunDeletionListener | 1 -
...averna.t2.workflowmodel.health.HealthChecker | 1 -
...he.taverna.workflowmodel.RunDeletionListener | 1 +
...e.taverna.workflowmodel.health.HealthChecker | 1 +
.../interaction-activity-context-osgi.xml | 8 ++---
.../spring/interaction-activity-context.xml | 22 ++++++------
.../taverna/activities/rest/HTTPRequest.java | 4 +--
.../activities/rest/HTTPRequestHeader.java | 4 +--
.../taverna/activities/rest/RESTActivity.java | 14 ++++----
.../rest/RESTActivityConfigurationBean.java | 4 +--
.../activities/rest/RESTActivityFactory.java | 10 +++---
.../rest/RESTActivityHealthCheck.java | 4 +--
.../rest/RESTActivityHealthChecker.java | 8 ++---
...t2.workbench.report.explainer.VisitExplainer | 1 -
...averna.t2.workflowmodel.health.HealthChecker | 1 -
...na.workbench.report.explainer.VisitExplainer | 1 +
...e.taverna.workflowmodel.health.HealthChecker | 1 +
.../spring/rest-activity-context-osgi.xml | 6 ++--
.../taverna/activities/spreadsheet/Range.java | 4 +--
.../spreadsheet/SpreadsheetImportActivity.java | 26 +++++++-------
.../SpreadsheetImportActivityFactory.java | 10 +++---
.../SpreadsheetImportConfiguration.java | 4 +--
.../SpreadsheetImportHealthChecker.java | 10 +++---
...averna.t2.workflowmodel.health.HealthChecker | 1 -
...e.taverna.workflowmodel.health.HealthChecker | 1 +
.../spreadsheetimport-activity-context-osgi.xml | 6 ++--
.../SpreadsheetImportActivityTest.java | 14 ++++----
.../SpreadsheetImportHealthCheckerTest.java | 4 +--
.../taverna/activities/wsdl/WSDLActivity.java | 20 +++++------
.../wsdl/WSDLActivityConfigurationBean.java | 4 +--
.../wsdl/WSDLActivityDescriptorChecker.java | 35 +++++++++---------
.../activities/wsdl/WSDLActivityFactory.java | 8 ++---
.../wsdl/WSDLActivityHealthChecker.java | 12 +++----
.../wsdl/WSDLOperationConfigurationBean.java | 4 +--
.../wsdl/xmlsplitter/AddXMLSplitterEdit.java | 38 ++++++++++----------
.../xmlsplitter/XMLInputSplitterActivity.java | 14 ++++----
.../XMLInputSplitterActivityFactory.java | 10 +++---
.../XMLInputSplitterHealthChecker.java | 8 ++---
.../xmlsplitter/XMLOutputSplitterActivity.java | 14 ++++----
.../XMLOutputSplitterActivityFactory.java | 10 +++---
.../XMLOutputSplitterHealthChecker.java | 8 ++---
.../XMLSplitterConfigurationBean.java | 6 ++--
...averna.t2.workflowmodel.health.HealthChecker | 4 ---
...e.taverna.workflowmodel.health.HealthChecker | 4 +++
.../spring/wsdl-activity-context-osgi.xml | 14 ++++----
.../activities/wsdl/WSDLActivityTest.java | 6 ++--
.../xmlsplitter/AddXMLSplitterEditTest.java | 12 +++----
.../XMLInputSplitterActivityTest.java | 4 +--
.../XMLOutputSplitterActivityTest.java | 2 +-
.../taverna/activities/xpath/XPathActivity.java | 14 ++++----
.../xpath/XPathActivityConfigurationBean.java | 4 +--
.../activities/xpath/XPathActivityFactory.java | 10 +++---
.../xpath/XPathActivityHealthCheck.java | 4 +--
.../xpath/XPathActivityHealthChecker.java | 18 +++++-----
...t2.workbench.report.explainer.VisitExplainer | 1 -
...averna.t2.workflowmodel.health.HealthChecker | 1 -
...na.workbench.report.explainer.VisitExplainer | 1 +
...e.taverna.workflowmodel.health.HealthChecker | 1 +
.../spring/xpath-activity-context-osgi.xml | 6 ++--
113 files changed, 425 insertions(+), 427 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-beanshell-activity/src/main/java/org/apache/taverna/activities/beanshell/BeanshellActivity.java
----------------------------------------------------------------------
diff --git a/taverna-beanshell-activity/src/main/java/org/apache/taverna/activities/beanshell/BeanshellActivity.java b/taverna-beanshell-activity/src/main/java/org/apache/taverna/activities/beanshell/BeanshellActivity.java
index 1527af9..c6aad7a 100644
--- a/taverna-beanshell-activity/src/main/java/org/apache/taverna/activities/beanshell/BeanshellActivity.java
+++ b/taverna-beanshell-activity/src/main/java/org/apache/taverna/activities/beanshell/BeanshellActivity.java
@@ -24,13 +24,13 @@ import java.util.Map;
import java.util.regex.Pattern;
import org.apache.taverna.activities.dependencyactivity.AbstractAsynchronousDependencyActivity;
-import net.sf.taverna.t2.reference.ErrorDocumentService;
-import net.sf.taverna.t2.reference.ReferenceService;
-import net.sf.taverna.t2.reference.ReferenceServiceException;
-import net.sf.taverna.t2.reference.T2Reference;
-import net.sf.taverna.t2.workflowmodel.OutputPort;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityInputPort;
-import net.sf.taverna.t2.workflowmodel.processor.activity.AsynchronousActivityCallback;
+import org.apache.taverna.reference.ErrorDocumentService;
+import org.apache.taverna.reference.ReferenceService;
+import org.apache.taverna.reference.ReferenceServiceException;
+import org.apache.taverna.reference.T2Reference;
+import org.apache.taverna.workflowmodel.OutputPort;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityInputPort;
+import org.apache.taverna.workflowmodel.processor.activity.AsynchronousActivityCallback;
import org.apache.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-beanshell-activity/src/main/java/org/apache/taverna/activities/beanshell/BeanshellActivityFactory.java
----------------------------------------------------------------------
diff --git a/taverna-beanshell-activity/src/main/java/org/apache/taverna/activities/beanshell/BeanshellActivityFactory.java b/taverna-beanshell-activity/src/main/java/org/apache/taverna/activities/beanshell/BeanshellActivityFactory.java
index a661354..8cbb068 100644
--- a/taverna-beanshell-activity/src/main/java/org/apache/taverna/activities/beanshell/BeanshellActivityFactory.java
+++ b/taverna-beanshell-activity/src/main/java/org/apache/taverna/activities/beanshell/BeanshellActivityFactory.java
@@ -24,9 +24,9 @@ import java.net.URI;
import java.util.HashSet;
import java.util.Set;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityFactory;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityInputPort;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityOutputPort;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityFactory;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityInputPort;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityOutputPort;
import uk.org.taverna.configuration.app.ApplicationConfiguration;
import com.fasterxml.jackson.databind.JsonNode;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-beanshell-activity/src/main/java/org/apache/taverna/activities/beanshell/BeanshellActivityHealthChecker.java
----------------------------------------------------------------------
diff --git a/taverna-beanshell-activity/src/main/java/org/apache/taverna/activities/beanshell/BeanshellActivityHealthChecker.java b/taverna-beanshell-activity/src/main/java/org/apache/taverna/activities/beanshell/BeanshellActivityHealthChecker.java
index 45a274e..4912790 100644
--- a/taverna-beanshell-activity/src/main/java/org/apache/taverna/activities/beanshell/BeanshellActivityHealthChecker.java
+++ b/taverna-beanshell-activity/src/main/java/org/apache/taverna/activities/beanshell/BeanshellActivityHealthChecker.java
@@ -26,11 +26,11 @@ import java.util.LinkedHashSet;
import java.util.List;
import org.apache.taverna.activities.dependencyactivity.AbstractAsynchronousDependencyActivity.FileExtFilter;
-import net.sf.taverna.t2.visit.VisitReport;
-import net.sf.taverna.t2.visit.VisitReport.Status;
-import net.sf.taverna.t2.workflowmodel.Processor;
-import net.sf.taverna.t2.workflowmodel.health.HealthCheck;
-import net.sf.taverna.t2.workflowmodel.health.HealthChecker;
+import org.apache.taverna.visit.VisitReport;
+import org.apache.taverna.visit.VisitReport.Status;
+import org.apache.taverna.workflowmodel.Processor;
+import org.apache.taverna.workflowmodel.health.HealthCheck;
+import org.apache.taverna.workflowmodel.health.HealthChecker;
import bsh.ParseException;
import bsh.Parser;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-beanshell-activity/src/main/java/org/apache/taverna/activities/dependencyactivity/AbstractAsynchronousDependencyActivity.java
----------------------------------------------------------------------
diff --git a/taverna-beanshell-activity/src/main/java/org/apache/taverna/activities/dependencyactivity/AbstractAsynchronousDependencyActivity.java b/taverna-beanshell-activity/src/main/java/org/apache/taverna/activities/dependencyactivity/AbstractAsynchronousDependencyActivity.java
index 1feb73c..30665c5 100644
--- a/taverna-beanshell-activity/src/main/java/org/apache/taverna/activities/dependencyactivity/AbstractAsynchronousDependencyActivity.java
+++ b/taverna-beanshell-activity/src/main/java/org/apache/taverna/activities/dependencyactivity/AbstractAsynchronousDependencyActivity.java
@@ -27,12 +27,12 @@ import java.net.URLClassLoader;
import java.util.HashSet;
import java.util.WeakHashMap;
-import net.sf.taverna.t2.facade.WorkflowInstanceFacade;
-import net.sf.taverna.t2.workflowmodel.Dataflow;
-import net.sf.taverna.t2.workflowmodel.Processor;
-import net.sf.taverna.t2.workflowmodel.processor.activity.AbstractAsynchronousActivity;
-import net.sf.taverna.t2.workflowmodel.processor.activity.Activity;
-import net.sf.taverna.t2.workflowmodel.processor.activity.NestedDataflow;
+import org.apache.taverna.facade.WorkflowInstanceFacade;
+import org.apache.taverna.workflowmodel.Dataflow;
+import org.apache.taverna.workflowmodel.Processor;
+import org.apache.taverna.workflowmodel.processor.activity.AbstractAsynchronousActivity;
+import org.apache.taverna.workflowmodel.processor.activity.Activity;
+import org.apache.taverna.workflowmodel.processor.activity.NestedDataflow;
import org.apache.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-beanshell-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.health.HealthChecker
----------------------------------------------------------------------
diff --git a/taverna-beanshell-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.health.HealthChecker b/taverna-beanshell-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.health.HealthChecker
deleted file mode 100644
index b6ed6cb..0000000
--- a/taverna-beanshell-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.health.HealthChecker
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.taverna.activities.beanshell.BeanshellActivityHealthChecker
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-beanshell-activity/src/main/resources/META-INF/services/org.apache.taverna.workflowmodel.health.HealthChecker
----------------------------------------------------------------------
diff --git a/taverna-beanshell-activity/src/main/resources/META-INF/services/org.apache.taverna.workflowmodel.health.HealthChecker b/taverna-beanshell-activity/src/main/resources/META-INF/services/org.apache.taverna.workflowmodel.health.HealthChecker
new file mode 100644
index 0000000..b6ed6cb
--- /dev/null
+++ b/taverna-beanshell-activity/src/main/resources/META-INF/services/org.apache.taverna.workflowmodel.health.HealthChecker
@@ -0,0 +1 @@
+org.apache.taverna.activities.beanshell.BeanshellActivityHealthChecker
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-beanshell-activity/src/main/resources/META-INF/spring/beanshell-activity-context-osgi.xml
----------------------------------------------------------------------
diff --git a/taverna-beanshell-activity/src/main/resources/META-INF/spring/beanshell-activity-context-osgi.xml b/taverna-beanshell-activity/src/main/resources/META-INF/spring/beanshell-activity-context-osgi.xml
index b98c9e4..fe3fbeb 100644
--- a/taverna-beanshell-activity/src/main/resources/META-INF/spring/beanshell-activity-context-osgi.xml
+++ b/taverna-beanshell-activity/src/main/resources/META-INF/spring/beanshell-activity-context-osgi.xml
@@ -6,10 +6,10 @@
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi.xsd">
- <service ref="beanshellActivityHealthChecker" interface="net.sf.taverna.t2.workflowmodel.health.HealthChecker" />
+ <service ref="beanshellActivityHealthChecker" interface="org.apache.taverna.workflowmodel.health.HealthChecker" />
- <service ref="beanshellActivityFactory" interface="net.sf.taverna.t2.workflowmodel.processor.activity.ActivityFactory" />
+ <service ref="beanshellActivityFactory" interface="org.apache.taverna.workflowmodel.processor.activity.ActivityFactory" />
- <reference id="applicationConfiguration" interface="uk.org.taverna.configuration.app.ApplicationConfiguration" />
+ <reference id="applicationConfiguration" interface="org.apache.taverna.configuration.app.ApplicationConfiguration" />
</beans:beans>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-beanshell-activity/src/test/java/org/apache/taverna/activities/beanshell/BeanshellActivityHealthCheckerTest.java
----------------------------------------------------------------------
diff --git a/taverna-beanshell-activity/src/test/java/org/apache/taverna/activities/beanshell/BeanshellActivityHealthCheckerTest.java b/taverna-beanshell-activity/src/test/java/org/apache/taverna/activities/beanshell/BeanshellActivityHealthCheckerTest.java
index 6abd66f..48b9d53 100644
--- a/taverna-beanshell-activity/src/test/java/org/apache/taverna/activities/beanshell/BeanshellActivityHealthCheckerTest.java
+++ b/taverna-beanshell-activity/src/test/java/org/apache/taverna/activities/beanshell/BeanshellActivityHealthCheckerTest.java
@@ -27,11 +27,11 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
-import net.sf.taverna.t2.activities.testutils.ActivityInvoker;
-import net.sf.taverna.t2.visit.VisitReport;
-import net.sf.taverna.t2.visit.VisitReport.Status;
-import net.sf.taverna.t2.workflowmodel.Edits;
-import net.sf.taverna.t2.workflowmodel.impl.EditsImpl;
+import org.apache.taverna.activities.testutils.ActivityInvoker;
+import org.apache.taverna.visit.VisitReport;
+import org.apache.taverna.visit.VisitReport.Status;
+import org.apache.taverna.workflowmodel.Edits;
+import org.apache.taverna.workflowmodel.impl.EditsImpl;
import org.junit.Before;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-beanshell-activity/src/test/java/org/apache/taverna/activities/beanshell/BeanshellActivityTest.java
----------------------------------------------------------------------
diff --git a/taverna-beanshell-activity/src/test/java/org/apache/taverna/activities/beanshell/BeanshellActivityTest.java b/taverna-beanshell-activity/src/test/java/org/apache/taverna/activities/beanshell/BeanshellActivityTest.java
index e0aae68..974dc49 100644
--- a/taverna-beanshell-activity/src/test/java/org/apache/taverna/activities/beanshell/BeanshellActivityTest.java
+++ b/taverna-beanshell-activity/src/test/java/org/apache/taverna/activities/beanshell/BeanshellActivityTest.java
@@ -25,12 +25,12 @@ import static org.junit.Assert.assertTrue;
import java.util.HashMap;
import java.util.Map;
-import net.sf.taverna.t2.activities.testutils.ActivityInvoker;
-import net.sf.taverna.t2.workflowmodel.AbstractPort;
-import net.sf.taverna.t2.workflowmodel.Edits;
-import net.sf.taverna.t2.workflowmodel.impl.EditsImpl;
-import net.sf.taverna.t2.workflowmodel.processor.activity.impl.ActivityInputPortImpl;
-import net.sf.taverna.t2.workflowmodel.processor.activity.impl.ActivityOutputPortImpl;
+import org.apache.taverna.activities.testutils.ActivityInvoker;
+import org.apache.taverna.workflowmodel.AbstractPort;
+import org.apache.taverna.workflowmodel.Edits;
+import org.apache.taverna.workflowmodel.impl.EditsImpl;
+import org.apache.taverna.workflowmodel.processor.activity.impl.ActivityInputPortImpl;
+import org.apache.taverna.workflowmodel.processor.activity.impl.ActivityOutputPortImpl;
import org.junit.Before;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/ScriptInput.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/ScriptInput.java b/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/ScriptInput.java
index bdb85cc..305564c 100644
--- a/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/ScriptInput.java
+++ b/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/ScriptInput.java
@@ -23,8 +23,8 @@ package de.uni_luebeck.inb.knowarc.usecases;
import java.nio.charset.Charset;
import org.apache.taverna.activities.externaltool.ExternalToolActivity;
-import net.sf.taverna.t2.workflowmodel.processor.config.ConfigurationBean;
-import net.sf.taverna.t2.workflowmodel.processor.config.ConfigurationProperty;
+import org.apache.taverna.workflowmodel.processor.config.ConfigurationBean;
+import org.apache.taverna.workflowmodel.processor.config.ConfigurationProperty;
/**
* Integrates inputs to the grid that come from the use case descriptions
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/ScriptInputStatic.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/ScriptInputStatic.java b/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/ScriptInputStatic.java
index 121f73e..989c59a 100644
--- a/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/ScriptInputStatic.java
+++ b/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/ScriptInputStatic.java
@@ -21,8 +21,8 @@
package de.uni_luebeck.inb.knowarc.usecases;
import org.apache.taverna.activities.externaltool.ExternalToolActivity;
-import net.sf.taverna.t2.workflowmodel.processor.config.ConfigurationBean;
-import net.sf.taverna.t2.workflowmodel.processor.config.ConfigurationProperty;
+import org.apache.taverna.workflowmodel.processor.config.ConfigurationBean;
+import org.apache.taverna.workflowmodel.processor.config.ConfigurationProperty;
/**
* This subclass of script input is used to manage static content
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/ScriptInputUser.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/ScriptInputUser.java b/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/ScriptInputUser.java
index 1627311..59ead67 100644
--- a/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/ScriptInputUser.java
+++ b/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/ScriptInputUser.java
@@ -22,8 +22,8 @@ package de.uni_luebeck.inb.knowarc.usecases;
import java.util.ArrayList;
import org.apache.taverna.activities.externaltool.ExternalToolActivity;
-import net.sf.taverna.t2.workflowmodel.processor.config.ConfigurationBean;
-import net.sf.taverna.t2.workflowmodel.processor.config.ConfigurationProperty;
+import org.apache.taverna.workflowmodel.processor.config.ConfigurationBean;
+import org.apache.taverna.workflowmodel.processor.config.ConfigurationProperty;
/**
* Internal description of output
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/ScriptOutput.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/ScriptOutput.java b/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/ScriptOutput.java
index 3408dbf..066c88a 100644
--- a/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/ScriptOutput.java
+++ b/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/ScriptOutput.java
@@ -22,8 +22,8 @@ package de.uni_luebeck.inb.knowarc.usecases;
import java.util.ArrayList;
import org.apache.taverna.activities.externaltool.ExternalToolActivity;
-import net.sf.taverna.t2.workflowmodel.processor.config.ConfigurationBean;
-import net.sf.taverna.t2.workflowmodel.processor.config.ConfigurationProperty;
+import org.apache.taverna.workflowmodel.processor.config.ConfigurationBean;
+import org.apache.taverna.workflowmodel.processor.config.ConfigurationProperty;
/**
* Internal description of input
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/UseCaseDescription.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/UseCaseDescription.java b/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/UseCaseDescription.java
index fa3a7f8..58bfa93 100644
--- a/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/UseCaseDescription.java
+++ b/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/UseCaseDescription.java
@@ -35,11 +35,11 @@ import java.util.Set;
import javax.swing.ImageIcon;
import org.apache.taverna.activities.externaltool.ExternalToolActivity;
-import net.sf.taverna.t2.workflowmodel.processor.config.ConfigurationBean;
-import net.sf.taverna.t2.workflowmodel.processor.config.ConfigurationProperty;
-import net.sf.taverna.t2.workflowmodel.processor.config.ConfigurationProperty.OrderPolicy;
-import net.sf.taverna.t2.workflowmodel.serialization.DeserializationException;
-import net.sf.taverna.t2.workflowmodel.utils.Tools;
+import org.apache.taverna.workflowmodel.processor.config.ConfigurationBean;
+import org.apache.taverna.workflowmodel.processor.config.ConfigurationProperty;
+import org.apache.taverna.workflowmodel.processor.config.ConfigurationProperty.OrderPolicy;
+import org.apache.taverna.workflowmodel.serialization.DeserializationException;
+import org.apache.taverna.workflowmodel.utils.Tools;
import org.apache.log4j.Logger;
import org.jdom.Document;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/UseCaseEnumeration.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/UseCaseEnumeration.java b/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/UseCaseEnumeration.java
index ea51c7b..08069e5 100644
--- a/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/UseCaseEnumeration.java
+++ b/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/UseCaseEnumeration.java
@@ -22,13 +22,12 @@ package de.uni_luebeck.inb.knowarc.usecases;
import java.io.IOException;
import java.io.InputStream;
-import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
import java.util.ArrayList;
import java.util.List;
-import net.sf.taverna.t2.workflowmodel.serialization.DeserializationException;
+import org.apache.taverna.workflowmodel.serialization.DeserializationException;
import org.apache.log4j.Logger;
import org.jdom.Document;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/invocation/UseCaseInvocation.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/invocation/UseCaseInvocation.java b/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/invocation/UseCaseInvocation.java
index 6154d05..17b90c3 100644
--- a/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/invocation/UseCaseInvocation.java
+++ b/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/invocation/UseCaseInvocation.java
@@ -34,16 +34,16 @@ import java.util.Set;
import org.apache.commons.io.IOUtils;
-import net.sf.taverna.t2.invocation.InvocationContext;
-import net.sf.taverna.t2.reference.ExternalReferenceSPI;
-import net.sf.taverna.t2.reference.Identified;
-import net.sf.taverna.t2.reference.IdentifiedList;
-import net.sf.taverna.t2.reference.ReferenceService;
-import net.sf.taverna.t2.reference.ReferenceServiceException;
-import net.sf.taverna.t2.reference.ReferenceSet;
-import net.sf.taverna.t2.reference.T2Reference;
-import net.sf.taverna.t2.reference.impl.external.object.InlineByteArrayReferenceBuilder;
-import net.sf.taverna.t2.reference.impl.external.object.InlineStringReferenceBuilder;
+import org.apache.taverna.invocation.InvocationContext;
+import org.apache.taverna.reference.ExternalReferenceSPI;
+import org.apache.taverna.reference.Identified;
+import org.apache.taverna.reference.IdentifiedList;
+import org.apache.taverna.reference.ReferenceService;
+import org.apache.taverna.reference.ReferenceServiceException;
+import org.apache.taverna.reference.ReferenceSet;
+import org.apache.taverna.reference.T2Reference;
+import org.apache.taverna.reference.impl.external.object.InlineByteArrayReferenceBuilder;
+import org.apache.taverna.reference.impl.external.object.InlineStringReferenceBuilder;
import de.uni_luebeck.inb.knowarc.usecases.ScriptInput;
import de.uni_luebeck.inb.knowarc.usecases.ScriptInputStatic;
import de.uni_luebeck.inb.knowarc.usecases.ScriptInputUser;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/invocation/local/LocalUseCaseInvocation.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/invocation/local/LocalUseCaseInvocation.java b/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/invocation/local/LocalUseCaseInvocation.java
index 3541b8f..f4ae273 100755
--- a/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/invocation/local/LocalUseCaseInvocation.java
+++ b/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/invocation/local/LocalUseCaseInvocation.java
@@ -49,15 +49,15 @@ import java.util.Map;
import java.util.Set;
import java.util.regex.Matcher;
-import net.sf.taverna.t2.reference.AbstractExternalReference;
-import net.sf.taverna.t2.reference.ErrorDocument;
-import net.sf.taverna.t2.reference.ExternalReferenceSPI;
-import net.sf.taverna.t2.reference.Identified;
-import net.sf.taverna.t2.reference.ReferenceService;
-import net.sf.taverna.t2.reference.ReferenceSet;
-import net.sf.taverna.t2.reference.ReferencedDataNature;
-import net.sf.taverna.t2.reference.T2Reference;
-import net.sf.taverna.t2.reference.impl.external.file.FileReference;
+import org.apache.taverna.reference.AbstractExternalReference;
+import org.apache.taverna.reference.ErrorDocument;
+import org.apache.taverna.reference.ExternalReferenceSPI;
+import org.apache.taverna.reference.Identified;
+import org.apache.taverna.reference.ReferenceService;
+import org.apache.taverna.reference.ReferenceSet;
+import org.apache.taverna.reference.ReferencedDataNature;
+import org.apache.taverna.reference.T2Reference;
+import org.apache.taverna.reference.impl.external.file.FileReference;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/invocation/ssh/SshReference.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/invocation/ssh/SshReference.java b/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/invocation/ssh/SshReference.java
index 8afa397..c226e8a 100644
--- a/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/invocation/ssh/SshReference.java
+++ b/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/invocation/ssh/SshReference.java
@@ -6,12 +6,12 @@ package de.uni_luebeck.inb.knowarc.usecases.invocation.ssh;
import java.io.InputStream;
import org.apache.taverna.activities.externaltool.RetrieveLoginFromTaverna;
-import net.sf.taverna.t2.reference.AbstractExternalReference;
-import net.sf.taverna.t2.reference.DereferenceException;
-import net.sf.taverna.t2.reference.ExternalReferenceSPI;
-import net.sf.taverna.t2.reference.ReferenceContext;
+import org.apache.taverna.reference.AbstractExternalReference;
+import org.apache.taverna.reference.DereferenceException;
+import org.apache.taverna.reference.ExternalReferenceSPI;
+import org.apache.taverna.reference.ReferenceContext;
import org.apache.taverna.security.credentialmanager.CredentialManager;
-import net.sf.taverna.t2.reference.ReferencedDataNature;
+import org.apache.taverna.reference.ReferencedDataNature;
import org.apache.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/invocation/ssh/SshUrl.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/invocation/ssh/SshUrl.java b/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/invocation/ssh/SshUrl.java
index eb5f269..601735b 100644
--- a/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/invocation/ssh/SshUrl.java
+++ b/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/invocation/ssh/SshUrl.java
@@ -3,7 +3,7 @@
*/
package de.uni_luebeck.inb.knowarc.usecases.invocation.ssh;
-import net.sf.taverna.t2.reference.ReferencedDataNature;
+import org.apache.taverna.reference.ReferencedDataNature;
/**
* @author alanrw
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/invocation/ssh/SshUrlToSshReference.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/invocation/ssh/SshUrlToSshReference.java b/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/invocation/ssh/SshUrlToSshReference.java
index fdc5b07..3e89f38 100644
--- a/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/invocation/ssh/SshUrlToSshReference.java
+++ b/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/invocation/ssh/SshUrlToSshReference.java
@@ -3,10 +3,10 @@
*/
package de.uni_luebeck.inb.knowarc.usecases.invocation.ssh;
-import net.sf.taverna.t2.reference.ExternalReferenceSPI;
-import net.sf.taverna.t2.reference.ReferenceContext;
-import net.sf.taverna.t2.reference.ValueToReferenceConversionException;
-import net.sf.taverna.t2.reference.ValueToReferenceConverterSPI;
+import org.apache.taverna.reference.ExternalReferenceSPI;
+import org.apache.taverna.reference.ReferenceContext;
+import org.apache.taverna.reference.ValueToReferenceConversionException;
+import org.apache.taverna.reference.ValueToReferenceConverterSPI;
import org.apache.taverna.security.credentialmanager.CredentialManager;
/**
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/invocation/ssh/SshUseCaseInvocation.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/invocation/ssh/SshUseCaseInvocation.java b/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/invocation/ssh/SshUseCaseInvocation.java
index 739faf8..9d01e08 100755
--- a/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/invocation/ssh/SshUseCaseInvocation.java
+++ b/taverna-external-tool-activity/src/main/java/de/uni_luebeck/inb/knowarc/usecases/invocation/ssh/SshUseCaseInvocation.java
@@ -45,15 +45,15 @@ import java.util.Vector;
import java.util.regex.Matcher;
import org.apache.taverna.activities.externaltool.RetrieveLoginFromTaverna;
-import net.sf.taverna.t2.reference.AbstractExternalReference;
-import net.sf.taverna.t2.reference.ErrorDocument;
-import net.sf.taverna.t2.reference.ErrorDocumentServiceException;
-import net.sf.taverna.t2.reference.ExternalReferenceSPI;
-import net.sf.taverna.t2.reference.Identified;
-import net.sf.taverna.t2.reference.ReferenceService;
-import net.sf.taverna.t2.reference.ReferenceSet;
-import net.sf.taverna.t2.reference.ReferencedDataNature;
-import net.sf.taverna.t2.reference.T2Reference;
+import org.apache.taverna.reference.AbstractExternalReference;
+import org.apache.taverna.reference.ErrorDocument;
+import org.apache.taverna.reference.ErrorDocumentServiceException;
+import org.apache.taverna.reference.ExternalReferenceSPI;
+import org.apache.taverna.reference.Identified;
+import org.apache.taverna.reference.ReferenceService;
+import org.apache.taverna.reference.ReferenceSet;
+import org.apache.taverna.reference.ReferencedDataNature;
+import org.apache.taverna.reference.T2Reference;
import org.apache.taverna.security.credentialmanager.CredentialManager;
import org.apache.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/ExternalToolActivity.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/ExternalToolActivity.java b/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/ExternalToolActivity.java
index 25a7711..fb903c8 100644
--- a/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/ExternalToolActivity.java
+++ b/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/ExternalToolActivity.java
@@ -26,18 +26,18 @@ import java.util.Map;
import org.apache.taverna.activities.externaltool.manager.InvocationGroup;
import org.apache.taverna.activities.externaltool.manager.InvocationMechanism;
-import net.sf.taverna.t2.annotation.Annotated;
-import net.sf.taverna.t2.annotation.annotationbeans.MimeType;
-import net.sf.taverna.t2.reference.ExternalReferenceSPI;
-import net.sf.taverna.t2.reference.ReferenceService;
-import net.sf.taverna.t2.reference.T2Reference;
-import net.sf.taverna.t2.reference.WorkflowRunIdEntity;
-import net.sf.taverna.t2.workflowmodel.EditException;
-import net.sf.taverna.t2.workflowmodel.processor.activity.AbstractAsynchronousActivity;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityConfigurationException;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityInputPort;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityOutputPort;
-import net.sf.taverna.t2.workflowmodel.processor.activity.AsynchronousActivityCallback;
+import org.apache.taverna.annotation.Annotated;
+import org.apache.taverna.annotation.annotationbeans.MimeType;
+import org.apache.taverna.reference.ExternalReferenceSPI;
+import org.apache.taverna.reference.ReferenceService;
+import org.apache.taverna.reference.T2Reference;
+import org.apache.taverna.reference.WorkflowRunIdEntity;
+import org.apache.taverna.workflowmodel.EditException;
+import org.apache.taverna.workflowmodel.processor.activity.AbstractAsynchronousActivity;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityConfigurationException;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityInputPort;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityOutputPort;
+import org.apache.taverna.workflowmodel.processor.activity.AsynchronousActivityCallback;
import org.apache.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/ExternalToolActivityConfigurationBean.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/ExternalToolActivityConfigurationBean.java b/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/ExternalToolActivityConfigurationBean.java
index c392310..5e6fd23 100644
--- a/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/ExternalToolActivityConfigurationBean.java
+++ b/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/ExternalToolActivityConfigurationBean.java
@@ -24,8 +24,8 @@ import java.util.List;
import org.apache.taverna.activities.externaltool.manager.InvocationGroup;
import org.apache.taverna.activities.externaltool.manager.InvocationMechanism;
import org.apache.taverna.activities.externaltool.manager.MechanismCreator;
-import net.sf.taverna.t2.workflowmodel.processor.config.ConfigurationBean;
-import net.sf.taverna.t2.workflowmodel.processor.config.ConfigurationProperty;
+import org.apache.taverna.workflowmodel.processor.config.ConfigurationBean;
+import org.apache.taverna.workflowmodel.processor.config.ConfigurationProperty;
import de.uni_luebeck.inb.knowarc.usecases.UseCaseDescription;
@ConfigurationBean(uri = ExternalToolActivity.URI + "#Config")
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/ExternalToolActivityFactory.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/ExternalToolActivityFactory.java b/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/ExternalToolActivityFactory.java
index 94c0fe8..3f92a8f 100644
--- a/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/ExternalToolActivityFactory.java
+++ b/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/ExternalToolActivityFactory.java
@@ -28,11 +28,11 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.taverna.activities.externaltool.manager.MechanismCreator;
-import net.sf.taverna.t2.workflowmodel.Edits;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityConfigurationException;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityFactory;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityInputPort;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityOutputPort;
+import org.apache.taverna.workflowmodel.Edits;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityConfigurationException;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityFactory;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityInputPort;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityOutputPort;
/**
* An {@link ActivityFactory} for creating <code>ExternalToolActivity</code>.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/ExternalToolActivityHealthChecker.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/ExternalToolActivityHealthChecker.java b/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/ExternalToolActivityHealthChecker.java
index a3e3fb2..21b40ee 100644
--- a/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/ExternalToolActivityHealthChecker.java
+++ b/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/ExternalToolActivityHealthChecker.java
@@ -26,11 +26,11 @@ import java.util.List;
import org.apache.taverna.activities.externaltool.manager.InvocationGroup;
import org.apache.taverna.activities.externaltool.manager.InvocationGroupManager;
import org.apache.taverna.activities.externaltool.manager.InvocationMechanism;
-import net.sf.taverna.t2.visit.VisitReport;
-import net.sf.taverna.t2.visit.VisitReport.Status;
-import net.sf.taverna.t2.workflowmodel.health.HealthCheck;
-import net.sf.taverna.t2.workflowmodel.health.HealthChecker;
-import net.sf.taverna.t2.workflowmodel.utils.Tools;
+import org.apache.taverna.visit.VisitReport;
+import org.apache.taverna.visit.VisitReport.Status;
+import org.apache.taverna.workflowmodel.health.HealthCheck;
+import org.apache.taverna.workflowmodel.health.HealthChecker;
+import org.apache.taverna.workflowmodel.utils.Tools;
public class ExternalToolActivityHealthChecker implements HealthChecker<ExternalToolActivity> {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/ExternalToolActivityMimeTypeChecker.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/ExternalToolActivityMimeTypeChecker.java b/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/ExternalToolActivityMimeTypeChecker.java
index ab3241f..641b60d 100644
--- a/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/ExternalToolActivityMimeTypeChecker.java
+++ b/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/ExternalToolActivityMimeTypeChecker.java
@@ -27,25 +27,25 @@ import java.util.List;
import java.util.Set;
import java.util.Map.Entry;
-import net.sf.taverna.t2.visit.VisitReport;
-import net.sf.taverna.t2.visit.VisitReport.Status;
-import net.sf.taverna.t2.workflowmodel.Dataflow;
-import net.sf.taverna.t2.workflowmodel.Datalink;
-import net.sf.taverna.t2.workflowmodel.Merge;
-import net.sf.taverna.t2.workflowmodel.MergeInputPort;
-import net.sf.taverna.t2.workflowmodel.MergeOutputPort;
-import net.sf.taverna.t2.workflowmodel.MergePort;
-import net.sf.taverna.t2.workflowmodel.OutputPort;
-import net.sf.taverna.t2.workflowmodel.Port;
-import net.sf.taverna.t2.workflowmodel.Processor;
-import net.sf.taverna.t2.workflowmodel.ProcessorInputPort;
-import net.sf.taverna.t2.workflowmodel.ProcessorPort;
-import net.sf.taverna.t2.workflowmodel.health.HealthCheck;
-import net.sf.taverna.t2.workflowmodel.health.HealthChecker;
-import net.sf.taverna.t2.workflowmodel.processor.activity.Activity;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityInputPort;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityOutputPort;
-import net.sf.taverna.t2.workflowmodel.utils.Tools;
+import org.apache.taverna.visit.VisitReport;
+import org.apache.taverna.visit.VisitReport.Status;
+import org.apache.taverna.workflowmodel.Dataflow;
+import org.apache.taverna.workflowmodel.Datalink;
+import org.apache.taverna.workflowmodel.Merge;
+import org.apache.taverna.workflowmodel.MergeInputPort;
+import org.apache.taverna.workflowmodel.MergeOutputPort;
+import org.apache.taverna.workflowmodel.MergePort;
+import org.apache.taverna.workflowmodel.OutputPort;
+import org.apache.taverna.workflowmodel.Port;
+import org.apache.taverna.workflowmodel.Processor;
+import org.apache.taverna.workflowmodel.ProcessorInputPort;
+import org.apache.taverna.workflowmodel.ProcessorPort;
+import org.apache.taverna.workflowmodel.health.HealthCheck;
+import org.apache.taverna.workflowmodel.health.HealthChecker;
+import org.apache.taverna.workflowmodel.processor.activity.Activity;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityInputPort;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityOutputPort;
+import org.apache.taverna.workflowmodel.utils.Tools;
import org.apache.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/ExternalToolRunDeletionListener.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/ExternalToolRunDeletionListener.java b/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/ExternalToolRunDeletionListener.java
index 361b52f..21f2255 100644
--- a/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/ExternalToolRunDeletionListener.java
+++ b/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/ExternalToolRunDeletionListener.java
@@ -20,7 +20,7 @@
package org.apache.taverna.activities.externaltool;
import org.apache.taverna.activities.externaltool.manager.InvocationGroupManager;
-import net.sf.taverna.t2.workflowmodel.RunDeletionListener;
+import org.apache.taverna.workflowmodel.RunDeletionListener;
import org.apache.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/InvocationCreator.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/InvocationCreator.java b/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/InvocationCreator.java
index b31722d..6697ed6 100644
--- a/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/InvocationCreator.java
+++ b/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/InvocationCreator.java
@@ -25,8 +25,8 @@ import de.uni_luebeck.inb.knowarc.usecases.UseCaseDescription;
import de.uni_luebeck.inb.knowarc.usecases.invocation.UseCaseInvocation;
import org.apache.taverna.activities.externaltool.manager.InvocationMechanism;
-import net.sf.taverna.t2.reference.ReferenceService;
-import net.sf.taverna.t2.reference.T2Reference;
+import org.apache.taverna.reference.ReferenceService;
+import org.apache.taverna.reference.T2Reference;
/**
* @author alanrw
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/local/LocalInvocationCreator.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/local/LocalInvocationCreator.java b/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/local/LocalInvocationCreator.java
index 2ff1c70..8c6234d 100644
--- a/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/local/LocalInvocationCreator.java
+++ b/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/local/LocalInvocationCreator.java
@@ -24,8 +24,8 @@ import java.util.Map;
import org.apache.taverna.activities.externaltool.InvocationCreator;
import org.apache.taverna.activities.externaltool.manager.InvocationMechanism;
-import net.sf.taverna.t2.reference.ReferenceService;
-import net.sf.taverna.t2.reference.T2Reference;
+import org.apache.taverna.reference.ReferenceService;
+import org.apache.taverna.reference.T2Reference;
import org.apache.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/manager/InvocationGroup.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/manager/InvocationGroup.java b/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/manager/InvocationGroup.java
index a811375..5423aa4 100644
--- a/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/manager/InvocationGroup.java
+++ b/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/manager/InvocationGroup.java
@@ -22,8 +22,8 @@ package org.apache.taverna.activities.externaltool.manager;
import java.util.List;
import org.apache.taverna.activities.externaltool.ExternalToolActivity;
-import net.sf.taverna.t2.workflowmodel.processor.config.ConfigurationBean;
-import net.sf.taverna.t2.workflowmodel.processor.config.ConfigurationProperty;
+import org.apache.taverna.workflowmodel.processor.config.ConfigurationBean;
+import org.apache.taverna.workflowmodel.processor.config.ConfigurationProperty;
import org.apache.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/manager/InvocationGroupManager.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/manager/InvocationGroupManager.java b/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/manager/InvocationGroupManager.java
index d8a87f1..df05640 100644
--- a/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/manager/InvocationGroupManager.java
+++ b/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/manager/InvocationGroupManager.java
@@ -24,7 +24,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import net.sf.taverna.t2.lang.observer.Observer;
+import org.apache.taverna.lang.observer.Observer;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/manager/impl/InvocationGroupManagerImpl.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/manager/impl/InvocationGroupManagerImpl.java b/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/manager/impl/InvocationGroupManagerImpl.java
index 5bfd615..068be5d 100644
--- a/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/manager/impl/InvocationGroupManagerImpl.java
+++ b/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/manager/impl/InvocationGroupManagerImpl.java
@@ -43,9 +43,9 @@ import org.apache.taverna.activities.externaltool.manager.InvocationMechanismCha
import org.apache.taverna.activities.externaltool.manager.InvocationMechanismRemovedEvent;
import org.apache.taverna.activities.externaltool.manager.InvocationPersister;
import org.apache.taverna.activities.externaltool.manager.MechanismCreator;
-import net.sf.taverna.t2.lang.observer.MultiCaster;
-import net.sf.taverna.t2.lang.observer.Observable;
-import net.sf.taverna.t2.lang.observer.Observer;
+import org.apache.taverna.lang.observer.MultiCaster;
+import org.apache.taverna.lang.observer.Observable;
+import org.apache.taverna.lang.observer.Observer;
import org.apache.log4j.Logger;
import org.jdom.Document;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/ssh/SshInvocationCreator.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/ssh/SshInvocationCreator.java b/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/ssh/SshInvocationCreator.java
index c050960..88f6ceb 100644
--- a/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/ssh/SshInvocationCreator.java
+++ b/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/ssh/SshInvocationCreator.java
@@ -40,11 +40,11 @@ import de.uni_luebeck.inb.knowarc.usecases.invocation.ssh.SshUrl;
import de.uni_luebeck.inb.knowarc.usecases.invocation.ssh.SshUseCaseInvocation;
import org.apache.taverna.activities.externaltool.manager.InvocationMechanism;
-import net.sf.taverna.t2.reference.ExternalReferenceSPI;
-import net.sf.taverna.t2.reference.Identified;
-import net.sf.taverna.t2.reference.ReferenceService;
-import net.sf.taverna.t2.reference.ReferenceSet;
-import net.sf.taverna.t2.reference.T2Reference;
+import org.apache.taverna.reference.ExternalReferenceSPI;
+import org.apache.taverna.reference.Identified;
+import org.apache.taverna.reference.ReferenceService;
+import org.apache.taverna.reference.ReferenceSet;
+import org.apache.taverna.reference.T2Reference;
import org.apache.taverna.security.credentialmanager.CredentialManager;
/**
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.activities.externaltool.InvocationCreator
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.activities.externaltool.InvocationCreator b/taverna-external-tool-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.activities.externaltool.InvocationCreator
deleted file mode 100644
index 2639112..0000000
--- a/taverna-external-tool-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.activities.externaltool.InvocationCreator
+++ /dev/null
@@ -1,2 +0,0 @@
-org.apache.taverna.activities.externaltool.local.LocalInvocationCreator
-org.apache.taverna.activities.externaltool.ssh.SshInvocationCreator
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.activities.externaltool.manager.InvocationPersister
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.activities.externaltool.manager.InvocationPersister b/taverna-external-tool-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.activities.externaltool.manager.InvocationPersister
deleted file mode 100644
index 2caa4de..0000000
--- a/taverna-external-tool-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.activities.externaltool.manager.InvocationPersister
+++ /dev/null
@@ -1,2 +0,0 @@
-org.apache.taverna.activities.externaltool.local.LocalInvocationPersister
-org.apache.taverna.activities.externaltool.ssh.SshInvocationPersister
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.activities.externaltool.manager.MechanismCreator
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.activities.externaltool.manager.MechanismCreator b/taverna-external-tool-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.activities.externaltool.manager.MechanismCreator
deleted file mode 100644
index 47b965f..0000000
--- a/taverna-external-tool-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.activities.externaltool.manager.MechanismCreator
+++ /dev/null
@@ -1,2 +0,0 @@
-org.apache.taverna.activities.externaltool.local.LocalMechanismCreator
-org.apache.taverna.activities.externaltool.ssh.SshMechanismCreator
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.reference.ExternalReferenceSPI
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.reference.ExternalReferenceSPI b/taverna-external-tool-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.reference.ExternalReferenceSPI
deleted file mode 100644
index 6a18935..0000000
--- a/taverna-external-tool-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.reference.ExternalReferenceSPI
+++ /dev/null
@@ -1,2 +0,0 @@
-# Implementation classes of ExternalReferenceSPI go here, one per line
-de.uni_luebeck.inb.knowarc.usecases.invocation.ssh.SshReference
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.reference.ValueToReferenceConverterSPI
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.reference.ValueToReferenceConverterSPI b/taverna-external-tool-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.reference.ValueToReferenceConverterSPI
deleted file mode 100644
index 53ca06c..0000000
--- a/taverna-external-tool-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.reference.ValueToReferenceConverterSPI
+++ /dev/null
@@ -1,3 +0,0 @@
-# Implementation classes of ValueToReferenceConverterSPI go here, one per line
-de.uni_luebeck.inb.knowarc.usecases.invocation.ssh.SshUrlToSshReference
-
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.RunDeletionListener
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.RunDeletionListener b/taverna-external-tool-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.RunDeletionListener
deleted file mode 100644
index 0ba5254..0000000
--- a/taverna-external-tool-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.RunDeletionListener
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.taverna.activities.externaltool.ExternalToolRunDeletionListener
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.health.HealthChecker
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.health.HealthChecker b/taverna-external-tool-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.health.HealthChecker
deleted file mode 100644
index 6992636..0000000
--- a/taverna-external-tool-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.health.HealthChecker
+++ /dev/null
@@ -1,2 +0,0 @@
-org.apache.taverna.activities.externaltool.ExternalToolActivityHealthChecker
-org.apache.taverna.activities.externaltool.ExternalToolActivityMimeTypeChecker
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/resources/META-INF/services/org.apache.taverna.activities.externaltool.InvocationCreator
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/resources/META-INF/services/org.apache.taverna.activities.externaltool.InvocationCreator b/taverna-external-tool-activity/src/main/resources/META-INF/services/org.apache.taverna.activities.externaltool.InvocationCreator
new file mode 100644
index 0000000..2639112
--- /dev/null
+++ b/taverna-external-tool-activity/src/main/resources/META-INF/services/org.apache.taverna.activities.externaltool.InvocationCreator
@@ -0,0 +1,2 @@
+org.apache.taverna.activities.externaltool.local.LocalInvocationCreator
+org.apache.taverna.activities.externaltool.ssh.SshInvocationCreator
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/resources/META-INF/services/org.apache.taverna.activities.externaltool.manager.InvocationPersister
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/resources/META-INF/services/org.apache.taverna.activities.externaltool.manager.InvocationPersister b/taverna-external-tool-activity/src/main/resources/META-INF/services/org.apache.taverna.activities.externaltool.manager.InvocationPersister
new file mode 100644
index 0000000..2caa4de
--- /dev/null
+++ b/taverna-external-tool-activity/src/main/resources/META-INF/services/org.apache.taverna.activities.externaltool.manager.InvocationPersister
@@ -0,0 +1,2 @@
+org.apache.taverna.activities.externaltool.local.LocalInvocationPersister
+org.apache.taverna.activities.externaltool.ssh.SshInvocationPersister
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/resources/META-INF/services/org.apache.taverna.activities.externaltool.manager.MechanismCreator
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/resources/META-INF/services/org.apache.taverna.activities.externaltool.manager.MechanismCreator b/taverna-external-tool-activity/src/main/resources/META-INF/services/org.apache.taverna.activities.externaltool.manager.MechanismCreator
new file mode 100644
index 0000000..47b965f
--- /dev/null
+++ b/taverna-external-tool-activity/src/main/resources/META-INF/services/org.apache.taverna.activities.externaltool.manager.MechanismCreator
@@ -0,0 +1,2 @@
+org.apache.taverna.activities.externaltool.local.LocalMechanismCreator
+org.apache.taverna.activities.externaltool.ssh.SshMechanismCreator
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/resources/META-INF/services/org.apache.taverna.reference.ExternalReferenceSPI
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/resources/META-INF/services/org.apache.taverna.reference.ExternalReferenceSPI b/taverna-external-tool-activity/src/main/resources/META-INF/services/org.apache.taverna.reference.ExternalReferenceSPI
new file mode 100644
index 0000000..6a18935
--- /dev/null
+++ b/taverna-external-tool-activity/src/main/resources/META-INF/services/org.apache.taverna.reference.ExternalReferenceSPI
@@ -0,0 +1,2 @@
+# Implementation classes of ExternalReferenceSPI go here, one per line
+de.uni_luebeck.inb.knowarc.usecases.invocation.ssh.SshReference
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/resources/META-INF/services/org.apache.taverna.reference.ValueToReferenceConverterSPI
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/resources/META-INF/services/org.apache.taverna.reference.ValueToReferenceConverterSPI b/taverna-external-tool-activity/src/main/resources/META-INF/services/org.apache.taverna.reference.ValueToReferenceConverterSPI
new file mode 100644
index 0000000..53ca06c
--- /dev/null
+++ b/taverna-external-tool-activity/src/main/resources/META-INF/services/org.apache.taverna.reference.ValueToReferenceConverterSPI
@@ -0,0 +1,3 @@
+# Implementation classes of ValueToReferenceConverterSPI go here, one per line
+de.uni_luebeck.inb.knowarc.usecases.invocation.ssh.SshUrlToSshReference
+
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/resources/META-INF/services/org.apache.taverna.workflowmodel.RunDeletionListener
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/resources/META-INF/services/org.apache.taverna.workflowmodel.RunDeletionListener b/taverna-external-tool-activity/src/main/resources/META-INF/services/org.apache.taverna.workflowmodel.RunDeletionListener
new file mode 100644
index 0000000..0ba5254
--- /dev/null
+++ b/taverna-external-tool-activity/src/main/resources/META-INF/services/org.apache.taverna.workflowmodel.RunDeletionListener
@@ -0,0 +1 @@
+org.apache.taverna.activities.externaltool.ExternalToolRunDeletionListener
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/resources/META-INF/services/org.apache.taverna.workflowmodel.health.HealthChecker
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/resources/META-INF/services/org.apache.taverna.workflowmodel.health.HealthChecker b/taverna-external-tool-activity/src/main/resources/META-INF/services/org.apache.taverna.workflowmodel.health.HealthChecker
new file mode 100644
index 0000000..6992636
--- /dev/null
+++ b/taverna-external-tool-activity/src/main/resources/META-INF/services/org.apache.taverna.workflowmodel.health.HealthChecker
@@ -0,0 +1,2 @@
+org.apache.taverna.activities.externaltool.ExternalToolActivityHealthChecker
+org.apache.taverna.activities.externaltool.ExternalToolActivityMimeTypeChecker
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/resources/META-INF/spring/external-tool-activity-context-osgi.xml
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/resources/META-INF/spring/external-tool-activity-context-osgi.xml b/taverna-external-tool-activity/src/main/resources/META-INF/spring/external-tool-activity-context-osgi.xml
index 30b9687..a71b47e 100644
--- a/taverna-external-tool-activity/src/main/resources/META-INF/spring/external-tool-activity-context-osgi.xml
+++ b/taverna-external-tool-activity/src/main/resources/META-INF/spring/external-tool-activity-context-osgi.xml
@@ -6,7 +6,7 @@
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi.xsd">
- <service ref="SshReference" interface="net.sf.taverna.t2.reference.ExternalReferenceSPI" />
+ <service ref="SshReference" interface="org.apache.taverna.reference.ExternalReferenceSPI" />
<service ref="invocationGroupManager" interface="org.apache.taverna.activities.externaltool.manager.InvocationGroupManager" />
@@ -16,17 +16,17 @@
<service ref="LocalMechanismCreator" interface="org.apache.taverna.activities.externaltool.manager.MechanismCreator" />
<service ref="SshMechanismCreator" interface="org.apache.taverna.activities.externaltool.manager.MechanismCreator" />
- <service ref="ExternalToolRunDeletionListener" interface="net.sf.taverna.t2.workflowmodel.RunDeletionListener" />
+ <service ref="ExternalToolRunDeletionListener" interface="org.apache.taverna.workflowmodel.RunDeletionListener" />
- <service ref="SshUrlToSshReference" interface="net.sf.taverna.t2.reference.ValueToReferenceConverterSPI" />
+ <service ref="SshUrlToSshReference" interface="org.apache.taverna.reference.ValueToReferenceConverterSPI" />
- <service ref="ExternalToolActivityHealthChecker" interface="net.sf.taverna.t2.workflowmodel.health.HealthChecker" />
- <service ref="ExternalToolActivityMimeTypeChecker" interface="net.sf.taverna.t2.workflowmodel.health.HealthChecker" />
+ <service ref="ExternalToolActivityHealthChecker" interface="org.apache.taverna.workflowmodel.health.HealthChecker" />
+ <service ref="ExternalToolActivityMimeTypeChecker" interface="org.apache.taverna.workflowmodel.health.HealthChecker" />
<service ref="LocalInvocationCreator" interface="org.apache.taverna.activities.externaltool.InvocationCreator" />
<service ref="SshInvocationCreator" interface="org.apache.taverna.activities.externaltool.InvocationCreator" />
- <service ref="externalToolActivityFactory" interface="net.sf.taverna.t2.workflowmodel.processor.activity.ActivityFactory" />
+ <service ref="externalToolActivityFactory" interface="org.apache.taverna.workflowmodel.processor.activity.ActivityFactory" />
<list id="invocationCreators" interface="org.apache.taverna.activities.externaltool.InvocationCreator" cardinality="0..N" />
@@ -36,7 +36,7 @@
<reference id="credentialManager" interface="org.apache.taverna.security.credentialmanager.CredentialManager" />
- <reference id="applicationConfiguration" interface="uk.org.taverna.configuration.app.ApplicationConfiguration" />
+ <reference id="applicationConfiguration" interface="org.apache.taverna.configuration.app.ApplicationConfiguration" />
- <reference id="edits" interface="net.sf.taverna.t2.workflowmodel.Edits" />
+ <reference id="edits" interface="org.apache.taverna.workflowmodel.Edits" />
</beans:beans>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-external-tool-activity/src/main/resources/de/uni_luebeck/inb/knowarc/usecases/invocation/ssh/SshReference.hbm.xml
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/resources/de/uni_luebeck/inb/knowarc/usecases/invocation/ssh/SshReference.hbm.xml b/taverna-external-tool-activity/src/main/resources/de/uni_luebeck/inb/knowarc/usecases/invocation/ssh/SshReference.hbm.xml
index 384cb25..d40cfab 100644
--- a/taverna-external-tool-activity/src/main/resources/de/uni_luebeck/inb/knowarc/usecases/invocation/ssh/SshReference.hbm.xml
+++ b/taverna-external-tool-activity/src/main/resources/de/uni_luebeck/inb/knowarc/usecases/invocation/ssh/SshReference.hbm.xml
@@ -6,7 +6,7 @@
<hibernate-mapping>
<joined-subclass
name="de.uni_luebeck.inb.knowarc.usecases.invocation.ssh.SshReference"
- extends="net.sf.taverna.t2.reference.AbstractExternalReference">
+ extends="org.apache.taverna.reference.AbstractExternalReference">
<!-- Link to primary key from abstract superclass -->
<key column="bean_id" />
<!-- SshReference specific properties below here -->
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/InteractionActivity.java
----------------------------------------------------------------------
diff --git a/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/InteractionActivity.java b/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/InteractionActivity.java
index 19d4ea5..6023c70 100644
--- a/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/InteractionActivity.java
+++ b/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/InteractionActivity.java
@@ -25,13 +25,13 @@ import java.util.Map;
import org.apache.taverna.activities.interaction.jetty.InteractionJetty;
import org.apache.taverna.activities.interaction.preference.InteractionPreference;
import org.apache.taverna.activities.interaction.velocity.InteractionVelocity;
-import net.sf.taverna.t2.reference.T2Reference;
+import org.apache.taverna.reference.T2Reference;
import org.apache.taverna.security.credentialmanager.CredentialManager;
-import net.sf.taverna.t2.workflowmodel.processor.activity.AbstractAsynchronousActivity;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityConfigurationException;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityInputPort;
-import net.sf.taverna.t2.workflowmodel.processor.activity.AsynchronousActivity;
-import net.sf.taverna.t2.workflowmodel.processor.activity.AsynchronousActivityCallback;
+import org.apache.taverna.workflowmodel.processor.activity.AbstractAsynchronousActivity;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityConfigurationException;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityInputPort;
+import org.apache.taverna.workflowmodel.processor.activity.AsynchronousActivity;
+import org.apache.taverna.workflowmodel.processor.activity.AsynchronousActivityCallback;
import org.apache.log4j.Logger;
import org.apache.velocity.Template;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/InteractionActivityFactory.java
----------------------------------------------------------------------
diff --git a/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/InteractionActivityFactory.java b/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/InteractionActivityFactory.java
index 242a055..21c79cf 100644
--- a/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/InteractionActivityFactory.java
+++ b/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/InteractionActivityFactory.java
@@ -27,10 +27,10 @@ import org.apache.taverna.activities.interaction.jetty.InteractionJetty;
import org.apache.taverna.activities.interaction.preference.InteractionPreference;
import org.apache.taverna.activities.interaction.velocity.InteractionVelocity;
import org.apache.taverna.security.credentialmanager.CredentialManager;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityConfigurationException;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityFactory;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityInputPort;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityOutputPort;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityConfigurationException;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityFactory;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityInputPort;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityOutputPort;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/InteractionActivityHealthChecker.java
----------------------------------------------------------------------
diff --git a/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/InteractionActivityHealthChecker.java b/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/InteractionActivityHealthChecker.java
index 2cff795..279a8f5 100644
--- a/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/InteractionActivityHealthChecker.java
+++ b/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/InteractionActivityHealthChecker.java
@@ -21,9 +21,9 @@ package org.apache.taverna.activities.interaction;
import java.util.List;
-import net.sf.taverna.t2.visit.VisitReport;
-import net.sf.taverna.t2.workflowmodel.health.HealthChecker;
-import net.sf.taverna.t2.workflowmodel.health.RemoteHealthChecker;
+import org.apache.taverna.visit.VisitReport;
+import org.apache.taverna.workflowmodel.health.HealthChecker;
+import org.apache.taverna.workflowmodel.health.RemoteHealthChecker;
/**
* Example health checker
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/InteractionCallbackRequestor.java
----------------------------------------------------------------------
diff --git a/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/InteractionCallbackRequestor.java b/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/InteractionCallbackRequestor.java
index 3c8c83b..869ce9d 100644
--- a/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/InteractionCallbackRequestor.java
+++ b/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/InteractionCallbackRequestor.java
@@ -23,13 +23,13 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import net.sf.taverna.t2.invocation.InvocationContext;
-import net.sf.taverna.t2.reference.ReferenceService;
-import net.sf.taverna.t2.reference.T2Reference;
-import net.sf.taverna.t2.reference.WorkflowRunIdEntity;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityInputPort;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityOutputPort;
-import net.sf.taverna.t2.workflowmodel.processor.activity.AsynchronousActivityCallback;
+import org.apache.taverna.invocation.InvocationContext;
+import org.apache.taverna.reference.ReferenceService;
+import org.apache.taverna.reference.T2Reference;
+import org.apache.taverna.reference.WorkflowRunIdEntity;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityInputPort;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityOutputPort;
+import org.apache.taverna.workflowmodel.processor.activity.AsynchronousActivityCallback;
/**
* @author alanrw
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/InteractionRunDeletionListener.java
----------------------------------------------------------------------
diff --git a/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/InteractionRunDeletionListener.java b/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/InteractionRunDeletionListener.java
index 07d8db0..32bcfc6 100644
--- a/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/InteractionRunDeletionListener.java
+++ b/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/InteractionRunDeletionListener.java
@@ -19,7 +19,7 @@
package org.apache.taverna.activities.interaction;
-import net.sf.taverna.t2.workflowmodel.RunDeletionListener;
+import org.apache.taverna.workflowmodel.RunDeletionListener;
import org.apache.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-interaction-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.RunDeletionListener
----------------------------------------------------------------------
diff --git a/taverna-interaction-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.RunDeletionListener b/taverna-interaction-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.RunDeletionListener
deleted file mode 100644
index be41c45..0000000
--- a/taverna-interaction-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.RunDeletionListener
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.taverna.activities.interaction.InteractionRunDeletionListener
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-interaction-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.health.HealthChecker
----------------------------------------------------------------------
diff --git a/taverna-interaction-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.health.HealthChecker b/taverna-interaction-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.health.HealthChecker
deleted file mode 100644
index eec9da9..0000000
--- a/taverna-interaction-activity/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.health.HealthChecker
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.taverna.activities.interaction.InteractionActivityHealthChecker
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-interaction-activity/src/main/resources/META-INF/services/org.apache.taverna.workflowmodel.RunDeletionListener
----------------------------------------------------------------------
diff --git a/taverna-interaction-activity/src/main/resources/META-INF/services/org.apache.taverna.workflowmodel.RunDeletionListener b/taverna-interaction-activity/src/main/resources/META-INF/services/org.apache.taverna.workflowmodel.RunDeletionListener
new file mode 100644
index 0000000..be41c45
--- /dev/null
+++ b/taverna-interaction-activity/src/main/resources/META-INF/services/org.apache.taverna.workflowmodel.RunDeletionListener
@@ -0,0 +1 @@
+org.apache.taverna.activities.interaction.InteractionRunDeletionListener
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ca321add/taverna-interaction-activity/src/main/resources/META-INF/services/org.apache.taverna.workflowmodel.health.HealthChecker
----------------------------------------------------------------------
diff --git a/taverna-interaction-activity/src/main/resources/META-INF/services/org.apache.taverna.workflowmodel.health.HealthChecker b/taverna-interaction-activity/src/main/resources/META-INF/services/org.apache.taverna.workflowmodel.health.HealthChecker
new file mode 100644
index 0000000..eec9da9
--- /dev/null
+++ b/taverna-interaction-activity/src/main/resources/META-INF/services/org.apache.taverna.workflowmodel.health.HealthChecker
@@ -0,0 +1 @@
+org.apache.taverna.activities.interaction.InteractionActivityHealthChecker