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/25 17:32:06 UTC
[2/3] incubator-taverna-workbench git commit: more refactoring
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-renderers-impl/src/main/java/net/sf/taverna/t2/renderers/impl/AbstractRenderer.java
----------------------------------------------------------------------
diff --git a/taverna-renderers-impl/src/main/java/net/sf/taverna/t2/renderers/impl/AbstractRenderer.java b/taverna-renderers-impl/src/main/java/net/sf/taverna/t2/renderers/impl/AbstractRenderer.java
index 14ef62f..733c625 100644
--- a/taverna-renderers-impl/src/main/java/net/sf/taverna/t2/renderers/impl/AbstractRenderer.java
+++ b/taverna-renderers-impl/src/main/java/net/sf/taverna/t2/renderers/impl/AbstractRenderer.java
@@ -9,8 +9,8 @@ import static net.sf.taverna.t2.renderers.impl.RendererConstants.BIG_DATA_MSG;
import static net.sf.taverna.t2.renderers.impl.RendererConstants.CANCELLED_MSG;
import static net.sf.taverna.t2.renderers.impl.RendererConstants.NO_DATA_MSG;
import static net.sf.taverna.t2.renderers.impl.RendererConstants.NO_SIZE_MSG;
-import static uk.org.taverna.databundle.DataBundles.isValue;
-import static uk.org.taverna.databundle.DataBundles.isReference;
+import static org.apache.taverna.databundle.DataBundles.isValue;
+import static org.apache.taverna.databundle.DataBundles.isReference;
import java.nio.file.Path;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-report-api/src/main/java/net/sf/taverna/t2/workbench/report/ProfileReportEvent.java
----------------------------------------------------------------------
diff --git a/taverna-report-api/src/main/java/net/sf/taverna/t2/workbench/report/ProfileReportEvent.java b/taverna-report-api/src/main/java/net/sf/taverna/t2/workbench/report/ProfileReportEvent.java
index d5412bc..b3a0f2c 100644
--- a/taverna-report-api/src/main/java/net/sf/taverna/t2/workbench/report/ProfileReportEvent.java
+++ b/taverna-report-api/src/main/java/net/sf/taverna/t2/workbench/report/ProfileReportEvent.java
@@ -3,7 +3,7 @@
*/
package net.sf.taverna.t2.workbench.report;
-import uk.org.taverna.scufl2.api.profiles.Profile;
+import org.apache.taverna.scufl2.api.profiles.Profile;
/**
* @author alanrw
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-report-api/src/main/java/net/sf/taverna/t2/workbench/report/ReportManager.java
----------------------------------------------------------------------
diff --git a/taverna-report-api/src/main/java/net/sf/taverna/t2/workbench/report/ReportManager.java b/taverna-report-api/src/main/java/net/sf/taverna/t2/workbench/report/ReportManager.java
index eb39c2f..a78c7c8 100644
--- a/taverna-report-api/src/main/java/net/sf/taverna/t2/workbench/report/ReportManager.java
+++ b/taverna-report-api/src/main/java/net/sf/taverna/t2/workbench/report/ReportManager.java
@@ -4,14 +4,12 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import uk.org.taverna.scufl2.api.common.WorkflowBean;
-import uk.org.taverna.scufl2.api.profiles.Profile;
-import uk.org.taverna.scufl2.validation.WorkflowBeanReport;
-import uk.org.taverna.scufl2.validation.Status;
-
-import net.sf.taverna.t2.lang.observer.Observer;
-//import net.sf.taverna.t2.visit.VisitReport;
-//import net.sf.taverna.t2.visit.VisitReport.Status;
+import org.apache.taverna.scufl2.api.common.WorkflowBean;
+import org.apache.taverna.scufl2.api.profiles.Profile;
+import org.apache.taverna.scufl2.validation.WorkflowBeanReport;
+import org.apache.taverna.scufl2.validation.Status;
+
+import org.apache.taverna.lang.observer.Observer;
public interface ReportManager {
void updateReport(Profile p, boolean includeTimeConsuming, boolean remember);
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-report-explainer/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-report-explainer/pom.xml b/taverna-report-explainer/pom.xml
index 5504fde..91cc0a3 100644
--- a/taverna-report-explainer/pom.xml
+++ b/taverna-report-explainer/pom.xml
@@ -31,6 +31,13 @@
</description>
<dependencies>
<dependency>
+ <groupId>org.apache.taverna.osgi</groupId>
+ <artifactId>taverna-configuration-impl</artifactId>
+ <version>${taverna.osgi.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-report-api</artifactId>
<version>${project.parent.version}</version>
@@ -79,11 +86,6 @@
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>taverna-configuration-impl</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-report-view</artifactId>
<version>${project.parent.version}</version>
</dependency>
@@ -92,17 +94,7 @@
<artifactId>taverna-design-ui</artifactId>
<version>${project.parent.version}</version>
</dependency>
- <dependency>
- <!-- FIXME: why is this needed? -->
- <groupId>org.apache.taverna.engine</groupId>
- <artifactId>workflowmodel-impl</artifactId>
- <version>${taverna.engine.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>taverna-ui</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
+
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
@@ -113,5 +105,6 @@
<artifactId>BrowserLauncher2</artifactId>
<version>1.3</version>
</dependency>
+
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-report-explainer/src/main/java/net/sf/taverna/t2/workbench/report/explainer/BasicExplainer.java
----------------------------------------------------------------------
diff --git a/taverna-report-explainer/src/main/java/net/sf/taverna/t2/workbench/report/explainer/BasicExplainer.java b/taverna-report-explainer/src/main/java/net/sf/taverna/t2/workbench/report/explainer/BasicExplainer.java
index 604272e..909791c 100644
--- a/taverna-report-explainer/src/main/java/net/sf/taverna/t2/workbench/report/explainer/BasicExplainer.java
+++ b/taverna-report-explainer/src/main/java/net/sf/taverna/t2/workbench/report/explainer/BasicExplainer.java
@@ -39,7 +39,7 @@ import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JPanel;
-import net.sf.taverna.t2.activities.dataflow.DataflowActivity;
+import org.apache.taverna.activities.dataflow.DataflowActivity;
import net.sf.taverna.t2.activities.dataflow.actions.EditNestedDataflowAction;
import net.sf.taverna.t2.activities.disabled.actions.DisabledActivityConfigurationAction;
import net.sf.taverna.t2.activities.wsdl.InputPortTypeDescriptorActivity;
@@ -48,7 +48,7 @@ import net.sf.taverna.t2.lang.ui.ReadOnlyTextArea;
import org.apache.taverna.visit.DataflowCollation;
import org.apache.taverna.visit.VisitKind;
import org.apache.taverna.visit.VisitReport;
-import net.sf.taverna.t2.visit.fragility.FragilityCheck;
+import org.sf.taverna.t2.visit.fragility.FragilityCheck;
import net.sf.taverna.t2.workbench.activityicons.ActivityIconManager;
import net.sf.taverna.t2.workbench.design.actions.AddDataflowOutputAction;
import net.sf.taverna.t2.workbench.edits.EditManager;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-report-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-report-impl/pom.xml b/taverna-report-impl/pom.xml
index 5ad5269..e107032 100644
--- a/taverna-report-impl/pom.xml
+++ b/taverna-report-impl/pom.xml
@@ -27,11 +27,11 @@
<packaging>bundle</packaging>
<name>Apache Taverna Reporting Implementation</name>
<dependencies>
- <dependency>
- <groupId>org.apache.taverna.engine</groupId>
- <artifactId>workflowmodel-api</artifactId>
- <version>${taverna.engine.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-workflowmodel-api</artifactId>
+ <version>${taverna.engine.version}</version>
+ </dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-report-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-report-impl/src/main/java/net/sf/taverna/t2/workbench/report/config/impl/ReportManagerConfigurationImpl.java
----------------------------------------------------------------------
diff --git a/taverna-report-impl/src/main/java/net/sf/taverna/t2/workbench/report/config/impl/ReportManagerConfigurationImpl.java b/taverna-report-impl/src/main/java/net/sf/taverna/t2/workbench/report/config/impl/ReportManagerConfigurationImpl.java
index b5986b5..8d1c1e9 100644
--- a/taverna-report-impl/src/main/java/net/sf/taverna/t2/workbench/report/config/impl/ReportManagerConfigurationImpl.java
+++ b/taverna-report-impl/src/main/java/net/sf/taverna/t2/workbench/report/config/impl/ReportManagerConfigurationImpl.java
@@ -10,7 +10,7 @@ import uk.org.taverna.configuration.AbstractConfigurable;
import uk.org.taverna.configuration.ConfigurationManager;
import net.sf.taverna.t2.workbench.report.config.ReportManagerConfiguration;
-import net.sf.taverna.t2.workflowmodel.health.RemoteHealthChecker;
+import org.apache.taverna.workflowmodel.health.RemoteHealthChecker;
/**
* @author alanrw
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-report-impl/src/main/java/net/sf/taverna/t2/workbench/report/impl/ReportManagerImpl.java
----------------------------------------------------------------------
diff --git a/taverna-report-impl/src/main/java/net/sf/taverna/t2/workbench/report/impl/ReportManagerImpl.java b/taverna-report-impl/src/main/java/net/sf/taverna/t2/workbench/report/impl/ReportManagerImpl.java
index 825efee..c14af70 100644
--- a/taverna-report-impl/src/main/java/net/sf/taverna/t2/workbench/report/impl/ReportManagerImpl.java
+++ b/taverna-report-impl/src/main/java/net/sf/taverna/t2/workbench/report/impl/ReportManagerImpl.java
@@ -12,14 +12,14 @@ import java.util.Map;
import java.util.Set;
import java.util.WeakHashMap;
-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 net.sf.taverna.t2.visit.HierarchyTraverser;
-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.visit.Visitor;
+import org.apache.taverna.lang.observer.MultiCaster;
+import org.apache.taverna.lang.observer.Observable;
+import org.apache.taverna.lang.observer.Observer;
+import org.apache.taverna.visit.HierarchyTraverser;
+import org.apache.taverna.visit.VisitKind;
+import org.apache.taverna.visit.VisitReport;
+import org.apache.taverna.visit.VisitReport.Status;
+import org.apache.taverna.visit.Visitor;
import net.sf.taverna.t2.workbench.edits.EditManager;
import net.sf.taverna.t2.workbench.edits.EditManager.AbstractDataflowEditEvent;
import net.sf.taverna.t2.workbench.edits.EditManager.EditManagerEvent;
@@ -36,9 +36,9 @@ import net.sf.taverna.t2.workbench.report.ReportManagerEvent;
import net.sf.taverna.t2.workbench.report.UnresolvedOutputKind;
import net.sf.taverna.t2.workbench.report.UnsatisfiedEntityKind;
import net.sf.taverna.t2.workbench.report.config.ReportManagerConfiguration;
-import net.sf.taverna.t2.workflowmodel.Dataflow;
-import net.sf.taverna.t2.workflowmodel.DataflowValidationReport;
-import net.sf.taverna.t2.workflowmodel.Processor;
+import org.apache.taverna.workflowmodel.Dataflow;
+import org.apache.taverna.workflowmodel.DataflowValidationReport;
+import org.apache.taverna.workflowmodel.Processor;
import org.apache.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-report-view/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-report-view/pom.xml b/taverna-report-view/pom.xml
index a0b47f0..2570426 100644
--- a/taverna-report-view/pom.xml
+++ b/taverna-report-view/pom.xml
@@ -30,6 +30,11 @@
View of reports about dataflows in the workbench.
</description>
<dependencies>
+ <dependency>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-workflowmodel-api</artifactId>
+ <version>${taverna.engine.version}</version>
+ </dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-ui</artifactId>
@@ -75,10 +80,11 @@
<artifactId>taverna-workbench-impl</artifactId>
<version>${project.parent.version}</version>
</dependency>
- --> <dependency>
- <groupId>${project.parent.groupId}</groupId>
+ -->
+ <dependency>
+ <groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-configuration-api</artifactId>
- <version>${project.parent.version}</version>
+ <version>${taverna.osgi.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
@@ -91,6 +97,5 @@
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency>
-
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/ReportOnObjectContextualMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/ReportOnObjectContextualMenuAction.java b/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/ReportOnObjectContextualMenuAction.java
index 1fdfd45..8800f60 100644
--- a/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/ReportOnObjectContextualMenuAction.java
+++ b/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/ReportOnObjectContextualMenuAction.java
@@ -30,17 +30,17 @@ import javax.swing.Action;
import javax.swing.JOptionPane;
import net.sf.taverna.t2.ui.menu.AbstractContextualMenuAction;
-import net.sf.taverna.t2.visit.DataflowCollation;
-import net.sf.taverna.t2.visit.VisitReport;
-import net.sf.taverna.t2.visit.VisitReport.Status;
+import org.apache.taverna.visit.DataflowCollation;
+import org.apache.taverna.visit.VisitReport;
+import org.apache.taverna.visit.VisitReport.Status;
import net.sf.taverna.t2.workbench.MainWindow;
import net.sf.taverna.t2.workbench.edits.EditManager;
import net.sf.taverna.t2.workbench.file.FileManager;
import net.sf.taverna.t2.workbench.report.ReportManager;
import net.sf.taverna.t2.workbench.ui.SwingWorkerCompletionWaiter;
import net.sf.taverna.t2.workbench.ui.Workbench;
-import net.sf.taverna.t2.workflowmodel.Dataflow;
-import net.sf.taverna.t2.workflowmodel.Processor;
+import org.apache.taverna.workflowmodel.Dataflow;
+import org.apache.taverna.workflowmodel.Processor;
import org.apache.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/ReportOnWorkflowAction.java
----------------------------------------------------------------------
diff --git a/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/ReportOnWorkflowAction.java b/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/ReportOnWorkflowAction.java
index a9ba839..f6a35fb 100644
--- a/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/ReportOnWorkflowAction.java
+++ b/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/ReportOnWorkflowAction.java
@@ -11,8 +11,8 @@ import java.util.Set;
import javax.swing.AbstractAction;
import javax.swing.JOptionPane;
-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 net.sf.taverna.t2.workbench.MainWindow;
import net.sf.taverna.t2.workbench.edits.EditManager;
import net.sf.taverna.t2.workbench.file.FileManager;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/ReportViewComponent.java
----------------------------------------------------------------------
diff --git a/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/ReportViewComponent.java b/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/ReportViewComponent.java
index 4067505..7dc08d2 100644
--- a/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/ReportViewComponent.java
+++ b/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/ReportViewComponent.java
@@ -55,13 +55,13 @@ import javax.swing.table.DefaultTableColumnModel;
import javax.swing.table.TableCellRenderer;
import javax.swing.table.TableColumn;
-import net.sf.taverna.t2.lang.observer.Observable;
-import net.sf.taverna.t2.lang.observer.Observer;
+import org.apache.taverna.lang.observer.Observable;
+import org.apache.taverna.lang.observer.Observer;
import net.sf.taverna.t2.lang.ui.DeselectingButton;
import net.sf.taverna.t2.lang.ui.ReadOnlyTextArea;
import net.sf.taverna.t2.ui.menu.MenuManager;
-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 net.sf.taverna.t2.workbench.edits.EditManager;
import net.sf.taverna.t2.workbench.file.FileManager;
import net.sf.taverna.t2.workbench.file.events.FileManagerEvent;
@@ -75,9 +75,9 @@ import net.sf.taverna.t2.workbench.selection.SelectionManager;
import net.sf.taverna.t2.workbench.selection.events.DataflowSelectionMessage;
import net.sf.taverna.t2.workbench.ui.Workbench;
import net.sf.taverna.t2.workbench.ui.zaria.UIComponentSPI;
-import net.sf.taverna.t2.workflowmodel.Dataflow;
-import net.sf.taverna.t2.workflowmodel.Processor;
-import net.sf.taverna.t2.workflowmodel.health.RemoteHealthChecker;
+import org.apache.taverna.workflowmodel.Dataflow;
+import org.apache.taverna.workflowmodel.Processor;
+import org.apache.taverna.workflowmodel.health.RemoteHealthChecker;
import org.apache.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/ReportViewConfigureAction.java
----------------------------------------------------------------------
diff --git a/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/ReportViewConfigureAction.java b/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/ReportViewConfigureAction.java
index a4575b0..bff78b9 100644
--- a/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/ReportViewConfigureAction.java
+++ b/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/ReportViewConfigureAction.java
@@ -10,7 +10,7 @@ import javax.swing.Action;
import net.sf.taverna.t2.ui.menu.MenuManager;
import net.sf.taverna.t2.workbench.ui.workflowview.WorkflowView;
-import net.sf.taverna.t2.workflowmodel.Processor;
+import org.apache.taverna.workflowmodel.Processor;
/**
* @author alanrw
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/ReportViewTableModel.java
----------------------------------------------------------------------
diff --git a/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/ReportViewTableModel.java b/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/ReportViewTableModel.java
index b3cc195..dfca57f 100644
--- a/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/ReportViewTableModel.java
+++ b/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/ReportViewTableModel.java
@@ -11,25 +11,25 @@ import java.util.Set;
import javax.swing.table.DefaultTableModel;
-import net.sf.taverna.t2.visit.VisitReport;
+import org.apache.taverna.visit.VisitReport;
import net.sf.taverna.t2.visit.VisitReport.Status;
import net.sf.taverna.t2.workbench.report.ReportManager;
-import net.sf.taverna.t2.workflowmodel.Condition;
-import net.sf.taverna.t2.workflowmodel.Dataflow;
-import net.sf.taverna.t2.workflowmodel.DataflowInputPort;
-import net.sf.taverna.t2.workflowmodel.DataflowOutputPort;
-import net.sf.taverna.t2.workflowmodel.Datalink;
-import net.sf.taverna.t2.workflowmodel.Merge;
-import net.sf.taverna.t2.workflowmodel.NamedWorkflowEntity;
-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.ProcessorOutputPort;
-import net.sf.taverna.t2.workflowmodel.ProcessorPort;
-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.processor.activity.ActivityPort;
+import org.apache.taverna.workflowmodel.Condition;
+import org.apache.taverna.workflowmodel.Dataflow;
+import org.apache.taverna.workflowmodel.DataflowInputPort;
+import org.apache.taverna.workflowmodel.DataflowOutputPort;
+import org.apache.taverna.workflowmodel.Datalink;
+import org.apache.taverna.workflowmodel.Merge;
+import org.apache.taverna.workflowmodel.NamedWorkflowEntity;
+import org.apache.taverna.workflowmodel.Port;
+import org.apache.taverna.workflowmodel.Processor;
+import org.apache.taverna.workflowmodel.ProcessorInputPort;
+import org.apache.taverna.workflowmodel.ProcessorOutputPort;
+import org.apache.taverna.workflowmodel.ProcessorPort;
+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.processor.activity.ActivityPort;
/**
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/StatusRenderer.java
----------------------------------------------------------------------
diff --git a/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/StatusRenderer.java b/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/StatusRenderer.java
index af42185..05e9901 100644
--- a/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/StatusRenderer.java
+++ b/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/StatusRenderer.java
@@ -10,7 +10,7 @@ import javax.swing.JTable;
import javax.swing.table.DefaultTableCellRenderer;
import net.sf.taverna.t2.lang.ui.icons.Icons;
-import net.sf.taverna.t2.visit.VisitReport.Status;
+import org.apache.taverna.visit.VisitReport.Status;
/**
* @author alanrw
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/ValidateObjectSwingWorker.java
----------------------------------------------------------------------
diff --git a/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/ValidateObjectSwingWorker.java b/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/ValidateObjectSwingWorker.java
index 66069c3..a3c6ff4 100644
--- a/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/ValidateObjectSwingWorker.java
+++ b/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/ValidateObjectSwingWorker.java
@@ -27,11 +27,11 @@ import javax.swing.SwingWorker;
import net.sf.taverna.t2.workbench.edits.EditManager;
import net.sf.taverna.t2.workbench.report.ReportManager;
-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.Processor;
+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.Processor;
import org.apache.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/ValidateSwingWorker.java
----------------------------------------------------------------------
diff --git a/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/ValidateSwingWorker.java b/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/ValidateSwingWorker.java
index 7765413..4dcf364 100644
--- a/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/ValidateSwingWorker.java
+++ b/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/ValidateSwingWorker.java
@@ -28,17 +28,17 @@ import java.util.Set;
import javax.swing.SwingWorker;
-import net.sf.taverna.t2.visit.VisitReport;
+import org.apache.taverna.visit.VisitReport;
import net.sf.taverna.t2.workbench.edits.EditManager;
import net.sf.taverna.t2.workbench.report.ReportManager;
-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.Processor;
-import net.sf.taverna.t2.workflowmodel.processor.activity.Activity;
-import net.sf.taverna.t2.workflowmodel.processor.activity.DisabledActivity;
-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.Processor;
+import org.apache.taverna.workflowmodel.processor.activity.Activity;
+import org.apache.taverna.workflowmodel.processor.activity.DisabledActivity;
+import org.apache.taverna.workflowmodel.utils.Tools;
import org.apache.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/VisitReportProxy.java
----------------------------------------------------------------------
diff --git a/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/VisitReportProxy.java b/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/VisitReportProxy.java
index eb932f5..4c8c869 100644
--- a/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/VisitReportProxy.java
+++ b/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/VisitReportProxy.java
@@ -1,8 +1,8 @@
package net.sf.taverna.t2.workbench.report.view;
-import net.sf.taverna.t2.visit.VisitKind;
-import net.sf.taverna.t2.visit.VisitReport;
-import net.sf.taverna.t2.visit.VisitReport.Status;
+import org.apache.taverna.visit.VisitKind;
+import org.apache.taverna.visit.VisitReport;
+import org.apache.taverna.visit.VisitReport.Status;
public class VisitReportProxy {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/VisitReportProxySet.java
----------------------------------------------------------------------
diff --git a/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/VisitReportProxySet.java b/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/VisitReportProxySet.java
index 957b0ba..7a38bf9 100644
--- a/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/VisitReportProxySet.java
+++ b/taverna-report-view/src/main/java/net/sf/taverna/t2/workbench/report/view/VisitReportProxySet.java
@@ -6,9 +6,7 @@ package net.sf.taverna.t2.workbench.report.view;
import java.util.HashSet;
import java.util.Set;
-import net.sf.taverna.t2.visit.VisitKind;
-import net.sf.taverna.t2.visit.VisitReport;
-import net.sf.taverna.t2.visit.VisitReport.Status;
+import org.apache.taverna.visit.VisitReport;
public class VisitReportProxySet {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-results-view/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-results-view/pom.xml b/taverna-results-view/pom.xml
index 83b5fd3..be9d7cc 100644
--- a/taverna-results-view/pom.xml
+++ b/taverna-results-view/pom.xml
@@ -41,45 +41,30 @@
</plugins>
</build>
<dependencies>
-<!--
- <dependency>
- <groupId>net.sf.taverna.t2</groupId>
- <artifactId>results</artifactId>
- <version>${t2.lang.version}</version>
- </dependency>
<dependency>
- <groupId>net.sf.taverna.t2</groupId>
- <artifactId>baclava</artifactId>
- <version>${t2.baclava.version}</version>
- </dependency>
--->
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>menu-api</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>workbench-api</artifactId>
- <version>${project.parent.version}</version>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-run-api</artifactId>
+ <version>${taverna.engine.version}</version>
</dependency>
+
<dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>renderers-api</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>provenanceconnector</artifactId>
+ <version>${taverna.engine.version}</version>
+ </dependency>
+
<dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>graph-view</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>taverna-databundle</artifactId>
+ <version>${taverna.language.version}</version>
</dependency>
-<!--
+
<dependency>
- <groupId>net.sf.taverna.t2.lang</groupId>
- <artifactId>ui</artifactId>
- <version>${t2.lang.version}</version>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>taverna-robundle</artifactId>
+ <version>${taverna.language.version}</version>
</dependency>
--->
+
<dependency>
<groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-app-configuration-api</artifactId>
@@ -95,27 +80,44 @@
<artifactId>taverna-report-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.taverna.engine</groupId>
- <artifactId>taverna-run-api</artifactId>
- <version>${taverna.engine.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.taverna.language</groupId>
- <artifactId>taverna-databundle</artifactId>
- <version>${taverna.language.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.taverna.engine</groupId>
- <artifactId>provenanceconnector</artifactId>
- <version>${taverna.engine.version}</version>
- </dependency>
-
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-renderers-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-workbench-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-selection-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-helper-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-ui</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+
<dependency>
<groupId>uk.org.mygrid.resources.mimeutil</groupId>
<artifactId>mime-util</artifactId>
<version>${mimeutil.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>taverna-baclava-language</artifactId>
+ <version>${taverna.language.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
@@ -128,5 +130,6 @@
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency>
+
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-results-view/src/main/java/net/sf/taverna/t2/workbench/views/results/ResultsComponent.java
----------------------------------------------------------------------
diff --git a/taverna-results-view/src/main/java/net/sf/taverna/t2/workbench/views/results/ResultsComponent.java b/taverna-results-view/src/main/java/net/sf/taverna/t2/workbench/views/results/ResultsComponent.java
index 0d384bb..8781bad 100644
--- a/taverna-results-view/src/main/java/net/sf/taverna/t2/workbench/views/results/ResultsComponent.java
+++ b/taverna-results-view/src/main/java/net/sf/taverna/t2/workbench/views/results/ResultsComponent.java
@@ -29,9 +29,9 @@ import java.util.Set;
import javax.swing.JPanel;
-import net.sf.taverna.t2.lang.observer.Observable;
-import net.sf.taverna.t2.lang.observer.Observer;
-import net.sf.taverna.t2.lang.observer.SwingAwareObserver;
+import org.apache.taverna.lang.observer.Observable;
+import org.apache.taverna.lang.observer.Observer;
+import org.apache.taverna.lang.observer.SwingAwareObserver;
import net.sf.taverna.t2.renderers.RendererRegistry;
import net.sf.taverna.t2.workbench.selection.DataflowSelectionModel;
import net.sf.taverna.t2.workbench.selection.SelectionManager;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-results-view/src/main/java/net/sf/taverna/t2/workbench/views/results/processor/ProcessorResultsComponent.java
----------------------------------------------------------------------
diff --git a/taverna-results-view/src/main/java/net/sf/taverna/t2/workbench/views/results/processor/ProcessorResultsComponent.java b/taverna-results-view/src/main/java/net/sf/taverna/t2/workbench/views/results/processor/ProcessorResultsComponent.java
index 9a26481..d8e3c86 100644
--- a/taverna-results-view/src/main/java/net/sf/taverna/t2/workbench/views/results/processor/ProcessorResultsComponent.java
+++ b/taverna-results-view/src/main/java/net/sf/taverna/t2/workbench/views/results/processor/ProcessorResultsComponent.java
@@ -103,9 +103,9 @@ import net.sf.taverna.t2.provenance.ProvenanceConnectorFactory;
import net.sf.taverna.t2.provenance.api.ProvenanceAccess;
import net.sf.taverna.t2.provenance.lineageservice.utils.Port;
import net.sf.taverna.t2.provenance.lineageservice.utils.ProcessorEnactment;
-import net.sf.taverna.t2.reference.ReferenceService;
-import net.sf.taverna.t2.reference.T2Reference;
-import net.sf.taverna.t2.renderers.RendererRegistry;
+import org.apache.taverna.reference.ReferenceService;
+import org.apache.taverna.reference.T2Reference;
+import org.apache.taverna.renderers.RendererRegistry;
import net.sf.taverna.t2.workbench.helper.HelpEnabledDialog;
import net.sf.taverna.t2.workbench.ui.SwingWorkerCompletionWaiter;
import net.sf.taverna.t2.workbench.views.results.processor.FilteredIterationTreeModel.FilterType;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-results-view/src/main/java/net/sf/taverna/t2/workbench/views/results/saveactions/SaveAllResultsAsExcel.java
----------------------------------------------------------------------
diff --git a/taverna-results-view/src/main/java/net/sf/taverna/t2/workbench/views/results/saveactions/SaveAllResultsAsExcel.java b/taverna-results-view/src/main/java/net/sf/taverna/t2/workbench/views/results/saveactions/SaveAllResultsAsExcel.java
index 0a06383..764ddbd 100644
--- a/taverna-results-view/src/main/java/net/sf/taverna/t2/workbench/views/results/saveactions/SaveAllResultsAsExcel.java
+++ b/taverna-results-view/src/main/java/net/sf/taverna/t2/workbench/views/results/saveactions/SaveAllResultsAsExcel.java
@@ -22,7 +22,6 @@ package net.sf.taverna.t2.workbench.views.results.saveactions;
import static java.lang.Math.max;
import static java.util.Arrays.asList;
-import static net.sf.taverna.t2.baclava.factory.DataThingFactory.bake;
import static net.sf.taverna.t2.workbench.icons.WorkbenchIcons.saveIcon;
import static org.apache.poi.ss.usermodel.CellStyle.BORDER_NONE;
import static org.apache.poi.ss.usermodel.CellStyle.BORDER_THIN;
@@ -37,8 +36,6 @@ import java.util.Collection;
import javax.swing.AbstractAction;
-import net.sf.taverna.t2.baclava.DataThing;
-import net.sf.taverna.t2.baclava.iterator.BaclavaIterator;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFCellStyle;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-results-view/src/main/java/net/sf/taverna/t2/workbench/views/results/saveactions/SaveAllResultsToFileSystem.java
----------------------------------------------------------------------
diff --git a/taverna-results-view/src/main/java/net/sf/taverna/t2/workbench/views/results/saveactions/SaveAllResultsToFileSystem.java b/taverna-results-view/src/main/java/net/sf/taverna/t2/workbench/views/results/saveactions/SaveAllResultsToFileSystem.java
index 764f32b..6ecfce5 100644
--- a/taverna-results-view/src/main/java/net/sf/taverna/t2/workbench/views/results/saveactions/SaveAllResultsToFileSystem.java
+++ b/taverna-results-view/src/main/java/net/sf/taverna/t2/workbench/views/results/saveactions/SaveAllResultsToFileSystem.java
@@ -25,7 +25,6 @@ import static java.nio.file.Files.exists;
import static java.nio.file.Files.isDirectory;
import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
import static javax.swing.JFileChooser.DIRECTORIES_ONLY;
-import static org.purl.wf4ever.robundle.Bundles.copyRecursively;
import java.io.File;
import java.io.IOException;
@@ -34,6 +33,7 @@ import java.nio.file.Path;
import javax.swing.AbstractAction;
import net.sf.taverna.t2.workbench.icons.WorkbenchIcons;
+import org.apache.taverna.robundle.Bundles;
/**
* Stores results to the file system.
@@ -76,7 +76,7 @@ public class SaveAllResultsToFileSystem extends SaveAllResultsSPI {
throws IOException {
destination.mkdirs();
if (isDirectory(source))
- copyRecursively(source, destination.toPath(), REPLACE_EXISTING);
+ Bundles.copyRecursively(source, destination.toPath(), REPLACE_EXISTING);
else if (exists(source))
copy(source, destination.toPath(), REPLACE_EXISTING);
return destination;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-results-view/src/main/java/net/sf/taverna/t2/workbench/views/results/workflow/RenderedResultComponent.java
----------------------------------------------------------------------
diff --git a/taverna-results-view/src/main/java/net/sf/taverna/t2/workbench/views/results/workflow/RenderedResultComponent.java b/taverna-results-view/src/main/java/net/sf/taverna/t2/workbench/views/results/workflow/RenderedResultComponent.java
index d5bce8c..f35f0ca 100644
--- a/taverna-results-view/src/main/java/net/sf/taverna/t2/workbench/views/results/workflow/RenderedResultComponent.java
+++ b/taverna-results-view/src/main/java/net/sf/taverna/t2/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 net.sf.taverna.t2.renderers.RendererUtils.getInputStream;
-import static net.sf.taverna.t2.results.ResultsUtils.getMimeTypes;
+import static net.sf.taverna.t2.results.ResultsUtils;
import static net.sf.taverna.t2.workbench.icons.WorkbenchIcons.refreshIcon;
import static org.apache.commons.lang.StringEscapeUtils.escapeHtml;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-retry-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-retry-ui/pom.xml b/taverna-retry-ui/pom.xml
index 88fff45..2fce401 100644
--- a/taverna-retry-ui/pom.xml
+++ b/taverna-retry-ui/pom.xml
@@ -23,31 +23,49 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>retry-ui</artifactId>
+ <artifactId>taverna-retry-ui</artifactId>
<packaging>bundle</packaging>
<name>Retry layer contextual view</name>
<dependencies>
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>contextual-views-api</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>menu-api</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>edits-api</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>selection-api</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
-
+ <dependency>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>taverna-scufl2-api</artifactId>
+ <version>${taverna.language.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-edits-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-selection-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-menu-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-ui</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-contextual-views-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-helper-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-retry-ui/src/main/java/net/sf/taverna/t2/workbench/retry/RetryConfigurationPanel.java
----------------------------------------------------------------------
diff --git a/taverna-retry-ui/src/main/java/net/sf/taverna/t2/workbench/retry/RetryConfigurationPanel.java b/taverna-retry-ui/src/main/java/net/sf/taverna/t2/workbench/retry/RetryConfigurationPanel.java
index 280414a..dbcd3d1 100644
--- a/taverna-retry-ui/src/main/java/net/sf/taverna/t2/workbench/retry/RetryConfigurationPanel.java
+++ b/taverna-retry-ui/src/main/java/net/sf/taverna/t2/workbench/retry/RetryConfigurationPanel.java
@@ -8,7 +8,7 @@ import javax.swing.JPanel;
import javax.swing.JTextField;
import javax.swing.border.EmptyBorder;
-import uk.org.taverna.scufl2.api.configurations.Configuration;
+import org.apache.taverna.scufl2.api.configurations.Configuration;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-retry-ui/src/main/java/net/sf/taverna/t2/workbench/retry/RetryConfigureAction.java
----------------------------------------------------------------------
diff --git a/taverna-retry-ui/src/main/java/net/sf/taverna/t2/workbench/retry/RetryConfigureAction.java b/taverna-retry-ui/src/main/java/net/sf/taverna/t2/workbench/retry/RetryConfigureAction.java
index f5f7c7f..76138b9 100644
--- a/taverna-retry-ui/src/main/java/net/sf/taverna/t2/workbench/retry/RetryConfigureAction.java
+++ b/taverna-retry-ui/src/main/java/net/sf/taverna/t2/workbench/retry/RetryConfigureAction.java
@@ -29,10 +29,10 @@ import org.apache.log4j.Logger;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import uk.org.taverna.scufl2.api.common.Scufl2Tools;
-import uk.org.taverna.scufl2.api.configurations.Configuration;
-import uk.org.taverna.scufl2.api.core.Processor;
-import uk.org.taverna.scufl2.api.profiles.Profile;
+import org.apache.taverna.scufl2.api.common.Scufl2Tools;
+import org.apache.taverna.scufl2.api.configurations.Configuration;
+import org.apache.taverna.scufl2.api.core.Processor;
+import org.apache.taverna.scufl2.api.profiles.Profile;
/**
* @author alanrw
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-retry-ui/src/main/java/net/sf/taverna/t2/workbench/retry/RetryConfigureMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-retry-ui/src/main/java/net/sf/taverna/t2/workbench/retry/RetryConfigureMenuAction.java b/taverna-retry-ui/src/main/java/net/sf/taverna/t2/workbench/retry/RetryConfigureMenuAction.java
index c88fd1e..a920aa1 100644
--- a/taverna-retry-ui/src/main/java/net/sf/taverna/t2/workbench/retry/RetryConfigureMenuAction.java
+++ b/taverna-retry-ui/src/main/java/net/sf/taverna/t2/workbench/retry/RetryConfigureMenuAction.java
@@ -29,7 +29,7 @@ import javax.swing.Action;
import net.sf.taverna.t2.ui.menu.AbstractContextualMenuAction;
import net.sf.taverna.t2.workbench.edits.EditManager;
import net.sf.taverna.t2.workbench.selection.SelectionManager;
-import uk.org.taverna.scufl2.api.core.Processor;
+import org.apache.taverna.scufl2.api.core.Processor;
public class RetryConfigureMenuAction extends AbstractContextualMenuAction {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-retry-ui/src/main/java/net/sf/taverna/t2/workbench/retry/RetryContextualView.java
----------------------------------------------------------------------
diff --git a/taverna-retry-ui/src/main/java/net/sf/taverna/t2/workbench/retry/RetryContextualView.java b/taverna-retry-ui/src/main/java/net/sf/taverna/t2/workbench/retry/RetryContextualView.java
index 9fef2e7..519f4f4 100644
--- a/taverna-retry-ui/src/main/java/net/sf/taverna/t2/workbench/retry/RetryContextualView.java
+++ b/taverna-retry-ui/src/main/java/net/sf/taverna/t2/workbench/retry/RetryContextualView.java
@@ -34,9 +34,9 @@ import net.sf.taverna.t2.lang.ui.ReadOnlyTextArea;
import net.sf.taverna.t2.workbench.edits.EditManager;
import net.sf.taverna.t2.workbench.selection.SelectionManager;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.ContextualView;
-import uk.org.taverna.scufl2.api.common.Scufl2Tools;
-import uk.org.taverna.scufl2.api.configurations.Configuration;
-import uk.org.taverna.scufl2.api.core.Processor;
+import org.apache.taverna.scufl2.api.common.Scufl2Tools;
+import org.apache.taverna.scufl2.api.configurations.Configuration;
+import org.apache.taverna.scufl2.api.core.Processor;
/**
* View of a processor, including it's iteration stack, activities, etc.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-retry-ui/src/main/java/net/sf/taverna/t2/workbench/retry/RetryContextualViewFactory.java
----------------------------------------------------------------------
diff --git a/taverna-retry-ui/src/main/java/net/sf/taverna/t2/workbench/retry/RetryContextualViewFactory.java b/taverna-retry-ui/src/main/java/net/sf/taverna/t2/workbench/retry/RetryContextualViewFactory.java
index ab34f78..3e464ba 100644
--- a/taverna-retry-ui/src/main/java/net/sf/taverna/t2/workbench/retry/RetryContextualViewFactory.java
+++ b/taverna-retry-ui/src/main/java/net/sf/taverna/t2/workbench/retry/RetryContextualViewFactory.java
@@ -28,7 +28,7 @@ import net.sf.taverna.t2.workbench.edits.EditManager;
import net.sf.taverna.t2.workbench.selection.SelectionManager;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.ContextualView;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ContextualViewFactory;
-import uk.org.taverna.scufl2.api.core.Processor;
+import org.apache.taverna.scufl2.api.core.Processor;
public class RetryContextualViewFactory implements ContextualViewFactory<Processor> {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-run-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-run-ui/pom.xml b/taverna-run-ui/pom.xml
index 8e7527c..7d6df1c 100644
--- a/taverna-run-ui/pom.xml
+++ b/taverna-run-ui/pom.xml
@@ -27,11 +27,44 @@
<packaging>bundle</packaging>
<name>Results UI</name>
<dependencies>
+ <dependency>
+ <groupId>org.apache.taverna.osgi</groupId>
+ <artifactId>taverna-app-configuration-api</artifactId>
+ <version>${taverna.osgi.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-run-api</artifactId>
+ <version>${taverna.engine.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>taverna-robundle</artifactId>
+ <version>${taverna.language.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-file-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>menu-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-menu-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-edits-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>report-api</artifactId>
@@ -52,24 +85,15 @@
<artifactId>reference-ui</artifactId>
<version>${project.parent.version}</version>
</dependency>
-<!--
- <dependency>
- <groupId>net.sf.taverna.t2.lang</groupId>
- <artifactId>ui</artifactId>
- <version>${t2.lang.version}</version>
- </dependency>
--->
- <dependency>
- <groupId>org.apache.taverna.engine</groupId>
- <artifactId>taverna-run-api</artifactId>
- <version>${taverna.engine.version}</version>
- </dependency>
-<!--
- <dependency>
- <groupId>org.apache.taverna.engine</groupId>
- <artifactId>taverna-execution-api</artifactId>
- <version>${platform.version}</version>
- </dependency>
--->
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-report-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-helper-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-run-ui/src/main/java/net/sf/taverna/t2/workbench/run/actions/OpenWorkflowRunAction.java
----------------------------------------------------------------------
diff --git a/taverna-run-ui/src/main/java/net/sf/taverna/t2/workbench/run/actions/OpenWorkflowRunAction.java b/taverna-run-ui/src/main/java/net/sf/taverna/t2/workbench/run/actions/OpenWorkflowRunAction.java
index 9c50e31..6261eed 100644
--- a/taverna-run-ui/src/main/java/net/sf/taverna/t2/workbench/run/actions/OpenWorkflowRunAction.java
+++ b/taverna-run-ui/src/main/java/net/sf/taverna/t2/workbench/run/actions/OpenWorkflowRunAction.java
@@ -39,7 +39,7 @@ import net.sf.taverna.t2.workbench.icons.WorkbenchIcons;
import org.apache.log4j.Logger;
-import uk.org.taverna.platform.run.api.RunService;
+import org.apache.taverna.platform.run.api.RunService;
/**
* An action for opening a workflow run from a file.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-run-ui/src/main/java/net/sf/taverna/t2/workbench/run/actions/RunWorkflowAction.java
----------------------------------------------------------------------
diff --git a/taverna-run-ui/src/main/java/net/sf/taverna/t2/workbench/run/actions/RunWorkflowAction.java b/taverna-run-ui/src/main/java/net/sf/taverna/t2/workbench/run/actions/RunWorkflowAction.java
index b87d35a..c9ed893 100644
--- a/taverna-run-ui/src/main/java/net/sf/taverna/t2/workbench/run/actions/RunWorkflowAction.java
+++ b/taverna-run-ui/src/main/java/net/sf/taverna/t2/workbench/run/actions/RunWorkflowAction.java
@@ -26,7 +26,7 @@ import static java.awt.Toolkit.getDefaultToolkit;
import static java.awt.event.KeyEvent.VK_R;
import static javax.swing.KeyStroke.getKeyStroke;
import static javax.swing.SwingUtilities.invokeLater;
-import static net.sf.taverna.t2.reference.ui.InvalidDataflowReport.showErrorDialog;
+import static net.sf.taverna.t2.reference.ui.InvalidDataflowReport;
import static net.sf.taverna.t2.workbench.icons.WorkbenchIcons.runIcon;
import java.awt.event.ActionEvent;
@@ -37,8 +37,8 @@ import java.util.concurrent.ExecutionException;
import javax.swing.AbstractAction;
-import net.sf.taverna.t2.lang.observer.Observable;
-import net.sf.taverna.t2.lang.observer.Observer;
+import org.apache.taverna.lang.observer.Observable;
+import org.apache.taverna.lang.observer.Observer;
import net.sf.taverna.t2.reference.ui.CopyWorkflowInProgressDialog;
import net.sf.taverna.t2.reference.ui.CopyWorkflowSwingWorker;
import net.sf.taverna.t2.reference.ui.WorkflowLaunchWindow;
@@ -53,19 +53,19 @@ import net.sf.taverna.t2.workbench.ui.SwingWorkerCompletionWaiter;
import net.sf.taverna.t2.workbench.ui.Workbench;
import org.apache.log4j.Logger;
-import org.purl.wf4ever.robundle.Bundle;
-import uk.org.taverna.databundle.DataBundles;
-import uk.org.taverna.platform.execution.api.ExecutionEnvironment;
-import uk.org.taverna.platform.execution.api.InvalidExecutionIdException;
-import uk.org.taverna.platform.execution.api.InvalidWorkflowException;
-import uk.org.taverna.platform.run.api.InvalidRunIdException;
-import uk.org.taverna.platform.run.api.RunProfile;
-import uk.org.taverna.platform.run.api.RunProfileException;
-import uk.org.taverna.platform.run.api.RunService;
-import uk.org.taverna.platform.run.api.RunStateException;
-import uk.org.taverna.scufl2.api.container.WorkflowBundle;
-import uk.org.taverna.scufl2.api.profiles.Profile;
+import org.apache.taverna.databundle.DataBundles;
+import org.apache.taverna.platform.execution.api.ExecutionEnvironment;
+import org.apache.taverna.platform.execution.api.InvalidExecutionIdException;
+import org.apache.taverna.platform.execution.api.InvalidWorkflowException;
+import org.apache.taverna.platform.run.api.InvalidRunIdException;
+import org.apache.taverna.platform.run.api.RunProfile;
+import org.apache.taverna.platform.run.api.RunProfileException;
+import org.apache.taverna.platform.run.api.RunService;
+import org.apache.taverna.platform.run.api.RunStateException;
+import org.apache.taverna.robundle.Bundle;
+import org.apache.taverna.scufl2.api.container.WorkflowBundle;
+import org.apache.taverna.scufl2.api.profiles.Profile;
/**
* Run the current workflow (with workflow input dialogue if needed) and add it
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-run-ui/src/main/java/net/sf/taverna/t2/workbench/run/cleanup/WorkflowRunStatusShutdownHook.java
----------------------------------------------------------------------
diff --git a/taverna-run-ui/src/main/java/net/sf/taverna/t2/workbench/run/cleanup/WorkflowRunStatusShutdownHook.java b/taverna-run-ui/src/main/java/net/sf/taverna/t2/workbench/run/cleanup/WorkflowRunStatusShutdownHook.java
index 717b2c1..767c901 100644
--- a/taverna-run-ui/src/main/java/net/sf/taverna/t2/workbench/run/cleanup/WorkflowRunStatusShutdownHook.java
+++ b/taverna-run-ui/src/main/java/net/sf/taverna/t2/workbench/run/cleanup/WorkflowRunStatusShutdownHook.java
@@ -27,10 +27,10 @@ import java.util.List;
import net.sf.taverna.t2.workbench.ShutdownSPI;
import uk.org.taverna.configuration.app.ApplicationConfiguration;
-import uk.org.taverna.platform.execution.api.InvalidExecutionIdException;
-import uk.org.taverna.platform.run.api.InvalidRunIdException;
-import uk.org.taverna.platform.run.api.RunService;
-import uk.org.taverna.platform.run.api.RunStateException;
+import org.apache.taverna.platform.execution.api.InvalidExecutionIdException;
+import org.apache.taverna.platform.run.api.InvalidRunIdException;
+import org.apache.taverna.platform.run.api.RunService;
+import org.apache.taverna.platform.run.api.RunStateException;
/**
* Shutdown hook that detects running and paused workflows.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-run-ui/src/main/java/net/sf/taverna/t2/workbench/run/menu/FileOpenRunMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-run-ui/src/main/java/net/sf/taverna/t2/workbench/run/menu/FileOpenRunMenuAction.java b/taverna-run-ui/src/main/java/net/sf/taverna/t2/workbench/run/menu/FileOpenRunMenuAction.java
index 6914ac7..c9cba97 100644
--- a/taverna-run-ui/src/main/java/net/sf/taverna/t2/workbench/run/menu/FileOpenRunMenuAction.java
+++ b/taverna-run-ui/src/main/java/net/sf/taverna/t2/workbench/run/menu/FileOpenRunMenuAction.java
@@ -28,7 +28,7 @@ import java.net.URI;
import javax.swing.Action;
import uk.org.taverna.configuration.app.ApplicationConfiguration;
-import uk.org.taverna.platform.run.api.RunService;
+import org.apache.taverna.platform.run.api.RunService;
import net.sf.taverna.t2.ui.menu.AbstractMenuAction;
import net.sf.taverna.t2.workbench.run.actions.OpenWorkflowRunAction;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-run-ui/src/main/java/net/sf/taverna/t2/workbench/run/menu/FileRunMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-run-ui/src/main/java/net/sf/taverna/t2/workbench/run/menu/FileRunMenuAction.java b/taverna-run-ui/src/main/java/net/sf/taverna/t2/workbench/run/menu/FileRunMenuAction.java
index d1a73c1..0991a75 100644
--- a/taverna-run-ui/src/main/java/net/sf/taverna/t2/workbench/run/menu/FileRunMenuAction.java
+++ b/taverna-run-ui/src/main/java/net/sf/taverna/t2/workbench/run/menu/FileRunMenuAction.java
@@ -33,7 +33,7 @@ import net.sf.taverna.t2.workbench.report.ReportManager;
import net.sf.taverna.t2.workbench.run.actions.RunWorkflowAction;
import net.sf.taverna.t2.workbench.selection.SelectionManager;
import net.sf.taverna.t2.workbench.ui.Workbench;
-import uk.org.taverna.platform.run.api.RunService;
+import org.apache.taverna.platform.run.api.RunService;
public class FileRunMenuAction extends AbstractMenuAction {
private static final URI FILE_RUN_URI = URI
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-run-ui/src/main/java/net/sf/taverna/t2/workbench/run/toolbar/RunToolbarAction.java
----------------------------------------------------------------------
diff --git a/taverna-run-ui/src/main/java/net/sf/taverna/t2/workbench/run/toolbar/RunToolbarAction.java b/taverna-run-ui/src/main/java/net/sf/taverna/t2/workbench/run/toolbar/RunToolbarAction.java
index 5e84653..94c9a22 100644
--- a/taverna-run-ui/src/main/java/net/sf/taverna/t2/workbench/run/toolbar/RunToolbarAction.java
+++ b/taverna-run-ui/src/main/java/net/sf/taverna/t2/workbench/run/toolbar/RunToolbarAction.java
@@ -33,7 +33,7 @@ import net.sf.taverna.t2.workbench.report.ReportManager;
import net.sf.taverna.t2.workbench.run.actions.RunWorkflowAction;
import net.sf.taverna.t2.workbench.selection.SelectionManager;
import net.sf.taverna.t2.workbench.ui.Workbench;
-import uk.org.taverna.platform.run.api.RunService;
+import org.apache.taverna.platform.run.api.RunService;
public class RunToolbarAction extends AbstractMenuAction {
private static final URI RUN_URI = URI
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-selection-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-selection-impl/pom.xml b/taverna-selection-impl/pom.xml
index ec26b37..f8ed853 100644
--- a/taverna-selection-impl/pom.xml
+++ b/taverna-selection-impl/pom.xml
@@ -28,21 +28,6 @@
<name>Selection Implementation</name>
<dependencies>
<dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>edits-api</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>file-api</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>selection-api</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<version>${osgi.core.version}</version>
@@ -51,18 +36,21 @@
<groupId>org.apache.taverna.engine</groupId>
<artifactId>taverna-observer</artifactId>
<version>${taverna.engine.version}</version>
- </dependency>
-
+ </dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-selection-api</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.taverna.language</groupId>
- <artifactId>taverna-scufl2-api</artifactId>
- <version>${taverna.language.version}</version>
- </dependency>
-
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-edits-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-file-api</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/ed0a8e1f/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/menu/AddStringConstantTemplateAction.java
----------------------------------------------------------------------
diff --git a/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/menu/AddStringConstantTemplateAction.java b/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/menu/AddStringConstantTemplateAction.java
index f59c274..d6d7ee9 100644
--- a/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/menu/AddStringConstantTemplateAction.java
+++ b/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/menu/AddStringConstantTemplateAction.java
@@ -34,7 +34,7 @@ import net.sf.taverna.t2.ui.menu.MenuManager;
import net.sf.taverna.t2.workbench.activityicons.ActivityIconManager;
import net.sf.taverna.t2.workbench.edits.EditManager;
import net.sf.taverna.t2.workbench.selection.SelectionManager;
-import uk.org.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.commons.services.ServiceRegistry;
import org.apache.taverna.scufl2.api.core.Workflow;
/**
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/menu/AddStringConstantTemplateMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/menu/AddStringConstantTemplateMenuAction.java b/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/menu/AddStringConstantTemplateMenuAction.java
index cb1682d..286039f 100644
--- a/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/menu/AddStringConstantTemplateMenuAction.java
+++ b/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/menu/AddStringConstantTemplateMenuAction.java
@@ -39,7 +39,7 @@ import net.sf.taverna.t2.ui.menu.MenuManager;
import net.sf.taverna.t2.workbench.activityicons.ActivityIconManager;
import net.sf.taverna.t2.workbench.edits.EditManager;
import net.sf.taverna.t2.workbench.selection.SelectionManager;
-import uk.org.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.commons.services.ServiceRegistry;
/**
* An action to add a string constant activity + a wrapping processor to the
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/menu/ConfigureStringConstantMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/menu/ConfigureStringConstantMenuAction.java b/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/menu/ConfigureStringConstantMenuAction.java
index 46bdde9..4ffe452 100644
--- a/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/menu/ConfigureStringConstantMenuAction.java
+++ b/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/menu/ConfigureStringConstantMenuAction.java
@@ -13,7 +13,7 @@ import net.sf.taverna.t2.workbench.activityicons.ActivityIconManager;
import net.sf.taverna.t2.workbench.activitytools.AbstractConfigureActivityMenuAction;
import net.sf.taverna.t2.workbench.edits.EditManager;
import net.sf.taverna.t2.workbench.file.FileManager;
-import uk.org.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.commons.services.ServiceRegistry;
public class ConfigureStringConstantMenuAction extends
AbstractConfigureActivityMenuAction {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/views/StringConstantActivityContextualView.java
----------------------------------------------------------------------
diff --git a/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/views/StringConstantActivityContextualView.java b/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/views/StringConstantActivityContextualView.java
index 483c2f1..de6b203 100644
--- a/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/views/StringConstantActivityContextualView.java
+++ b/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/views/StringConstantActivityContextualView.java
@@ -34,7 +34,7 @@ import net.sf.taverna.t2.workbench.configuration.colour.ColourManager;
import net.sf.taverna.t2.workbench.edits.EditManager;
import net.sf.taverna.t2.workbench.file.FileManager;
import net.sf.taverna.t2.workbench.ui.actions.activity.HTMLBasedActivityContextualView;
-import uk.org.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.commons.services.ServiceRegistry;
import org.apache.taverna.scufl2.api.activity.Activity;
import com.fasterxml.jackson.databind.JsonNode;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/views/StringConstantActivityViewFactory.java
----------------------------------------------------------------------
diff --git a/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/views/StringConstantActivityViewFactory.java b/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/views/StringConstantActivityViewFactory.java
index 81fff13..c094c65 100644
--- a/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/views/StringConstantActivityViewFactory.java
+++ b/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/views/StringConstantActivityViewFactory.java
@@ -32,7 +32,7 @@ import net.sf.taverna.t2.workbench.edits.EditManager;
import net.sf.taverna.t2.workbench.file.FileManager;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.ContextualView;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ContextualViewFactory;
-import uk.org.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.commons.services.ServiceRegistry;
import org.apache.taverna.scufl2.api.activity.Activity;
public class StringConstantActivityViewFactory implements
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/views/StringConstantConfigView.java
----------------------------------------------------------------------
diff --git a/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/views/StringConstantConfigView.java b/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/views/StringConstantConfigView.java
index 2bd0b18..49c4c75 100644
--- a/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/views/StringConstantConfigView.java
+++ b/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/views/StringConstantConfigView.java
@@ -44,7 +44,7 @@ import net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ActivityCon
import org.apache.log4j.Logger;
-import uk.org.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.commons.services.ServiceRegistry;
import org.apache.taverna.scufl2.api.activity.Activity;
import org.apache.taverna.scufl2.api.configurations.Configuration;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-unrecognized-activity-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-unrecognized-activity-ui/pom.xml b/taverna-unrecognized-activity-ui/pom.xml
index 1b842b0..31a70ec 100644
--- a/taverna-unrecognized-activity-ui/pom.xml
+++ b/taverna-unrecognized-activity-ui/pom.xml
@@ -29,11 +29,6 @@
<dependencies>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>taverna-configuration-api</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>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-update-manager/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-update-manager/pom.xml b/taverna-update-manager/pom.xml
index 71b8b9d..c68ab41 100644
--- a/taverna-update-manager/pom.xml
+++ b/taverna-update-manager/pom.xml
@@ -28,30 +28,17 @@
<packaging>bundle</packaging>
<name>Taverna Workbench Update Manager</name>
<dependencies>
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>menu-api</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
-
<dependency>
<groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-update-api</artifactId>
<version>0.2.0-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>net.sf.taverna.t2.ui-api</groupId>
- <artifactId>menu-api</artifactId>
- <version>2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-menu-api</artifactId>
+ <version>${project.parent.version}</version>
</dependency>
-<!--
- <dependency>
- <groupId>uk.org.taverna.commons</groupId>
- <artifactId>taverna-update-api</artifactId>
- <version>${taverna.commons.version}</version>
- </dependency>
--->
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-workbench-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-impl/pom.xml b/taverna-workbench-impl/pom.xml
index 6bad979..717681f 100644
--- a/taverna-workbench-impl/pom.xml
+++ b/taverna-workbench-impl/pom.xml
@@ -43,40 +43,16 @@
</build>
<dependencies>
<dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>workbench-api</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>edits-api</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>configuration-api</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>file-api</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>helper-api</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>menu-api</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>selection-api</artifactId>
- <version>${project.parent.version}</version>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>taverna-scufl2-api</artifactId>
+ <version>${taverna.language.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-selection-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.taverna.engine</groupId>
<artifactId>taverna-observer</artifactId>
@@ -103,12 +79,37 @@
<artifactId>taverna-app-configuration-api</artifactId>
<version>${taverna.osgi.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.taverna.language</groupId>
- <artifactId>taverna-scufl2-api</artifactId>
- <version>${taverna.language.version}</version>
- </dependency>
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-file-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-menu-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-configuration-ui-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-helper-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-ui</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
@@ -131,5 +132,6 @@
<artifactId>macify</artifactId>
<version>1.6</version>
</dependency>
+
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-workflow-explorer/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workflow-explorer/pom.xml b/taverna-workflow-explorer/pom.xml
index 1b41256..f6b913f 100644
--- a/taverna-workflow-explorer/pom.xml
+++ b/taverna-workflow-explorer/pom.xml
@@ -29,39 +29,14 @@
<description>Workflow Explorer</description>
<dependencies>
<dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>workbench-api</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>file-api</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>report-api</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>menu-impl</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>activity-icons-api</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>design-ui</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-services-api</artifactId>
+ <version>${taverna.engine.version}</version>
</dependency>
<dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>helper</artifactId>
- <version>${project.parent.version}</version>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>taverna-scufl2-api</artifactId>
+ <version>${taverna.language.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
@@ -70,24 +45,21 @@
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>workflow-view</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.taverna.engine</groupId>
- <artifactId>taverna-services-api</artifactId>
- <version>${taverna.engine.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.taverna.language</groupId>
- <artifactId>taverna-scufl2-api</artifactId>
- <version>${taverna.language.version}</version>
+ <artifactId>taverna-workflow-view</artifactId>
+ <version>${project.parent.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-report-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>${commons.beanutils.version}</version>
</dependency>
+
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-workflow-explorer/src/main/java/net/sf/taverna/t2/workbench/ui/workflowexplorer/WorkflowExplorerTreeModel.java
----------------------------------------------------------------------
diff --git a/taverna-workflow-explorer/src/main/java/net/sf/taverna/t2/workbench/ui/workflowexplorer/WorkflowExplorerTreeModel.java b/taverna-workflow-explorer/src/main/java/net/sf/taverna/t2/workbench/ui/workflowexplorer/WorkflowExplorerTreeModel.java
index 05255a4..f393523 100644
--- a/taverna-workflow-explorer/src/main/java/net/sf/taverna/t2/workbench/ui/workflowexplorer/WorkflowExplorerTreeModel.java
+++ b/taverna-workflow-explorer/src/main/java/net/sf/taverna/t2/workbench/ui/workflowexplorer/WorkflowExplorerTreeModel.java
@@ -24,16 +24,16 @@ import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreePath;
-import uk.org.taverna.scufl2.api.common.NamedSet;
-import uk.org.taverna.scufl2.api.common.Scufl2Tools;
-import uk.org.taverna.scufl2.api.core.ControlLink;
-import uk.org.taverna.scufl2.api.core.DataLink;
-import uk.org.taverna.scufl2.api.core.Processor;
-import uk.org.taverna.scufl2.api.core.Workflow;
-import uk.org.taverna.scufl2.api.port.InputProcessorPort;
-import uk.org.taverna.scufl2.api.port.InputWorkflowPort;
-import uk.org.taverna.scufl2.api.port.OutputProcessorPort;
-import uk.org.taverna.scufl2.api.port.OutputWorkflowPort;
+import org.apache.taverna.scufl2.api.common.NamedSet;
+import org.apache.taverna.scufl2.api.common.Scufl2Tools;
+import org.apache.taverna.scufl2.api.core.ControlLink;
+import org.apache.taverna.scufl2.api.core.DataLink;
+import org.apache.taverna.scufl2.api.core.Processor;
+import org.apache.taverna.scufl2.api.core.Workflow;
+import org.apache.taverna.scufl2.api.port.InputProcessorPort;
+import org.apache.taverna.scufl2.api.port.InputWorkflowPort;
+import org.apache.taverna.scufl2.api.port.OutputProcessorPort;
+import org.apache.taverna.scufl2.api.port.OutputWorkflowPort;
/**
* Workflow Explorer tree model. The tree root has four children nodes,