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/30 15:33:27 UTC
[1/2] incubator-taverna-workbench git commit: some biocatalogue
cleanings
Repository: incubator-taverna-workbench
Updated Branches:
refs/heads/master 13fd16b27 -> a87b85d81
some biocatalogue cleanings
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/95d4269b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/95d4269b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/95d4269b
Branch: refs/heads/master
Commit: 95d4269b5a099c11e67321692304d6436274bb69
Parents: 13fd16b
Author: Dmitry Repchevsky <re...@list.ru>
Authored: Mon Mar 30 15:30:46 2015 +0200
Committer: Dmitry Repchevsky <re...@list.ru>
Committed: Mon Mar 30 15:30:46 2015 +0200
----------------------------------------------------------------------
taverna-perspective-biocatalogue/pom.xml | 24 ++++++++++++++++++++
.../model/HTTPMethodInterpreter.java | 2 +-
.../biocatalogue/model/ResourceManager.java | 4 ++--
.../biocatalogue/integration/Integration.java | 22 +++++++++---------
.../config/BioCataloguePluginConfiguration.java | 2 +-
...aloguePluginInputPortContextViewFactory.java | 2 +-
...loguePluginOutputPortContextViewFactory.java | 2 +-
...aloguePluginProcessorContextViewFactory.java | 2 +-
.../ProcessorInputPortView.java | 2 +-
.../ProcessorOutputPortView.java | 2 +-
.../contextual_views/ProcessorView.java | 2 +-
.../BioCatalogueWSDLActivityHealthCheck.java | 4 ++--
...ueWSDLActivityHealthCheckVisitExplainer.java | 6 ++---
.../BioCatalogueWSDLActivityHealthChecker.java | 10 ++++----
.../ServiceMonitoringStatusInterpreter.java | 4 ++--
.../BioCatalogueContextualMenuSection.java | 6 ++---
.../integration/menus/MenuActionInputPort.java | 2 +-
.../menus/MenuActionProcessorHealthCheck.java | 2 +-
.../BioCatalogueRESTServiceProvider.java | 2 +-
.../BioCatalogueServiceProvider.java | 6 ++---
...ioCatalogueWSDLOperationServiceProvider.java | 8 +++----
.../RESTFromBioCatalogueServiceDescription.java | 12 +++++-----
...ationFromBioCatalogueServiceDescription.java | 6 ++---
23 files changed, 79 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/95d4269b/taverna-perspective-biocatalogue/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-perspective-biocatalogue/pom.xml b/taverna-perspective-biocatalogue/pom.xml
index 8f85524..512218c 100644
--- a/taverna-perspective-biocatalogue/pom.xml
+++ b/taverna-perspective-biocatalogue/pom.xml
@@ -147,6 +147,30 @@
<artifactId>gson</artifactId>
<version>${gson.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.taverna.commonactivities</groupId>
+ <artifactId>taverna-rest-activity</artifactId>
+ <version>2.1.0-incubating-SNAPSHOT</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.taverna.commonactivities</groupId>
+ <artifactId>taverna-wsdl-activity</artifactId>
+ <version>2.1.0-incubating-SNAPSHOT</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.taverna.workbench</groupId>
+ <artifactId>taverna-activity-palette-impl</artifactId>
+ <version>3.1.0-incubating-SNAPSHOT</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.taverna.ui-activities</groupId>
+ <artifactId>taverna-rest-activity-ui</artifactId>
+ <version>3.1.0-incubating-SNAPSHOT</version>
+ <type>jar</type>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/95d4269b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/biocatalogue/model/HTTPMethodInterpreter.java
----------------------------------------------------------------------
diff --git a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/biocatalogue/model/HTTPMethodInterpreter.java b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/biocatalogue/model/HTTPMethodInterpreter.java
index b638398..95069ea 100644
--- a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/biocatalogue/model/HTTPMethodInterpreter.java
+++ b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/biocatalogue/model/HTTPMethodInterpreter.java
@@ -3,7 +3,7 @@ package org.apache.taverna.biocatalogue.model;
import org.apache.log4j.Logger;
import org.biocatalogue.x2009.xml.rest.HttpVerb;
-import net.sf.taverna.t2.activities.rest.RESTActivity.HTTP_METHOD;
+import org.apache.taverna.activities.rest.RESTActivity.HTTP_METHOD;
/**
* Very simple class for translating HTTP method values returned
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/95d4269b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/biocatalogue/model/ResourceManager.java
----------------------------------------------------------------------
diff --git a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/biocatalogue/model/ResourceManager.java b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/biocatalogue/model/ResourceManager.java
index 298b061..b3fd79e 100644
--- a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/biocatalogue/model/ResourceManager.java
+++ b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/biocatalogue/model/ResourceManager.java
@@ -13,8 +13,8 @@ import java.util.HashMap;
import javax.swing.Icon;
import javax.swing.ImageIcon;
-import net.sf.taverna.t2.activities.rest.ui.servicedescription.RESTActivityIcon;
-import net.sf.taverna.t2.activities.wsdl.servicedescriptions.WSDLActivityIcon;
+import org.apache.taverna.activities.rest.ui.servicedescription.RESTActivityIcon;
+import org.apache.taverna.activities.wsdl.servicedescriptions.WSDLActivityIcon;
import org.apache.taverna.ui.perspectives.biocatalogue.BioCataloguePerspective;
/**
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/95d4269b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/Integration.java
----------------------------------------------------------------------
diff --git a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/Integration.java b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/Integration.java
index 81b0528..1b32558 100644
--- a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/Integration.java
+++ b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/Integration.java
@@ -30,10 +30,10 @@ import org.apache.taverna.biocatalogue.model.SoapOperationIdentity;
import org.apache.taverna.biocatalogue.model.SoapOperationPortIdentity;
import org.apache.taverna.biocatalogue.model.SoapProcessorIdentity;
import org.apache.taverna.biocatalogue.model.Util;
-import net.sf.taverna.t2.activities.rest.RESTActivity;
-import net.sf.taverna.t2.activities.rest.RESTActivity.HTTP_METHOD;
-import net.sf.taverna.t2.activities.wsdl.WSDLActivity;
-import net.sf.taverna.t2.activities.wsdl.servicedescriptions.WSDLServiceDescription;
+import org.apache.taverna.activities.rest.RESTActivity;
+import org.apache.taverna.activities.rest.RESTActivity.HTTP_METHOD;
+import org.apache.taverna.activities.wsdl.WSDLActivity;
+import org.apache.taverna.activities.wsdl.servicedescriptions.WSDLServiceDescription;
import org.apache.taverna.ui.menu.ContextualSelection;
import org.apache.taverna.ui.perspectives.biocatalogue.MainComponentFactory;
import org.apache.taverna.ui.perspectives.biocatalogue.integration.service_panel.BioCatalogueRESTServiceProvider;
@@ -42,13 +42,13 @@ import org.apache.taverna.ui.perspectives.biocatalogue.integration.service_panel
import org.apache.taverna.ui.perspectives.biocatalogue.integration.service_panel.WSDLOperationFromBioCatalogueServiceDescription;
import org.apache.taverna.workbench.file.FileManager;
import org.apache.taverna.workbench.ui.workflowview.WorkflowView;
-import net.sf.taverna.t2.workflowmodel.Dataflow;
-import net.sf.taverna.t2.workflowmodel.Port;
-import net.sf.taverna.t2.workflowmodel.Processor;
-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.workflowmodel.Dataflow;
+import org.apache.taverna.workflowmodel.Port;
+import org.apache.taverna.workflowmodel.Processor;
+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;
/**
* This class contains helpers for deeper integration with Taverna UI.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/95d4269b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/config/BioCataloguePluginConfiguration.java
----------------------------------------------------------------------
diff --git a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/config/BioCataloguePluginConfiguration.java b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/config/BioCataloguePluginConfiguration.java
index c7aa2cd..2ea1392 100644
--- a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/config/BioCataloguePluginConfiguration.java
+++ b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/config/BioCataloguePluginConfiguration.java
@@ -6,6 +6,7 @@ import java.util.Map;
import uk.org.taverna.configuration.AbstractConfigurable;
import org.apache.taverna.biocatalogue.model.connectivity.BioCatalogueClient;
+import uk.org.taverna.configuration.ConfigurationManager;
/**
*
@@ -18,7 +19,6 @@ public class BioCataloguePluginConfiguration extends AbstractConfigurable
public static final String SOAP_OPERATIONS_IN_SERVICE_PANEL = "SOAP_Operations_in_Service_Panel";
public static final String REST_METHODS_IN_SERVICE_PANEL = "REST_Methods_in_Service_Panel";
-
private static class Singleton {
private static BioCataloguePluginConfiguration instance = new BioCataloguePluginConfiguration();
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/95d4269b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/contextual_views/BioCataloguePluginInputPortContextViewFactory.java
----------------------------------------------------------------------
diff --git a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/contextual_views/BioCataloguePluginInputPortContextViewFactory.java b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/contextual_views/BioCataloguePluginInputPortContextViewFactory.java
index 135c2ec..f7b373e 100644
--- a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/contextual_views/BioCataloguePluginInputPortContextViewFactory.java
+++ b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/contextual_views/BioCataloguePluginInputPortContextViewFactory.java
@@ -9,7 +9,7 @@ import org.apache.taverna.biocatalogue.model.SoapOperationPortIdentity;
import org.apache.taverna.ui.perspectives.biocatalogue.integration.Integration;
import org.apache.taverna.workbench.ui.views.contextualviews.ContextualView;
import org.apache.taverna.workbench.ui.views.contextualviews.activity.ContextualViewFactory;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityInputPort;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityInputPort;
public class BioCataloguePluginInputPortContextViewFactory implements
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/95d4269b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/contextual_views/BioCataloguePluginOutputPortContextViewFactory.java
----------------------------------------------------------------------
diff --git a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/contextual_views/BioCataloguePluginOutputPortContextViewFactory.java b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/contextual_views/BioCataloguePluginOutputPortContextViewFactory.java
index 44ae5c4..449da90 100644
--- a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/contextual_views/BioCataloguePluginOutputPortContextViewFactory.java
+++ b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/contextual_views/BioCataloguePluginOutputPortContextViewFactory.java
@@ -9,7 +9,7 @@ import org.apache.taverna.biocatalogue.model.SoapOperationPortIdentity;
import org.apache.taverna.ui.perspectives.biocatalogue.integration.Integration;
import org.apache.taverna.workbench.ui.views.contextualviews.ContextualView;
import org.apache.taverna.workbench.ui.views.contextualviews.activity.ContextualViewFactory;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityOutputPort;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityOutputPort;
public class BioCataloguePluginOutputPortContextViewFactory implements
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/95d4269b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/contextual_views/BioCataloguePluginProcessorContextViewFactory.java
----------------------------------------------------------------------
diff --git a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/contextual_views/BioCataloguePluginProcessorContextViewFactory.java b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/contextual_views/BioCataloguePluginProcessorContextViewFactory.java
index 454da5c..c9b25f0 100644
--- a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/contextual_views/BioCataloguePluginProcessorContextViewFactory.java
+++ b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/contextual_views/BioCataloguePluginProcessorContextViewFactory.java
@@ -9,7 +9,7 @@ import org.apache.taverna.biocatalogue.model.SoapOperationIdentity;
import org.apache.taverna.ui.perspectives.biocatalogue.integration.Integration;
import org.apache.taverna.workbench.ui.views.contextualviews.ContextualView;
import org.apache.taverna.workbench.ui.views.contextualviews.activity.ContextualViewFactory;
-import net.sf.taverna.t2.workflowmodel.Processor;
+import org.apache.taverna.workflowmodel.Processor;
public class BioCataloguePluginProcessorContextViewFactory implements
ContextualViewFactory<Processor> {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/95d4269b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/contextual_views/ProcessorInputPortView.java
----------------------------------------------------------------------
diff --git a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/contextual_views/ProcessorInputPortView.java b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/contextual_views/ProcessorInputPortView.java
index 9e6dae0..e2e60d5 100644
--- a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/contextual_views/ProcessorInputPortView.java
+++ b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/contextual_views/ProcessorInputPortView.java
@@ -5,7 +5,7 @@ import javax.swing.JPanel;
import org.apache.taverna.biocatalogue.model.BioCataloguePluginConstants;
import org.apache.taverna.workbench.ui.views.contextualviews.ContextualView;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityInputPort;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityInputPort;
public class ProcessorInputPortView extends ContextualView
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/95d4269b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/contextual_views/ProcessorOutputPortView.java
----------------------------------------------------------------------
diff --git a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/contextual_views/ProcessorOutputPortView.java b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/contextual_views/ProcessorOutputPortView.java
index 69e22fb..845b5a7 100644
--- a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/contextual_views/ProcessorOutputPortView.java
+++ b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/contextual_views/ProcessorOutputPortView.java
@@ -5,7 +5,7 @@ import javax.swing.JPanel;
import org.apache.taverna.biocatalogue.model.BioCataloguePluginConstants;
import org.apache.taverna.workbench.ui.views.contextualviews.ContextualView;
-import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityOutputPort;
+import org.apache.taverna.workflowmodel.processor.activity.ActivityOutputPort;
public class ProcessorOutputPortView extends ContextualView
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/95d4269b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/contextual_views/ProcessorView.java
----------------------------------------------------------------------
diff --git a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/contextual_views/ProcessorView.java b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/contextual_views/ProcessorView.java
index 83820c3..d41632c 100644
--- a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/contextual_views/ProcessorView.java
+++ b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/contextual_views/ProcessorView.java
@@ -36,7 +36,7 @@ import org.apache.taverna.ui.perspectives.biocatalogue.integration.Integration;
import org.apache.taverna.ui.perspectives.biocatalogue.integration.health_check.ServiceHealthChecker;
import org.apache.taverna.ui.perspectives.biocatalogue.integration.health_check.ServiceMonitoringStatusInterpreter;
import org.apache.taverna.workbench.ui.views.contextualviews.ContextualView;
-import net.sf.taverna.t2.workflowmodel.Processor;
+import org.apache.taverna.workflowmodel.Processor;
import org.apache.log4j.Logger;
import org.biocatalogue.x2009.xml.rest.Service;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/95d4269b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/health_check/BioCatalogueWSDLActivityHealthCheck.java
----------------------------------------------------------------------
diff --git a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/health_check/BioCatalogueWSDLActivityHealthCheck.java b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/health_check/BioCatalogueWSDLActivityHealthCheck.java
index b8abef5..0129268 100644
--- a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/health_check/BioCatalogueWSDLActivityHealthCheck.java
+++ b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/health_check/BioCatalogueWSDLActivityHealthCheck.java
@@ -1,7 +1,7 @@
package org.apache.taverna.ui.perspectives.biocatalogue.integration.health_check;
-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 {@link BioCatalogueWSDLActivityHealthCheck} is a kind of visit that determines
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/95d4269b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/health_check/BioCatalogueWSDLActivityHealthCheckVisitExplainer.java
----------------------------------------------------------------------
diff --git a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/health_check/BioCatalogueWSDLActivityHealthCheckVisitExplainer.java b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/health_check/BioCatalogueWSDLActivityHealthCheckVisitExplainer.java
index 0fab556..5ae0927 100644
--- a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/health_check/BioCatalogueWSDLActivityHealthCheckVisitExplainer.java
+++ b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/health_check/BioCatalogueWSDLActivityHealthCheckVisitExplainer.java
@@ -11,9 +11,9 @@ import javax.swing.JPanel;
import org.apache.taverna.biocatalogue.model.SoapOperationIdentity;
import org.apache.taverna.lang.ui.ReadOnlyTextArea;
-import net.sf.taverna.t2.visit.VisitKind;
-import net.sf.taverna.t2.visit.VisitReport;
-import net.sf.taverna.t2.workbench.report.explainer.VisitExplainer;
+import org.apache.taverna.visit.VisitKind;
+import org.apache.taverna.visit.VisitReport;
+import org.apache.taverna.workbench.report.explainer.VisitExplainer;
// import status constants
import static org.apache.taverna.ui.perspectives.biocatalogue.integration.health_check.BioCatalogueWSDLActivityHealthCheck.*;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/95d4269b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/health_check/BioCatalogueWSDLActivityHealthChecker.java
----------------------------------------------------------------------
diff --git a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/health_check/BioCatalogueWSDLActivityHealthChecker.java b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/health_check/BioCatalogueWSDLActivityHealthChecker.java
index eba0f0d..7fc7292 100644
--- a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/health_check/BioCatalogueWSDLActivityHealthChecker.java
+++ b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/health_check/BioCatalogueWSDLActivityHealthChecker.java
@@ -14,12 +14,12 @@ import org.biocatalogue.x2009.xml.rest.TestScript;
import org.apache.taverna.biocatalogue.model.SoapOperationIdentity;
import org.apache.taverna.biocatalogue.model.Util;
import org.apache.taverna.biocatalogue.model.connectivity.BioCatalogueClient;
-import net.sf.taverna.t2.activities.wsdl.WSDLActivity;
-import net.sf.taverna.t2.activities.wsdl.WSDLActivityConfigurationBean;
+import org.apache.taverna.activities.wsdl.WSDLActivity;
+import org.apache.taverna.activities.wsdl.WSDLActivityConfigurationBean;
import org.apache.taverna.ui.perspectives.biocatalogue.MainComponentFactory;
-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.VisitReport;
+import org.apache.taverna.visit.VisitReport.Status;
+import org.apache.taverna.workflowmodel.health.HealthChecker;
/**
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/95d4269b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/health_check/ServiceMonitoringStatusInterpreter.java
----------------------------------------------------------------------
diff --git a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/health_check/ServiceMonitoringStatusInterpreter.java b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/health_check/ServiceMonitoringStatusInterpreter.java
index 4e0a7ac..7de73db 100644
--- a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/health_check/ServiceMonitoringStatusInterpreter.java
+++ b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/health_check/ServiceMonitoringStatusInterpreter.java
@@ -6,8 +6,8 @@ import javax.swing.Icon;
import javax.swing.ImageIcon;
import org.apache.taverna.biocatalogue.model.ResourceManager;
-import net.sf.taverna.t2.visit.VisitReport;
-import net.sf.taverna.t2.visit.VisitReport.Status;
+import org.apache.taverna.visit.VisitReport;
+import org.apache.taverna.visit.VisitReport.Status;
import org.biocatalogue.x2009.xml.rest.MonitoringStatus;
import org.biocatalogue.x2009.xml.rest.MonitoringStatusLabel;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/95d4269b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/menus/BioCatalogueContextualMenuSection.java
----------------------------------------------------------------------
diff --git a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/menus/BioCatalogueContextualMenuSection.java b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/menus/BioCatalogueContextualMenuSection.java
index 86cb665..2256fce 100644
--- a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/menus/BioCatalogueContextualMenuSection.java
+++ b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/menus/BioCatalogueContextualMenuSection.java
@@ -12,9 +12,9 @@ import org.apache.taverna.ui.menu.AbstractMenuSection;
import org.apache.taverna.ui.menu.ContextualMenuComponent;
import org.apache.taverna.ui.menu.ContextualSelection;
import org.apache.taverna.ui.menu.DefaultContextualMenu;
-import net.sf.taverna.t2.workflowmodel.Dataflow;
-import net.sf.taverna.t2.workflowmodel.InputPort;
-import net.sf.taverna.t2.workflowmodel.Processor;
+import org.apache.taverna.workflowmodel.Dataflow;
+import org.apache.taverna.workflowmodel.InputPort;
+import org.apache.taverna.workflowmodel.Processor;
public class BioCatalogueContextualMenuSection extends AbstractMenuSection implements ContextualMenuComponent
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/95d4269b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/menus/MenuActionInputPort.java
----------------------------------------------------------------------
diff --git a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/menus/MenuActionInputPort.java b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/menus/MenuActionInputPort.java
index 8a8bf23..b647f82 100644
--- a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/menus/MenuActionInputPort.java
+++ b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/menus/MenuActionInputPort.java
@@ -9,7 +9,7 @@ import javax.swing.JOptionPane;
import org.apache.taverna.ui.menu.AbstractContextualMenuAction;
-import net.sf.taverna.t2.workflowmodel.InputPort;
+import org.apache.taverna.workflowmodel.InputPort;
/**
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/95d4269b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/menus/MenuActionProcessorHealthCheck.java
----------------------------------------------------------------------
diff --git a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/menus/MenuActionProcessorHealthCheck.java b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/menus/MenuActionProcessorHealthCheck.java
index ddf1382..b6eed20 100644
--- a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/menus/MenuActionProcessorHealthCheck.java
+++ b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/menus/MenuActionProcessorHealthCheck.java
@@ -10,7 +10,7 @@ import org.apache.taverna.biocatalogue.model.SoapOperationIdentity;
import org.apache.taverna.ui.menu.AbstractContextualMenuAction;
import org.apache.taverna.ui.perspectives.biocatalogue.integration.Integration;
import org.apache.taverna.ui.perspectives.biocatalogue.integration.health_check.ServiceHealthChecker;
-import net.sf.taverna.t2.workflowmodel.Processor;
+import org.apache.taverna.workflowmodel.Processor;
public class MenuActionProcessorHealthCheck extends AbstractContextualMenuAction {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/95d4269b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/service_panel/BioCatalogueRESTServiceProvider.java
----------------------------------------------------------------------
diff --git a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/service_panel/BioCatalogueRESTServiceProvider.java b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/service_panel/BioCatalogueRESTServiceProvider.java
index 3bf6951..ce52b04 100644
--- a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/service_panel/BioCatalogueRESTServiceProvider.java
+++ b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/service_panel/BioCatalogueRESTServiceProvider.java
@@ -30,7 +30,7 @@ import org.apache.log4j.Logger;
//import net.sf.taverna.t2.activities.rest.ui.servicedescription.RESTActivityIcon;
import org.apache.taverna.servicedescriptions.AbstractConfigurableServiceProvider;
-import net.sf.taverna.t2.servicedescriptions.impl.ServiceDescriptionRegistryImpl;
+import org.apache.taverna.servicedescriptions.impl.ServiceDescriptionRegistryImpl;
/**
* Service provider for REST service added to the Service Panel through the
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/95d4269b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/service_panel/BioCatalogueServiceProvider.java
----------------------------------------------------------------------
diff --git a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/service_panel/BioCatalogueServiceProvider.java b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/service_panel/BioCatalogueServiceProvider.java
index a9d3c32..9b3c089 100644
--- a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/service_panel/BioCatalogueServiceProvider.java
+++ b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/service_panel/BioCatalogueServiceProvider.java
@@ -18,13 +18,13 @@ import com.thoughtworks.xstream.io.xml.DomDriver;
import org.apache.taverna.biocatalogue.model.SoapOperationIdentity;
import org.apache.taverna.biocatalogue.model.Util;
-import net.sf.taverna.t2.activities.wsdl.WSDLActivityHealthChecker;
+import org.apache.taverna.activities.wsdl.WSDLActivityHealthChecker;
import org.apache.taverna.servicedescriptions.ServiceDescription;
import org.apache.taverna.servicedescriptions.ServiceDescriptionProvider;
import org.apache.taverna.ui.perspectives.biocatalogue.BioCataloguePerspective;
import org.apache.taverna.ui.perspectives.biocatalogue.integration.config.BioCataloguePluginConfiguration;
-import net.sf.taverna.wsdl.parser.UnknownOperationException;
-import net.sf.taverna.wsdl.parser.WSDLParser;
+import org.apache.taverna.wsdl.parser.UnknownOperationException;
+import org.apache.taverna.wsdl.parser.WSDLParser;
public class BioCatalogueServiceProvider implements ServiceDescriptionProvider
{
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/95d4269b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/service_panel/BioCatalogueWSDLOperationServiceProvider.java
----------------------------------------------------------------------
diff --git a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/service_panel/BioCatalogueWSDLOperationServiceProvider.java b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/service_panel/BioCatalogueWSDLOperationServiceProvider.java
index c0d588e..a5d9dfd 100644
--- a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/service_panel/BioCatalogueWSDLOperationServiceProvider.java
+++ b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/service_panel/BioCatalogueWSDLOperationServiceProvider.java
@@ -35,11 +35,11 @@ import org.apache.log4j.Logger;
import org.xml.sax.SAXException;
import org.apache.taverna.biocatalogue.model.SoapOperationIdentity;
-import net.sf.taverna.t2.activities.wsdl.WSDLActivityHealthChecker;
+import org.apache.taverna.activities.wsdl.WSDLActivityHealthChecker;
import org.apache.taverna.servicedescriptions.AbstractConfigurableServiceProvider;
-import net.sf.taverna.t2.servicedescriptions.impl.ServiceDescriptionRegistryImpl;
-import net.sf.taverna.wsdl.parser.UnknownOperationException;
-import net.sf.taverna.wsdl.parser.WSDLParser;
+import org.apache.taverna.servicedescriptions.impl.ServiceDescriptionRegistryImpl;
+import org.apache.taverna.wsdl.parser.UnknownOperationException;
+import org.apache.taverna.wsdl.parser.WSDLParser;
/**
* Service provider for WSDL operations added to the Service Panel through the
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/95d4269b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/service_panel/RESTFromBioCatalogueServiceDescription.java
----------------------------------------------------------------------
diff --git a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/service_panel/RESTFromBioCatalogueServiceDescription.java b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/service_panel/RESTFromBioCatalogueServiceDescription.java
index 44a4f83..882c6a4 100644
--- a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/service_panel/RESTFromBioCatalogueServiceDescription.java
+++ b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/service_panel/RESTFromBioCatalogueServiceDescription.java
@@ -8,13 +8,13 @@ import javax.swing.Icon;
import org.apache.taverna.lang.beans.PropertyAnnotation;
import org.apache.taverna.servicedescriptions.ServiceDescription;
-import net.sf.taverna.t2.workflowmodel.processor.activity.Activity;
+import org.apache.taverna.workflowmodel.processor.activity.Activity;
-import net.sf.taverna.t2.activities.rest.RESTActivity;
-import net.sf.taverna.t2.activities.rest.RESTActivity.DATA_FORMAT;
-import net.sf.taverna.t2.activities.rest.RESTActivity.HTTP_METHOD;
-import net.sf.taverna.t2.activities.rest.RESTActivityConfigurationBean;
-import net.sf.taverna.t2.activities.rest.ui.servicedescription.RESTActivityIcon;
+import org.apache.taverna.activities.rest.RESTActivity;
+import org.apache.taverna.activities.rest.RESTActivity.DATA_FORMAT;
+import org.apache.taverna.activities.rest.RESTActivity.HTTP_METHOD;
+import org.apache.taverna.activities.rest.RESTActivityConfigurationBean;
+import org.apache.taverna.activities.rest.ui.servicedescription.RESTActivityIcon;
/**
* This class is solely intended to support import of REST services from BioCatalogue.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/95d4269b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/service_panel/WSDLOperationFromBioCatalogueServiceDescription.java
----------------------------------------------------------------------
diff --git a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/service_panel/WSDLOperationFromBioCatalogueServiceDescription.java b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/service_panel/WSDLOperationFromBioCatalogueServiceDescription.java
index ff6517a..6a94db2 100644
--- a/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/service_panel/WSDLOperationFromBioCatalogueServiceDescription.java
+++ b/taverna-perspective-biocatalogue/src/main/java/org/apache/taverna/ui/perspectives/biocatalogue/integration/service_panel/WSDLOperationFromBioCatalogueServiceDescription.java
@@ -6,9 +6,9 @@ import java.util.List;
import javax.swing.Icon;
import org.apache.taverna.biocatalogue.model.SoapOperationIdentity;
-import net.sf.taverna.t2.activities.wsdl.WSDLActivity;
-import net.sf.taverna.t2.activities.wsdl.WSDLActivityConfigurationBean;
-import net.sf.taverna.t2.activities.wsdl.servicedescriptions.WSDLActivityIcon;
+import org.apache.taverna.activities.wsdl.WSDLActivity;
+import org.apache.taverna.activities.wsdl.WSDLActivityConfigurationBean;
+import org.apache.taverna.activities.wsdl.servicedescriptions.WSDLActivityIcon;
import org.apache.taverna.lang.beans.PropertyAnnotation;
import org.apache.taverna.servicedescriptions.ServiceDescription;
[2/2] incubator-taverna-workbench git commit: poms cleaning
Posted by re...@apache.org.
poms cleaning
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/a87b85d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/a87b85d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/a87b85d8
Branch: refs/heads/master
Commit: a87b85d81461b6f4924de5bcef74d9844461f871
Parents: 95d4269
Author: Dmitry Repchevsky <re...@list.ru>
Authored: Mon Mar 30 15:31:17 2015 +0200
Committer: Dmitry Repchevsky <re...@list.ru>
Committed: Mon Mar 30 15:32:36 2015 +0200
----------------------------------------------------------------------
taverna-loop-ui/pom.xml | 6 ++++++
taverna-menu-items/pom.xml | 22 +++++++++-----------
taverna-perspective-myexperiment/pom.xml | 7 ++++++-
.../myexperiment/UploadWorkflowDialog.java | 2 +-
.../saveactions/SaveAllResultsAsXML.java | 2 +-
.../workflow/RenderedResultComponent.java | 2 +-
taverna-workflow-explorer/pom.xml | 5 -----
7 files changed, 25 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a87b85d8/taverna-loop-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-loop-ui/pom.xml b/taverna-loop-ui/pom.xml
index 97be01c..5549d6d 100644
--- a/taverna-loop-ui/pom.xml
+++ b/taverna-loop-ui/pom.xml
@@ -108,5 +108,11 @@
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.taverna.ui-activities</groupId>
+ <artifactId>taverna-beanshell-activity-ui</artifactId>
+ <version>3.1.0-incubating-SNAPSHOT</version>
+ <type>jar</type>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a87b85d8/taverna-menu-items/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-menu-items/pom.xml b/taverna-menu-items/pom.xml
index 81a550a..350f9bb 100644
--- a/taverna-menu-items/pom.xml
+++ b/taverna-menu-items/pom.xml
@@ -84,17 +84,15 @@
<artifactId>stringconstant-activity-ui</artifactId>
<version>${project.parent.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.taverna.workbench</groupId>
- <artifactId>taverna-stringconstant-activity-ui</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.taverna.workbench</groupId>
- <artifactId>taverna-contextual-views-impl</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
- <type>jar</type>
- </dependency>
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-stringconstant-activity-ui</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-contextual-views-impl</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a87b85d8/taverna-perspective-myexperiment/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-perspective-myexperiment/pom.xml b/taverna-perspective-myexperiment/pom.xml
index 217c137..3d47e46 100644
--- a/taverna-perspective-myexperiment/pom.xml
+++ b/taverna-perspective-myexperiment/pom.xml
@@ -52,7 +52,11 @@
<artifactId>taverna-ui</artifactId>
<version>${project.parent.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-file-impl</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-configuration-api</artifactId>
@@ -84,6 +88,7 @@
<artifactId>taverna-credential-manager</artifactId>
<version>${taverna.engine.version}</version>
</dependency>
+
</dependencies>
<packaging>bundle</packaging>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a87b85d8/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/UploadWorkflowDialog.java
----------------------------------------------------------------------
diff --git a/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/UploadWorkflowDialog.java b/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/UploadWorkflowDialog.java
index a6155f5..022a22e 100644
--- a/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/UploadWorkflowDialog.java
+++ b/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/UploadWorkflowDialog.java
@@ -70,7 +70,7 @@ import org.apache.taverna.ui.perspectives.myexperiment.model.ServerResponse;
import org.apache.taverna.ui.perspectives.myexperiment.model.Util;
import org.apache.taverna.ui.perspectives.myexperiment.model.Workflow;
import org.apache.taverna.workbench.file.FileManager;
-import net.sf.taverna.t2.workbench.file.impl.actions.SaveWorkflowAsAction;
+import org.apache.taverna.workbench.file.impl.actions.SaveWorkflowAsAction;
import org.apache.taverna.workbench.helper.HelpEnabledDialog;
import org.apache.taverna.workbench.icons.WorkbenchIcons;
import org.apache.taverna.workflowmodel.Dataflow;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a87b85d8/taverna-results-view/src/main/java/org/apache/taverna/workbench/views/results/saveactions/SaveAllResultsAsXML.java
----------------------------------------------------------------------
diff --git a/taverna-results-view/src/main/java/org/apache/taverna/workbench/views/results/saveactions/SaveAllResultsAsXML.java b/taverna-results-view/src/main/java/org/apache/taverna/workbench/views/results/saveactions/SaveAllResultsAsXML.java
index e255e73..1d01de6 100644
--- a/taverna-results-view/src/main/java/org/apache/taverna/workbench/views/results/saveactions/SaveAllResultsAsXML.java
+++ b/taverna-results-view/src/main/java/org/apache/taverna/workbench/views/results/saveactions/SaveAllResultsAsXML.java
@@ -29,7 +29,7 @@ import java.util.Map;
import javax.swing.AbstractAction;
-import net.sf.taverna.t2.results.BaclavaDocumentPathHandler;
+import org.apache.taverna.results.BaclavaDocumentPathHandler;
/**
* Stores the entire map of result objects to disk as a single XML data
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a87b85d8/taverna-results-view/src/main/java/org/apache/taverna/workbench/views/results/workflow/RenderedResultComponent.java
----------------------------------------------------------------------
diff --git a/taverna-results-view/src/main/java/org/apache/taverna/workbench/views/results/workflow/RenderedResultComponent.java b/taverna-results-view/src/main/java/org/apache/taverna/workbench/views/results/workflow/RenderedResultComponent.java
index 416346a..4b6e314 100644
--- a/taverna-results-view/src/main/java/org/apache/taverna/workbench/views/results/workflow/RenderedResultComponent.java
+++ b/taverna-results-view/src/main/java/org/apache/taverna/workbench/views/results/workflow/RenderedResultComponent.java
@@ -27,7 +27,7 @@ import static java.awt.event.ItemEvent.SELECTED;
import static javax.swing.BoxLayout.LINE_AXIS;
import static javax.swing.SwingUtilities.invokeLater;
import static org.apache.taverna.renderers.RendererUtils.getInputStream;
-import static net.sf.taverna.t2.results.ResultsUtils;
+import static org.apache.taverna.results.ResultsUtils;
import static org.apache.taverna.workbench.icons.WorkbenchIcons.refreshIcon;
import static org.apache.commons.lang.StringEscapeUtils.escapeHtml;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a87b85d8/taverna-workflow-explorer/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workflow-explorer/pom.xml b/taverna-workflow-explorer/pom.xml
index cc34651..ad2d0f4 100644
--- a/taverna-workflow-explorer/pom.xml
+++ b/taverna-workflow-explorer/pom.xml
@@ -40,11 +40,6 @@
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>taverna-workbench-impl</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-workflow-view</artifactId>
<version>${project.parent.version}</version>
</dependency>