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:05 UTC
[1/3] incubator-taverna-workbench git commit: more refactoring
Repository: incubator-taverna-workbench
Updated Branches:
refs/heads/master 599e56c60 -> ed0a8e1fe
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-workflow-view/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workflow-view/pom.xml b/taverna-workflow-view/pom.xml
index 9292ab0..f90b2bd 100644
--- a/taverna-workflow-view/pom.xml
+++ b/taverna-workflow-view/pom.xml
@@ -23,7 +23,7 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>workflow-view</artifactId>
+ <artifactId>taverna-workflow-view</artifactId>
<packaging>bundle</packaging>
<name>Workflow View</name>
<dependencies>
@@ -32,23 +32,13 @@
<artifactId>taverna-observer</artifactId>
<version>${taverna.engine.version}</version>
</dependency>
-<!--
- <dependency>
- <groupId>net.sf.taverna.t2.lang</groupId>
- <artifactId>ui</artifactId>
- <version>${t2.lang.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.taverna.t2.lang</groupId>
- <artifactId>io</artifactId>
- <version>${t2.lang.version}</version>
- </dependency>
--->
+
<dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>workbench-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>
@@ -59,46 +49,33 @@
<artifactId>taverna-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>activity-palette-api</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>contextual-views-api</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>activity-tools</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>design-ui</artifactId>
- <version>${project.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-activity-palette-api</artifactId>
+ <version>${project.parent.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>
- </dependency>
-
+
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-design-ui</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
- </dependency>
+ </dependency>
+
</dependencies>
</project>
[3/3] incubator-taverna-workbench git commit: more refactoring
Posted by re...@apache.org.
more refactoring
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/ed0a8e1f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/ed0a8e1f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/ed0a8e1f
Branch: refs/heads/master
Commit: ed0a8e1febede6335e4d974fd0e15ca7b7ef9ee2
Parents: 599e56c
Author: Dmitry Repchevsky <re...@list.ru>
Authored: Wed Mar 25 17:31:27 2015 +0100
Committer: Dmitry Repchevsky <re...@list.ru>
Committed: Wed Mar 25 17:31:27 2015 +0100
----------------------------------------------------------------------
pom.xml | 2 +
taverna-activity-palette-ui/pom.xml | 21 +++--
.../servicepanel/ServiceTreeClickListener.java | 6 +-
taverna-contextual-views-api/pom.xml | 21 ++---
.../contextualviews/AddLayerFactorySPI.java | 2 +-
.../activity/ActivityConfigurationDialog.java | 34 +++----
.../activity/ActivityConfigurationPanel.java | 18 ++--
.../activity/ActivityPortConfiguration.java | 2 +-
.../MultiPageActivityConfigurationPanel.java | 2 +-
.../AnnotatedContextualViewFactory.java | 6 +-
.../ConditionContextualViewFactory.java | 2 +-
.../dataflow/DataflowContextualView.java | 2 +-
...DataflowOutputPortContextualViewFactory.java | 2 +-
.../datalink/DatalinkContextualViewFactory.java | 2 +-
.../impl/ContextualViewComponent.java | 6 +-
.../merge/MergeContextualView.java | 2 +-
taverna-dataflow-activity-ui/pom.xml | 7 ++
taverna-disabled-activity-ui/pom.xml | 6 ++
.../DisabledActivityConfigurationAction.java | 3 +-
.../disabled/views/DisabledConfigView.java | 17 ++--
.../t2/workbench/file/impl/FileManagerTest.java | 18 ++--
taverna-graph-model/pom.xml | 13 +--
taverna-graph-view/pom.xml | 45 +++++----
taverna-iteration-strategy-ui/pom.xml | 5 +
.../IterationStrategyConfigurationDialog.java | 12 +--
taverna-loop-ui/pom.xml | 37 ++++++--
.../t2/workbench/loop/ShowContextualView.java | 2 +-
taverna-menu-items/pom.xml | 18 ++--
.../AddInputPortDefaultValueAction.java | 2 +-
.../SetConstantInputPortValueMenuAction.java | 2 +-
.../SetDefaultInputPortValueAction.java | 2 +-
.../annotated/AnnotatedConfigureMenuAction.java | 2 +-
.../items/contextualviews/PasteMenuAction.java | 2 +-
.../controllink/RemoveConditionMenuAction.java | 4 +-
taverna-monitor-view/pom.xml | 15 ++-
taverna-perspective-design/pom.xml | 15 ---
taverna-perspective-results/pom.xml | 51 +++++++---
taverna-reference-ui/pom.xml | 40 +++++---
.../t2/reference/ui/CheckWorkflowStatus.java | 4 +-
.../reference/ui/CopyWorkflowSwingWorker.java | 2 +-
.../t2/reference/ui/InvalidDataflowReport.java | 8 +-
.../t2/reference/ui/RegistrationPanel.java | 2 +-
.../t2/reference/ui/WorkflowLaunchWindow.java | 26 ++---
.../ui/referenceactions/LoadInputsFromXML.java | 2 -
.../ui/referenceactions/SaveInputsAsXML.java | 4 +-
taverna-renderers-api/pom.xml | 12 ++-
.../sf/taverna/t2/renderers/RendererUtils.java | 8 +-
taverna-renderers-exts/pom.xml | 8 +-
.../t2/renderers/HTMLBrowserRenderer.java | 2 +-
.../sf/taverna/t2/renderers/JMolRenderer.java | 2 +-
.../sf/taverna/t2/renderers/SVGRenderer.java | 2 +-
.../taverna/t2/renderers/SeqVistaRenderer.java | 2 +-
taverna-renderers-impl/pom.xml | 6 +-
.../t2/renderers/impl/AbstractRenderer.java | 4 +-
.../t2/workbench/report/ProfileReportEvent.java | 2 +-
.../t2/workbench/report/ReportManager.java | 14 ++-
taverna-report-explainer/pom.xml | 25 ++---
.../report/explainer/BasicExplainer.java | 4 +-
taverna-report-impl/pom.xml | 10 +-
.../impl/ReportManagerConfigurationImpl.java | 2 +-
.../report/impl/ReportManagerImpl.java | 22 ++---
taverna-report-view/pom.xml | 13 ++-
.../ReportOnObjectContextualMenuAction.java | 10 +-
.../report/view/ReportOnWorkflowAction.java | 4 +-
.../report/view/ReportViewComponent.java | 14 +--
.../report/view/ReportViewConfigureAction.java | 2 +-
.../report/view/ReportViewTableModel.java | 34 +++----
.../workbench/report/view/StatusRenderer.java | 2 +-
.../report/view/ValidateObjectSwingWorker.java | 10 +-
.../report/view/ValidateSwingWorker.java | 18 ++--
.../workbench/report/view/VisitReportProxy.java | 6 +-
.../report/view/VisitReportProxySet.java | 4 +-
taverna-results-view/pom.xml | 99 ++++++++++----------
.../views/results/ResultsComponent.java | 6 +-
.../processor/ProcessorResultsComponent.java | 6 +-
.../saveactions/SaveAllResultsAsExcel.java | 3 -
.../saveactions/SaveAllResultsToFileSystem.java | 4 +-
.../workflow/RenderedResultComponent.java | 2 +-
taverna-retry-ui/pom.xml | 62 +++++++-----
.../retry/RetryConfigurationPanel.java | 2 +-
.../workbench/retry/RetryConfigureAction.java | 8 +-
.../retry/RetryConfigureMenuAction.java | 2 +-
.../t2/workbench/retry/RetryContextualView.java | 6 +-
.../retry/RetryContextualViewFactory.java | 2 +-
taverna-run-ui/pom.xml | 62 ++++++++----
.../run/actions/OpenWorkflowRunAction.java | 2 +-
.../run/actions/RunWorkflowAction.java | 30 +++---
.../cleanup/WorkflowRunStatusShutdownHook.java | 8 +-
.../run/menu/FileOpenRunMenuAction.java | 2 +-
.../workbench/run/menu/FileRunMenuAction.java | 2 +-
.../workbench/run/toolbar/RunToolbarAction.java | 2 +-
taverna-selection-impl/pom.xml | 34 +++----
.../menu/AddStringConstantTemplateAction.java | 2 +-
.../AddStringConstantTemplateMenuAction.java | 2 +-
.../menu/ConfigureStringConstantMenuAction.java | 2 +-
.../StringConstantActivityContextualView.java | 2 +-
.../StringConstantActivityViewFactory.java | 2 +-
.../views/StringConstantConfigView.java | 2 +-
taverna-unrecognized-activity-ui/pom.xml | 5 -
taverna-update-manager/pom.xml | 23 +----
taverna-workbench-impl/pom.xml | 78 +++++++--------
taverna-workflow-explorer/pom.xml | 58 +++---------
.../WorkflowExplorerTreeModel.java | 20 ++--
taverna-workflow-view/pom.xml | 73 +++++----------
104 files changed, 695 insertions(+), 656 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 953af80..3ccca59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,9 @@
<taverna.osgi.version>0.2.0-incubating-SNAPSHOT</taverna.osgi.version>
<taverna.engine.version>3.1.0-incubating-SNAPSHOT</taverna.engine.version>
<taverna.commonactivities.version>2.1.0-incubating-SNAPSHOT</taverna.commonactivities.version>
+ <org.icepdf.version>4.1.1</org.icepdf.version>
<batik.version>1.7.0</batik.version>
+ <org.fife.ui.hexeditor.version>1.1-SNAPSHOT</org.fife.ui.hexeditor.version>
</properties>
<modules>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-activity-palette-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-activity-palette-ui/pom.xml b/taverna-activity-palette-ui/pom.xml
index dc6c665..b33f024 100644
--- a/taverna-activity-palette-ui/pom.xml
+++ b/taverna-activity-palette-ui/pom.xml
@@ -27,6 +27,11 @@
<packaging>bundle</packaging>
<name>Apache Taverna Activity Palette UI Component</name>
<dependencies>
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-workflow-view</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-activity-icons-api</artifactId>
@@ -37,6 +42,11 @@
<artifactId>taverna-activity-palette-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-uibuilder</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-workbench-api</artifactId>
@@ -54,20 +64,10 @@
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>taverna-workflow-view</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-ui</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>uibuilder</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.taverna.engine</groupId>
<artifactId>taverna-services-api</artifactId>
<version>${taverna.engine.version}</version>
@@ -85,5 +85,6 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
+
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-activity-palette-ui/src/main/java/net/sf/taverna/t2/workbench/ui/servicepanel/ServiceTreeClickListener.java
----------------------------------------------------------------------
diff --git a/taverna-activity-palette-ui/src/main/java/net/sf/taverna/t2/workbench/ui/servicepanel/ServiceTreeClickListener.java b/taverna-activity-palette-ui/src/main/java/net/sf/taverna/t2/workbench/ui/servicepanel/ServiceTreeClickListener.java
index 7350fa5..ff44a2e 100644
--- a/taverna-activity-palette-ui/src/main/java/net/sf/taverna/t2/workbench/ui/servicepanel/ServiceTreeClickListener.java
+++ b/taverna-activity-palette-ui/src/main/java/net/sf/taverna/t2/workbench/ui/servicepanel/ServiceTreeClickListener.java
@@ -28,7 +28,6 @@ import static net.sf.taverna.t2.lang.ui.ShadedLabel.ORANGE;
import static net.sf.taverna.t2.lang.ui.ShadedLabel.halfShade;
import static net.sf.taverna.t2.workbench.icons.WorkbenchIcons.minusIcon;
import static net.sf.taverna.t2.workbench.icons.WorkbenchIcons.plusIcon;
-import static net.sf.taverna.t2.workbench.ui.workflowview.WorkflowView.importServiceDescription;
import java.awt.event.ActionEvent;
import java.awt.event.MouseAdapter;
@@ -61,6 +60,7 @@ import net.sf.taverna.t2.workbench.ui.servicepanel.actions.RestoreDefaultService
import net.sf.taverna.t2.workbench.ui.servicepanel.tree.FilterTreeNode;
import net.sf.taverna.t2.workbench.ui.servicepanel.tree.FilterTreeSelectionModel;
import net.sf.taverna.t2.workbench.ui.servicepanel.tree.TreePanel;
+import net.sf.taverna.t2.workbench.ui.workflowview.WorkflowView;
import org.apache.log4j.Logger;
@@ -152,14 +152,14 @@ public class ServiceTreeClickListener extends MouseAdapter {
menu.add(new AbstractAction("Add to workflow") {
@Override
public void actionPerformed(ActionEvent e) {
- importServiceDescription(sd, false, editManager,
+ WorkflowView.importServiceDescription(sd, false, editManager,
menuManager, selectionManager, serviceRegistry);
}
});
menu.add(new AbstractAction("Add to workflow with name...") {
@Override
public void actionPerformed(ActionEvent e) {
- importServiceDescription(sd, true, editManager,
+ WorkflowView.importServiceDescription(sd, true, editManager,
menuManager, selectionManager, serviceRegistry);
}
});
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-contextual-views-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-contextual-views-api/pom.xml b/taverna-contextual-views-api/pom.xml
index d0f10a1..67f94ca 100644
--- a/taverna-contextual-views-api/pom.xml
+++ b/taverna-contextual-views-api/pom.xml
@@ -28,6 +28,16 @@
<name>Apache Taverna Contextual Views API</name>
<description>Contextual views for the activities</description>
<dependencies>
+ <dependency>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-services-api</artifactId>
+ <version>${taverna.engine.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-activity-icons-api</artifactId>
@@ -40,11 +50,6 @@
</dependency>
<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-edits-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
@@ -80,12 +85,6 @@
<version>${taverna.language.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.taverna.osgi</groupId>
- <artifactId>taverna-services-api</artifactId>
- <version>${taverna.osgi.version}</version>
- </dependency>
-
- <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/AddLayerFactorySPI.java
----------------------------------------------------------------------
diff --git a/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/AddLayerFactorySPI.java b/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/AddLayerFactorySPI.java
index 6b0245c..7e5fd04 100644
--- a/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/AddLayerFactorySPI.java
+++ b/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/AddLayerFactorySPI.java
@@ -24,7 +24,7 @@ import java.net.URI;
import javax.swing.Action;
-import uk.org.taverna.scufl2.api.core.Processor;
+import org.apache.taverna.scufl2.api.core.Processor;
/**
* SPI for adding dispatch stack layers to a processor, such as
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/activity/ActivityConfigurationDialog.java
----------------------------------------------------------------------
diff --git a/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/activity/ActivityConfigurationDialog.java b/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/activity/ActivityConfigurationDialog.java
index c4c77b7..decea0f 100644
--- a/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/activity/ActivityConfigurationDialog.java
+++ b/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/activity/ActivityConfigurationDialog.java
@@ -33,8 +33,8 @@ import javax.swing.JButton;
import javax.swing.JPanel;
import javax.swing.border.EmptyBorder;
-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.workbench.edits.CompoundEdit;
import net.sf.taverna.t2.workbench.edits.Edit;
@@ -57,21 +57,21 @@ import net.sf.taverna.t2.workflow.edits.RenameEdit;
import org.apache.log4j.Logger;
-import uk.org.taverna.scufl2.api.activity.Activity;
-import uk.org.taverna.scufl2.api.common.Scufl2Tools;
-import uk.org.taverna.scufl2.api.configurations.Configuration;
-import uk.org.taverna.scufl2.api.container.WorkflowBundle;
-import uk.org.taverna.scufl2.api.core.Processor;
-import uk.org.taverna.scufl2.api.core.Workflow;
-import uk.org.taverna.scufl2.api.port.ActivityPort;
-import uk.org.taverna.scufl2.api.port.InputActivityPort;
-import uk.org.taverna.scufl2.api.port.InputProcessorPort;
-import uk.org.taverna.scufl2.api.port.OutputActivityPort;
-import uk.org.taverna.scufl2.api.port.OutputProcessorPort;
-import uk.org.taverna.scufl2.api.profiles.ProcessorBinding;
-import uk.org.taverna.scufl2.api.profiles.ProcessorInputPortBinding;
-import uk.org.taverna.scufl2.api.profiles.ProcessorOutputPortBinding;
-import uk.org.taverna.scufl2.api.profiles.Profile;
+import org.apache.taverna.scufl2.api.activity.Activity;
+import org.apache.taverna.scufl2.api.common.Scufl2Tools;
+import org.apache.taverna.scufl2.api.configurations.Configuration;
+import org.apache.taverna.scufl2.api.container.WorkflowBundle;
+import org.apache.taverna.scufl2.api.core.Processor;
+import org.apache.taverna.scufl2.api.core.Workflow;
+import org.apache.taverna.scufl2.api.port.ActivityPort;
+import org.apache.taverna.scufl2.api.port.InputActivityPort;
+import org.apache.taverna.scufl2.api.port.InputProcessorPort;
+import org.apache.taverna.scufl2.api.port.OutputActivityPort;
+import org.apache.taverna.scufl2.api.port.OutputProcessorPort;
+import org.apache.taverna.scufl2.api.profiles.ProcessorBinding;
+import org.apache.taverna.scufl2.api.profiles.ProcessorInputPortBinding;
+import org.apache.taverna.scufl2.api.profiles.ProcessorOutputPortBinding;
+import org.apache.taverna.scufl2.api.profiles.Profile;
import com.fasterxml.jackson.databind.node.ObjectNode;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/activity/ActivityConfigurationPanel.java
----------------------------------------------------------------------
diff --git a/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/activity/ActivityConfigurationPanel.java b/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/activity/ActivityConfigurationPanel.java
index cf7f42a..38d19a2 100644
--- a/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/activity/ActivityConfigurationPanel.java
+++ b/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/activity/ActivityConfigurationPanel.java
@@ -12,15 +12,15 @@ import javax.swing.JPanel;
import org.apache.log4j.Logger;
-import uk.org.taverna.commons.services.ActivityTypeNotFoundException;
-import uk.org.taverna.commons.services.InvalidConfigurationException;
-import uk.org.taverna.commons.services.ServiceRegistry;
-import uk.org.taverna.scufl2.api.activity.Activity;
-import uk.org.taverna.scufl2.api.common.Scufl2Tools;
-import uk.org.taverna.scufl2.api.configurations.Configuration;
-import uk.org.taverna.scufl2.api.port.ActivityPort;
-import uk.org.taverna.scufl2.api.port.InputActivityPort;
-import uk.org.taverna.scufl2.api.port.OutputActivityPort;
+import org.apache.taverna.commons.services.ActivityTypeNotFoundException;
+import org.apache.taverna.commons.services.InvalidConfigurationException;
+import org.apache.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.scufl2.api.activity.Activity;
+import org.apache.taverna.scufl2.api.common.Scufl2Tools;
+import org.apache.taverna.scufl2.api.configurations.Configuration;
+import org.apache.taverna.scufl2.api.port.ActivityPort;
+import org.apache.taverna.scufl2.api.port.InputActivityPort;
+import org.apache.taverna.scufl2.api.port.OutputActivityPort;
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-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/activity/ActivityPortConfiguration.java
----------------------------------------------------------------------
diff --git a/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/activity/ActivityPortConfiguration.java b/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/activity/ActivityPortConfiguration.java
index 6b23fd5..7e17ec6 100644
--- a/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/activity/ActivityPortConfiguration.java
+++ b/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/activity/ActivityPortConfiguration.java
@@ -20,7 +20,7 @@
******************************************************************************/
package net.sf.taverna.t2.workbench.ui.views.contextualviews.activity;
-import uk.org.taverna.scufl2.api.port.ActivityPort;
+import org.apache.taverna.scufl2.api.port.ActivityPort;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/activity/MultiPageActivityConfigurationPanel.java
----------------------------------------------------------------------
diff --git a/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/activity/MultiPageActivityConfigurationPanel.java b/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/activity/MultiPageActivityConfigurationPanel.java
index 19cd180..c6862ff 100644
--- a/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/activity/MultiPageActivityConfigurationPanel.java
+++ b/taverna-contextual-views-api/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/activity/MultiPageActivityConfigurationPanel.java
@@ -27,7 +27,7 @@ import java.awt.Component;
import javax.swing.JTabbedPane;
-import uk.org.taverna.scufl2.api.activity.Activity;
+import org.apache.taverna.scufl2.api.activity.Activity;
/**
* Component for configuring activities that have multiple configuration pages.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/annotated/AnnotatedContextualViewFactory.java
----------------------------------------------------------------------
diff --git a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/annotated/AnnotatedContextualViewFactory.java b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/annotated/AnnotatedContextualViewFactory.java
index eb18803..55f4fa6 100644
--- a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/annotated/AnnotatedContextualViewFactory.java
+++ b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/annotated/AnnotatedContextualViewFactory.java
@@ -4,13 +4,13 @@ import static java.util.Collections.singletonList;
import java.util.List;
-import net.sf.taverna.t2.annotation.Annotated;
-import net.sf.taverna.t2.annotation.AnnotationBeanSPI;
+import org.apache.taverna.annotation.Annotated;
+import org.apache.taverna.annotation.AnnotationBeanSPI;
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 net.sf.taverna.t2.workflowmodel.processor.activity.Activity;
+import org.apache.taverna.workflowmodel.processor.activity.Activity;
public class AnnotatedContextualViewFactory implements
ContextualViewFactory<Annotated<?>> {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/condition/ConditionContextualViewFactory.java
----------------------------------------------------------------------
diff --git a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/condition/ConditionContextualViewFactory.java b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/condition/ConditionContextualViewFactory.java
index d9856e1..15dacd7 100644
--- a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/condition/ConditionContextualViewFactory.java
+++ b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/condition/ConditionContextualViewFactory.java
@@ -26,7 +26,7 @@ import java.util.List;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.ContextualView;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ContextualViewFactory;
-import net.sf.taverna.t2.workflowmodel.Condition;
+import org.apache.taverna.workflowmodel.Condition;
import org.apache.taverna.scufl2.api.core.BlockingControlLink;
/**
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflow/DataflowContextualView.java
----------------------------------------------------------------------
diff --git a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflow/DataflowContextualView.java b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflow/DataflowContextualView.java
index 877693f..9b38a53 100644
--- a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflow/DataflowContextualView.java
+++ b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflow/DataflowContextualView.java
@@ -14,7 +14,7 @@ import javax.swing.JEditorPane;
import net.sf.taverna.t2.workbench.configuration.colour.ColourManager;
import net.sf.taverna.t2.workbench.file.FileManager;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.ContextualView;
-import net.sf.taverna.t2.workflowmodel.Dataflow;
+import org.apache.taverna.workflowmodel.Dataflow;
import org.apache.taverna.scufl2.api.core.Workflow;
import org.apache.taverna.scufl2.api.port.InputWorkflowPort;
import org.apache.taverna.scufl2.api.port.OutputWorkflowPort;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflowoutputport/DataflowOutputPortContextualViewFactory.java
----------------------------------------------------------------------
diff --git a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflowoutputport/DataflowOutputPortContextualViewFactory.java b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflowoutputport/DataflowOutputPortContextualViewFactory.java
index 9b06e66..e0c69a5 100644
--- a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflowoutputport/DataflowOutputPortContextualViewFactory.java
+++ b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/dataflowoutputport/DataflowOutputPortContextualViewFactory.java
@@ -26,7 +26,7 @@ import java.util.List;
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 net.sf.taverna.t2.workflowmodel.DataflowOutputPort;
+import org.apache.taverna.workflowmodel.DataflowOutputPort;
import org.apache.taverna.scufl2.api.port.OutputWorkflowPort;
/**
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/datalink/DatalinkContextualViewFactory.java
----------------------------------------------------------------------
diff --git a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/datalink/DatalinkContextualViewFactory.java b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/datalink/DatalinkContextualViewFactory.java
index 0acc82f..b3e67dc 100644
--- a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/datalink/DatalinkContextualViewFactory.java
+++ b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/datalink/DatalinkContextualViewFactory.java
@@ -26,7 +26,7 @@ import java.util.List;
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 net.sf.taverna.t2.workflowmodel.Datalink;
+import org.apache.taverna.workflowmodel.Datalink;
import org.apache.taverna.scufl2.api.core.DataLink;
/**
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/impl/ContextualViewComponent.java
----------------------------------------------------------------------
diff --git a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/impl/ContextualViewComponent.java b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/impl/ContextualViewComponent.java
index b4bec76..dc0018e 100644
--- a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/impl/ContextualViewComponent.java
+++ b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/impl/ContextualViewComponent.java
@@ -122,7 +122,7 @@ public class ContextualViewComponent extends JScrollPane implements UIComponentS
}
@SuppressWarnings("unchecked")
- private void updateContextualView(List<ContextualViewFactory<?>> viewFactories,
+ private void updateContextualView(List<ContextualViewFactory<? super Object>> viewFactories,
Object selection) {
if (selection == lastSelectedObject)
return;
@@ -158,7 +158,7 @@ public class ContextualViewComponent extends JScrollPane implements UIComponentS
}
private void populateContextualView(
- List<ContextualViewFactory<?>> viewFactories,
+ List<ContextualViewFactory<? super Object>> viewFactories,
GridBagConstraints gbc, List<ContextualView> views) {
JPanel firstPanel = null;
JPanel lastOpenedSection = null;
@@ -270,7 +270,7 @@ public class ContextualViewComponent extends JScrollPane implements UIComponentS
}
private void findContextualView(Object selection) {
- List<ContextualViewFactory<?>> viewFactoriesForBeanType = contextualViewFactoryRegistry
+ List<ContextualViewFactory<? super Object>> viewFactoriesForBeanType = contextualViewFactoryRegistry
.getViewFactoriesForObject(selection);
updateContextualView(viewFactoriesForBeanType, selection);
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/merge/MergeContextualView.java
----------------------------------------------------------------------
diff --git a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/merge/MergeContextualView.java b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/merge/MergeContextualView.java
index 7326fcc..441f41b 100644
--- a/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/merge/MergeContextualView.java
+++ b/taverna-contextual-views-impl/src/main/java/net/sf/taverna/t2/workbench/ui/views/contextualviews/merge/MergeContextualView.java
@@ -42,7 +42,7 @@ import net.sf.taverna.t2.workbench.configuration.colour.ColourManager;
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.workflowmodel.Merge;
+import org.apache.taverna.workflowmodel.Merge;
import org.apache.taverna.scufl2.api.common.Scufl2Tools;
import org.apache.taverna.scufl2.api.container.WorkflowBundle;
import org.apache.taverna.scufl2.api.core.DataLink;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-dataflow-activity-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-dataflow-activity-ui/pom.xml b/taverna-dataflow-activity-ui/pom.xml
index 4bd5cba..89a9643 100644
--- a/taverna-dataflow-activity-ui/pom.xml
+++ b/taverna-dataflow-activity-ui/pom.xml
@@ -104,5 +104,12 @@
<version>${taverna.language.version}</version>
<scope>test</scope>
</dependency> -->
+
+ <dependency>
+ <groupId>org.apache.batik</groupId>
+ <artifactId>batik-osgi</artifactId>
+ <version>${batik.version}</version>
+ </dependency>
+
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-disabled-activity-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-disabled-activity-ui/pom.xml b/taverna-disabled-activity-ui/pom.xml
index 82f8dc4..31135f4 100644
--- a/taverna-disabled-activity-ui/pom.xml
+++ b/taverna-disabled-activity-ui/pom.xml
@@ -77,5 +77,11 @@
<artifactId>taverna-helper-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>1.4.1</version>
+ <type>jar</type>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-disabled-activity-ui/src/main/java/net/sf/taverna/t2/activities/disabled/actions/DisabledActivityConfigurationAction.java
----------------------------------------------------------------------
diff --git a/taverna-disabled-activity-ui/src/main/java/net/sf/taverna/t2/activities/disabled/actions/DisabledActivityConfigurationAction.java b/taverna-disabled-activity-ui/src/main/java/net/sf/taverna/t2/activities/disabled/actions/DisabledActivityConfigurationAction.java
index c71d483..54354eb 100644
--- a/taverna-disabled-activity-ui/src/main/java/net/sf/taverna/t2/activities/disabled/actions/DisabledActivityConfigurationAction.java
+++ b/taverna-disabled-activity-ui/src/main/java/net/sf/taverna/t2/activities/disabled/actions/DisabledActivityConfigurationAction.java
@@ -28,7 +28,7 @@ import java.util.List;
import javax.swing.JOptionPane;
-import uk.org.taverna.scufl2.api.activity.Activity;
+import org.apache.taverna.scufl2.api.activity.Activity;
import net.sf.taverna.t2.activities.disabled.views.DisabledConfigView;
import net.sf.taverna.t2.servicedescriptions.ServiceDescriptionRegistry;
@@ -39,6 +39,7 @@ import net.sf.taverna.t2.workbench.report.ReportManager;
import net.sf.taverna.t2.workbench.ui.actions.activity.ActivityConfigurationAction;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ActivityConfigurationDialog;
+
@SuppressWarnings("serial")
public class DisabledActivityConfigurationAction extends ActivityConfigurationAction {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-disabled-activity-ui/src/main/java/net/sf/taverna/t2/activities/disabled/views/DisabledConfigView.java
----------------------------------------------------------------------
diff --git a/taverna-disabled-activity-ui/src/main/java/net/sf/taverna/t2/activities/disabled/views/DisabledConfigView.java b/taverna-disabled-activity-ui/src/main/java/net/sf/taverna/t2/activities/disabled/views/DisabledConfigView.java
index fee048e..38e2b82 100644
--- a/taverna-disabled-activity-ui/src/main/java/net/sf/taverna/t2/activities/disabled/views/DisabledConfigView.java
+++ b/taverna-disabled-activity-ui/src/main/java/net/sf/taverna/t2/activities/disabled/views/DisabledConfigView.java
@@ -44,20 +44,21 @@ import com.thoughtworks.xstream.io.xml.DomDriver;
@SuppressWarnings("serial")
public class DisabledConfigView extends ActivityConfigurationPanel {
- private ActivityAndBeanWrapper configuration;
+ private ActivityAndBeanWrapper configuration;
private List<String> fieldNames;
private Object clonedConfig = null;
String origConfigXML = "";
- public DisabledConfigView(Activity activity) {
- super(activity);
- setLayout(new BorderLayout());
- fieldNames = null;
- initialise();
- }
+ public DisabledConfigView(Activity activity) {
+ super(activity);
+ setLayout(new BorderLayout());
+ fieldNames = null;
+ initialise();
+ }
- private void initialise() {
+ @Override
+ protected void initialise() {
CSH.setHelpIDString(
this,
"net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.DisabledConfigView");
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-file-impl/src/test/java/net/sf/taverna/t2/workbench/file/impl/FileManagerTest.java
----------------------------------------------------------------------
diff --git a/taverna-file-impl/src/test/java/net/sf/taverna/t2/workbench/file/impl/FileManagerTest.java b/taverna-file-impl/src/test/java/net/sf/taverna/t2/workbench/file/impl/FileManagerTest.java
index 9389a79..4683399 100644
--- a/taverna-file-impl/src/test/java/net/sf/taverna/t2/workbench/file/impl/FileManagerTest.java
+++ b/taverna-file-impl/src/test/java/net/sf/taverna/t2/workbench/file/impl/FileManagerTest.java
@@ -53,15 +53,15 @@ import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
-import uk.org.taverna.scufl2.api.container.WorkflowBundle;
-import uk.org.taverna.scufl2.api.core.Processor;
-import uk.org.taverna.scufl2.api.core.Workflow;
-import uk.org.taverna.scufl2.api.io.WorkflowBundleIO;
-import uk.org.taverna.scufl2.api.io.WorkflowBundleReader;
-import uk.org.taverna.scufl2.api.io.WorkflowBundleWriter;
-import uk.org.taverna.scufl2.rdfxml.RDFXMLReader;
-import uk.org.taverna.scufl2.rdfxml.RDFXMLWriter;
-import uk.org.taverna.scufl2.translator.t2flow.T2FlowReader;
+import org.apache.taverna.scufl2.api.container.WorkflowBundle;
+import org.apache.taverna.scufl2.api.core.Processor;
+import org.apache.taverna.scufl2.api.core.Workflow;
+import org.apache.taverna.scufl2.api.io.WorkflowBundleIO;
+import org.apache.taverna.scufl2.api.io.WorkflowBundleReader;
+import org.apache.taverna.scufl2.api.io.WorkflowBundleWriter;
+import org.apache.taverna.scufl2.rdfxml.RDFXMLReader;
+import org.apache.taverna.scufl2.rdfxml.RDFXMLWriter;
+import org.apache.taverna.scufl2.translator.t2flow.T2FlowReader;
public class FileManagerTest {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-graph-model/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-graph-model/pom.xml b/taverna-graph-model/pom.xml
index bc9ae51..f40acbc 100644
--- a/taverna-graph-model/pom.xml
+++ b/taverna-graph-model/pom.xml
@@ -82,9 +82,9 @@
</build>
<dependencies>
<dependency>
- <groupId>${project.parent.groupId}</groupId>
+ <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>
@@ -102,18 +102,13 @@
<version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>taverna-onfiguration-impl</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.taverna.engine</groupId>
<artifactId>taverna-observer</artifactId>
<version>${taverna.engine.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>taverna.io</artifactId>
+ <artifactId>taverna-io</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
@@ -134,7 +129,7 @@
<dependency>
<groupId>org.apache.batik</groupId>
<artifactId>batik-osgi</artifactId>
- <version>1.7.0</version>
+ <version>${batik.version}</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-graph-view/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-graph-view/pom.xml b/taverna-graph-view/pom.xml
index e887d5f..56acb65 100644
--- a/taverna-graph-view/pom.xml
+++ b/taverna-graph-view/pom.xml
@@ -27,14 +27,30 @@
<packaging>bundle</packaging>
<name>Apache Taverna Graph View</name>
<dependencies>
+ <dependency>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-services-api</artifactId>
+ <version>${taverna.engine.version}</version>
+ </dependency>
<dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>taverna-workbench-api</artifactId>
- <version>${project.parent.version}</version>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-observer</artifactId>
+ <version>${taverna.engine.version}</version>
</dependency>
<dependency>
- <groupId>${project.parent.groupId}</groupId>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>taverna-scufl2-api</artifactId>
+ <version>${taverna.language.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-configuration-api</artifactId>
+ <version>${taverna.osgi.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-workbench-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
@@ -63,11 +79,6 @@
<version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.taverna.engine</groupId>
- <artifactId>taverna-observer</artifactId>
- <version>${taverna.engine.version}</version>
- </dependency>
- <dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-ui</artifactId>
<version>${project.parent.version}</version>
@@ -77,21 +88,7 @@
<artifactId>taverna-io</artifactId>
<version>${project.parent.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.taverna.osgi</groupId>
- <artifactId>taverna-services-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>org.apache.taverna.engine</groupId>
- <artifactId>taverna-services-api</artifactId>
- <version>${taverna.engine.version}</version>
- </dependency>
+
<dependency>
<groupId>org.apache.batik</groupId>
<artifactId>batik-osgi</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-iteration-strategy-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-iteration-strategy-ui/pom.xml b/taverna-iteration-strategy-ui/pom.xml
index 7766ba1..cbc89f6 100644
--- a/taverna-iteration-strategy-ui/pom.xml
+++ b/taverna-iteration-strategy-ui/pom.xml
@@ -32,6 +32,11 @@
<artifactId>taverna-workflowmodel-api</artifactId>
<version>${taverna.engine.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>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-iteration-strategy-ui/src/main/java/net/sf/taverna/t2/workbench/iterationstrategy/contextview/IterationStrategyConfigurationDialog.java
----------------------------------------------------------------------
diff --git a/taverna-iteration-strategy-ui/src/main/java/net/sf/taverna/t2/workbench/iterationstrategy/contextview/IterationStrategyConfigurationDialog.java b/taverna-iteration-strategy-ui/src/main/java/net/sf/taverna/t2/workbench/iterationstrategy/contextview/IterationStrategyConfigurationDialog.java
index 1af83cb..cd87e58 100644
--- a/taverna-iteration-strategy-ui/src/main/java/net/sf/taverna/t2/workbench/iterationstrategy/contextview/IterationStrategyConfigurationDialog.java
+++ b/taverna-iteration-strategy-ui/src/main/java/net/sf/taverna/t2/workbench/iterationstrategy/contextview/IterationStrategyConfigurationDialog.java
@@ -19,12 +19,12 @@ import net.sf.taverna.t2.workbench.edits.EditManager;
import net.sf.taverna.t2.workbench.file.FileManager;
import net.sf.taverna.t2.workbench.helper.HelpEnabledDialog;
import net.sf.taverna.t2.workbench.iterationstrategy.editor.IterationStrategyEditorControl;
-import net.sf.taverna.t2.workflowmodel.Edit;
-import net.sf.taverna.t2.workflowmodel.EditException;
-import net.sf.taverna.t2.workflowmodel.Edits;
-import net.sf.taverna.t2.workflowmodel.Processor;
-import net.sf.taverna.t2.workflowmodel.processor.iteration.IterationStrategy;
-import net.sf.taverna.t2.workflowmodel.processor.iteration.IterationStrategyStack;
+import org.apache.taverna.workflowmodel.Edit;
+import org.apache.taverna.workflowmodel.EditException;
+import org.apache.taverna.workflowmodel.Edits;
+import org.apache.taverna.workflowmodel.Processor;
+import org.apache.taverna.workflowmodel.processor.iteration.IterationStrategy;
+import org.apache.taverna.workflowmodel.processor.iteration.IterationStrategyStack;
import org.apache.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-loop-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-loop-ui/pom.xml b/taverna-loop-ui/pom.xml
index edcc6f2..bbe1af8 100644
--- a/taverna-loop-ui/pom.xml
+++ b/taverna-loop-ui/pom.xml
@@ -27,6 +27,13 @@
<packaging>bundle</packaging>
<name>Apache Taverna Loop layer contextual view</name>
<dependencies>
+
+ <dependency>
+ <groupId>org.apache.taverna.osgi</groupId>
+ <artifactId>taverna-app-configuration-api</artifactId>
+ <version>${taverna.osgi.version}</version>
+ </dependency>
+
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-contextual-views-api</artifactId>
@@ -44,9 +51,31 @@
</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-selection-impl</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-menu-api</artifactId>
+ <version>${project.parent.version}</version>
+ <type>jar</type>
+ </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>selection-impl</artifactId>
+ <version>${project.parent.version}</version>
+ <scope>test</scope>
+ </dependency>
<!--
<dependency>
<groupId>org.apache.taverna.workbench.commonactivities</groupId>
@@ -74,12 +103,6 @@
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>taverna-selection-impl</artifactId>
- <version>${project.parent.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ </dependencies>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-loop-ui/src/test/java/net/sf/taverna/t2/workbench/loop/ShowContextualView.java
----------------------------------------------------------------------
diff --git a/taverna-loop-ui/src/test/java/net/sf/taverna/t2/workbench/loop/ShowContextualView.java b/taverna-loop-ui/src/test/java/net/sf/taverna/t2/workbench/loop/ShowContextualView.java
index 05660a6..9e63c6d 100644
--- a/taverna-loop-ui/src/test/java/net/sf/taverna/t2/workbench/loop/ShowContextualView.java
+++ b/taverna-loop-ui/src/test/java/net/sf/taverna/t2/workbench/loop/ShowContextualView.java
@@ -72,7 +72,7 @@ public class ShowContextualView {
private EditManager editManager;
private ContextualViewFactoryRegistry contextualViewFactoryRegistry;
- private uk.org.taverna.scufl2.api.core.Processor processor;
+ private org.apache.taverna.scufl2.api.core.Processor processor;
private WorkflowBundle currentDataflow;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-menu-items/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-menu-items/pom.xml b/taverna-menu-items/pom.xml
index 093aff6..2ff102f 100644
--- a/taverna-menu-items/pom.xml
+++ b/taverna-menu-items/pom.xml
@@ -28,6 +28,17 @@
<name>Apache Taverna menu items</name>
<dependencies>
<dependency>
+ <groupId>org.apache.taverna.osgi</groupId>
+ <artifactId>taverna-services-api</artifactId>
+ <version>${taverna.osgi.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-contextual-views-impl</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-menu-api</artifactId>
<version>${project.parent.version}</version>
@@ -68,12 +79,6 @@
<version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.taverna.osgi</groupId>
- <artifactId>taverna-services-api</artifactId>
- <version>${taverna.osgi.version}</version>
- </dependency>
-
- <dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>stringconstant-activity-ui</artifactId>
<version>${project.parent.version}</version>
@@ -84,5 +89,6 @@
<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/ed0a8e1f/taverna-menu-items/src/main/java/net/sf/taverna/t2/ui/menu/items/activityport/AddInputPortDefaultValueAction.java
----------------------------------------------------------------------
diff --git a/taverna-menu-items/src/main/java/net/sf/taverna/t2/ui/menu/items/activityport/AddInputPortDefaultValueAction.java b/taverna-menu-items/src/main/java/net/sf/taverna/t2/ui/menu/items/activityport/AddInputPortDefaultValueAction.java
index bb65cdf..2843008 100644
--- a/taverna-menu-items/src/main/java/net/sf/taverna/t2/ui/menu/items/activityport/AddInputPortDefaultValueAction.java
+++ b/taverna-menu-items/src/main/java/net/sf/taverna/t2/ui/menu/items/activityport/AddInputPortDefaultValueAction.java
@@ -42,7 +42,7 @@ import net.sf.taverna.t2.workflow.edits.AddProcessorEdit;
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;
import org.apache.taverna.scufl2.api.core.DataLink;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-menu-items/src/main/java/net/sf/taverna/t2/ui/menu/items/activityport/SetConstantInputPortValueMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-menu-items/src/main/java/net/sf/taverna/t2/ui/menu/items/activityport/SetConstantInputPortValueMenuAction.java b/taverna-menu-items/src/main/java/net/sf/taverna/t2/ui/menu/items/activityport/SetConstantInputPortValueMenuAction.java
index a457cdd..8bea960 100644
--- a/taverna-menu-items/src/main/java/net/sf/taverna/t2/ui/menu/items/activityport/SetConstantInputPortValueMenuAction.java
+++ b/taverna-menu-items/src/main/java/net/sf/taverna/t2/ui/menu/items/activityport/SetConstantInputPortValueMenuAction.java
@@ -25,7 +25,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.commons.services.ServiceRegistry;
+import org.apache.taverna.commons.services.ServiceRegistry;
import org.apache.taverna.scufl2.api.core.Workflow;
import org.apache.taverna.scufl2.api.port.InputProcessorPort;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-menu-items/src/main/java/net/sf/taverna/t2/ui/menu/items/activityport/SetDefaultInputPortValueAction.java
----------------------------------------------------------------------
diff --git a/taverna-menu-items/src/main/java/net/sf/taverna/t2/ui/menu/items/activityport/SetDefaultInputPortValueAction.java b/taverna-menu-items/src/main/java/net/sf/taverna/t2/ui/menu/items/activityport/SetDefaultInputPortValueAction.java
index 2093374..bb40da7 100644
--- a/taverna-menu-items/src/main/java/net/sf/taverna/t2/ui/menu/items/activityport/SetDefaultInputPortValueAction.java
+++ b/taverna-menu-items/src/main/java/net/sf/taverna/t2/ui/menu/items/activityport/SetDefaultInputPortValueAction.java
@@ -37,7 +37,7 @@ import net.sf.taverna.t2.workbench.selection.events.DataflowSelectionMessage;
import net.sf.taverna.t2.workbench.selection.events.PerspectiveSelectionEvent;
import net.sf.taverna.t2.workbench.selection.events.SelectionManagerEvent;
import net.sf.taverna.t2.workbench.selection.events.WorkflowBundleSelectionEvent;
-import uk.org.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.commons.services.ServiceRegistry;
import org.apache.taverna.scufl2.api.common.Scufl2Tools;
import org.apache.taverna.scufl2.api.container.WorkflowBundle;
import org.apache.taverna.scufl2.api.port.InputProcessorPort;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-menu-items/src/main/java/net/sf/taverna/t2/ui/menu/items/annotated/AnnotatedConfigureMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-menu-items/src/main/java/net/sf/taverna/t2/ui/menu/items/annotated/AnnotatedConfigureMenuAction.java b/taverna-menu-items/src/main/java/net/sf/taverna/t2/ui/menu/items/annotated/AnnotatedConfigureMenuAction.java
index 7278d86..0105f21 100644
--- a/taverna-menu-items/src/main/java/net/sf/taverna/t2/ui/menu/items/annotated/AnnotatedConfigureMenuAction.java
+++ b/taverna-menu-items/src/main/java/net/sf/taverna/t2/ui/menu/items/annotated/AnnotatedConfigureMenuAction.java
@@ -33,7 +33,7 @@ import net.sf.taverna.t2.ui.menu.AbstractContextualMenuAction;
import net.sf.taverna.t2.ui.menu.items.contextualviews.ConfigureSection;
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.annotated.AnnotatedContextualView;
+//import net.sf.taverna.t2.workbench.ui.views.contextualviews.annotated.AnnotatedContextualView;
public class AnnotatedConfigureMenuAction extends AbstractContextualMenuAction {
private static final String ANNOTATE = "Annotate...";
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-menu-items/src/main/java/net/sf/taverna/t2/ui/menu/items/contextualviews/PasteMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-menu-items/src/main/java/net/sf/taverna/t2/ui/menu/items/contextualviews/PasteMenuAction.java b/taverna-menu-items/src/main/java/net/sf/taverna/t2/ui/menu/items/contextualviews/PasteMenuAction.java
index fd7eadd..76d34a5 100644
--- a/taverna-menu-items/src/main/java/net/sf/taverna/t2/ui/menu/items/contextualviews/PasteMenuAction.java
+++ b/taverna-menu-items/src/main/java/net/sf/taverna/t2/ui/menu/items/contextualviews/PasteMenuAction.java
@@ -29,7 +29,7 @@ import net.sf.taverna.t2.ui.menu.MenuManager;
import net.sf.taverna.t2.workbench.edits.EditManager;
import net.sf.taverna.t2.workbench.selection.SelectionManager;
import net.sf.taverna.t2.workbench.ui.actions.PasteGraphComponentAction;
-import uk.org.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.commons.services.ServiceRegistry;
import org.apache.taverna.scufl2.api.core.Workflow;
public class PasteMenuAction extends AbstractContextualMenuAction {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-menu-items/src/main/java/net/sf/taverna/t2/ui/menu/items/controllink/RemoveConditionMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-menu-items/src/main/java/net/sf/taverna/t2/ui/menu/items/controllink/RemoveConditionMenuAction.java b/taverna-menu-items/src/main/java/net/sf/taverna/t2/ui/menu/items/controllink/RemoveConditionMenuAction.java
index 68e32e2..af0db33 100644
--- a/taverna-menu-items/src/main/java/net/sf/taverna/t2/ui/menu/items/controllink/RemoveConditionMenuAction.java
+++ b/taverna-menu-items/src/main/java/net/sf/taverna/t2/ui/menu/items/controllink/RemoveConditionMenuAction.java
@@ -28,8 +28,8 @@ import net.sf.taverna.t2.ui.menu.AbstractContextualMenuAction;
import net.sf.taverna.t2.workbench.design.actions.RemoveConditionAction;
import net.sf.taverna.t2.workbench.edits.EditManager;
import net.sf.taverna.t2.workbench.selection.SelectionManager;
-import uk.org.taverna.scufl2.api.core.ControlLink;
-import uk.org.taverna.scufl2.api.core.Workflow;
+import org.apache.taverna.scufl2.api.core.ControlLink;
+import org.apache.taverna.scufl2.api.core.Workflow;
public class RemoveConditionMenuAction extends AbstractContextualMenuAction {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-monitor-view/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-monitor-view/pom.xml b/taverna-monitor-view/pom.xml
index ecbf602..739306e 100644
--- a/taverna-monitor-view/pom.xml
+++ b/taverna-monitor-view/pom.xml
@@ -32,11 +32,21 @@
<artifactId>taverna-workbench-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-graph-model</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-activity-icons-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-results-view</artifactId>
@@ -48,11 +58,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>taverna-ui</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.taverna.engine</groupId>
<artifactId>taverna-report-api</artifactId>
<version>${taverna.engine.version}</version>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-perspective-design/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-perspective-design/pom.xml b/taverna-perspective-design/pom.xml
index f7aa365..e3f59b2 100644
--- a/taverna-perspective-design/pom.xml
+++ b/taverna-perspective-design/pom.xml
@@ -72,22 +72,7 @@
<artifactId>taverna-workflow-explorer</artifactId>
<version>${project.parent.version}</version>
</dependency>
- <!-- <dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>taverna-report-view</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>contextual-views-impl</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.taverna.osgi</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-perspective-results/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-perspective-results/pom.xml b/taverna-perspective-results/pom.xml
index 8588c3d..1d9cae3 100644
--- a/taverna-perspective-results/pom.xml
+++ b/taverna-perspective-results/pom.xml
@@ -29,11 +29,18 @@
<description>Results component for viewing progress of a workflow run,
intermediate and final results, as well as previous workflow runs.</description>
<dependencies>
+ <dependency>
+ <groupId>org.apache.taverna.osgi</groupId>
+ <artifactId>taverna-app-configuration-api</artifactId>
+ <version>${taverna.osgi.version}</version>
+ </dependency>
+
<dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>selection-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>workbench-api</artifactId>
@@ -49,18 +56,31 @@
<artifactId>results-view</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>${project.parent.groupId}</groupId>
+ <artifactId>taverna-selection-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-renderers-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-activity-icons-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>org.osgi</groupId>
@@ -79,6 +99,7 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
+
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-reference-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-reference-ui/pom.xml b/taverna-reference-ui/pom.xml
index 733af15..e678a1f 100644
--- a/taverna-reference-ui/pom.xml
+++ b/taverna-reference-ui/pom.xml
@@ -33,33 +33,42 @@
</description>
<dependencies>
+ <dependency>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>taverna-baclava-language</artifactId>
+ <version>${taverna.language.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-edits-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-file-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-graph-view</artifactId>
<version>${project.version}</version>
</dependency>
- <!-- <dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>taverna-report-view</artifactId>
- <version>${project.version}</version>
- </dependency> -->
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-ui</artifactId>
<version>${project.parent.version}</version>
</dependency>
- <!--
- <dependency>
- <groupId>net.sf.taverna.t2</groupId>
- <artifactId>baclava</artifactId>
- <version>${t2.baclava.version}</version>
- </dependency>
- -->
<dependency>
<groupId>org.apache.taverna.engine</groupId>
<artifactId>taverna-run-api</artifactId>
@@ -76,10 +85,17 @@
<version>${taverna.engine.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.batik</groupId>
+ <artifactId>batik-osgi</artifactId>
+ <version>${batik.version}</version>
+ </dependency>
+
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency>
+
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-reference-ui/src/main/java/net/sf/taverna/t2/reference/ui/CheckWorkflowStatus.java
----------------------------------------------------------------------
diff --git a/taverna-reference-ui/src/main/java/net/sf/taverna/t2/reference/ui/CheckWorkflowStatus.java b/taverna-reference-ui/src/main/java/net/sf/taverna/t2/reference/ui/CheckWorkflowStatus.java
index 04ae738..c940e99 100644
--- a/taverna-reference-ui/src/main/java/net/sf/taverna/t2/reference/ui/CheckWorkflowStatus.java
+++ b/taverna-reference-ui/src/main/java/net/sf/taverna/t2/reference/ui/CheckWorkflowStatus.java
@@ -18,8 +18,8 @@ import java.util.Date;
import java.util.HashMap;
import java.util.Map;
-import uk.org.taverna.scufl2.api.profiles.Profile;
-import uk.org.taverna.scufl2.validation.Status;
+import org.apache.taverna.scufl2.api.profiles.Profile;
+import org.apache.taverna.scufl2.validation.Status;
import net.sf.taverna.t2.workbench.edits.EditManager;
import net.sf.taverna.t2.workbench.file.FileManager;
import net.sf.taverna.t2.workbench.report.ReportManager;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-reference-ui/src/main/java/net/sf/taverna/t2/reference/ui/CopyWorkflowSwingWorker.java
----------------------------------------------------------------------
diff --git a/taverna-reference-ui/src/main/java/net/sf/taverna/t2/reference/ui/CopyWorkflowSwingWorker.java b/taverna-reference-ui/src/main/java/net/sf/taverna/t2/reference/ui/CopyWorkflowSwingWorker.java
index b2a7b63..d72a30e 100644
--- a/taverna-reference-ui/src/main/java/net/sf/taverna/t2/reference/ui/CopyWorkflowSwingWorker.java
+++ b/taverna-reference-ui/src/main/java/net/sf/taverna/t2/reference/ui/CopyWorkflowSwingWorker.java
@@ -24,7 +24,7 @@ import javax.swing.SwingWorker;
import org.apache.log4j.Logger;
-import uk.org.taverna.scufl2.api.container.WorkflowBundle;
+import org.apache.taverna.scufl2.api.container.WorkflowBundle;
public class CopyWorkflowSwingWorker extends
SwingWorker<WorkflowBundle, String> {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-reference-ui/src/main/java/net/sf/taverna/t2/reference/ui/InvalidDataflowReport.java
----------------------------------------------------------------------
diff --git a/taverna-reference-ui/src/main/java/net/sf/taverna/t2/reference/ui/InvalidDataflowReport.java b/taverna-reference-ui/src/main/java/net/sf/taverna/t2/reference/ui/InvalidDataflowReport.java
index cd74614..e6101d4 100644
--- a/taverna-reference-ui/src/main/java/net/sf/taverna/t2/reference/ui/InvalidDataflowReport.java
+++ b/taverna-reference-ui/src/main/java/net/sf/taverna/t2/reference/ui/InvalidDataflowReport.java
@@ -8,10 +8,10 @@ import java.util.List;
import java.util.Map.Entry;
import java.util.Set;
-import net.sf.taverna.t2.workflowmodel.DataflowOutputPort;
-import net.sf.taverna.t2.workflowmodel.DataflowValidationReport;
-import net.sf.taverna.t2.workflowmodel.Datalink;
-import net.sf.taverna.t2.workflowmodel.TokenProcessingEntity;
+import org.apache.taverna.workflowmodel.DataflowOutputPort;
+import org.apache.taverna.workflowmodel.DataflowValidationReport;
+import org.apache.taverna.workflowmodel.Datalink;
+import org.apache.taverna.workflowmodel.TokenProcessingEntity;
// FIXME This is a t2flow-related class, not a scufl2-related one
public class InvalidDataflowReport {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-reference-ui/src/main/java/net/sf/taverna/t2/reference/ui/RegistrationPanel.java
----------------------------------------------------------------------
diff --git a/taverna-reference-ui/src/main/java/net/sf/taverna/t2/reference/ui/RegistrationPanel.java b/taverna-reference-ui/src/main/java/net/sf/taverna/t2/reference/ui/RegistrationPanel.java
index bd9bdef..c92629e 100644
--- a/taverna-reference-ui/src/main/java/net/sf/taverna/t2/reference/ui/RegistrationPanel.java
+++ b/taverna-reference-ui/src/main/java/net/sf/taverna/t2/reference/ui/RegistrationPanel.java
@@ -83,7 +83,7 @@ import net.sf.taverna.t2.reference.ui.tree.PreRegistrationTreeModel;
import org.apache.log4j.Logger;
-import uk.org.taverna.configuration.database.DatabaseConfiguration;
+import org.apache.taverna.configuration.database.DatabaseConfiguration;
/**
* A JPanel containing a pre-registration tree along with a toolbar for adding
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-reference-ui/src/main/java/net/sf/taverna/t2/reference/ui/WorkflowLaunchWindow.java
----------------------------------------------------------------------
diff --git a/taverna-reference-ui/src/main/java/net/sf/taverna/t2/reference/ui/WorkflowLaunchWindow.java b/taverna-reference-ui/src/main/java/net/sf/taverna/t2/reference/ui/WorkflowLaunchWindow.java
index f7469e2..5e30758 100644
--- a/taverna-reference-ui/src/main/java/net/sf/taverna/t2/reference/ui/WorkflowLaunchWindow.java
+++ b/taverna-reference-ui/src/main/java/net/sf/taverna/t2/reference/ui/WorkflowLaunchWindow.java
@@ -65,8 +65,8 @@ import javax.swing.JToolBar;
import javax.swing.border.EmptyBorder;
import javax.swing.border.TitledBorder;
-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.DialogTextArea;
import net.sf.taverna.t2.reference.ui.referenceactions.ReferenceActionSPI;
import net.sf.taverna.t2.workbench.edits.EditManager;
@@ -83,21 +83,21 @@ import org.apache.jena.riot.Lang;
import org.apache.jena.riot.RDFDataMgr;
import org.apache.jena.riot.RIOT;
import org.apache.log4j.Logger;
-import org.purl.wf4ever.robundle.Bundle;
-
-import uk.org.taverna.configuration.database.DatabaseConfiguration;
-import uk.org.taverna.databundle.DataBundles;
-import uk.org.taverna.scufl2.api.annotation.Annotation;
-import uk.org.taverna.scufl2.api.common.Scufl2Tools;
-import uk.org.taverna.scufl2.api.common.URITools;
-import uk.org.taverna.scufl2.api.common.WorkflowBean;
-import uk.org.taverna.scufl2.api.container.WorkflowBundle;
-import uk.org.taverna.scufl2.api.core.Workflow;
-import uk.org.taverna.scufl2.api.port.InputWorkflowPort;
+
+import org.apache.taverna.configuration.database.DatabaseConfiguration;
+import org.apache.taverna.databundle.DataBundles;
+import org.apache.taverna.scufl2.api.annotation.Annotation;
+import org.apache.taverna.scufl2.api.common.Scufl2Tools;
+import org.apache.taverna.scufl2.api.common.URITools;
+import org.apache.taverna.scufl2.api.common.WorkflowBean;
+import org.apache.taverna.scufl2.api.container.WorkflowBundle;
+import org.apache.taverna.scufl2.api.core.Workflow;
+import org.apache.taverna.scufl2.api.port.InputWorkflowPort;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.Property;
import com.hp.hpl.jena.rdf.model.Resource;
+import org.apache.taverna.robundle.Bundle;
/**
* A simple workflow launch window, uses a tabbed layout to display a set of named RegistrationPanel
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-reference-ui/src/main/java/net/sf/taverna/t2/reference/ui/referenceactions/LoadInputsFromXML.java
----------------------------------------------------------------------
diff --git a/taverna-reference-ui/src/main/java/net/sf/taverna/t2/reference/ui/referenceactions/LoadInputsFromXML.java b/taverna-reference-ui/src/main/java/net/sf/taverna/t2/reference/ui/referenceactions/LoadInputsFromXML.java
index 0d6ff2d..7ff95d0 100644
--- a/taverna-reference-ui/src/main/java/net/sf/taverna/t2/reference/ui/referenceactions/LoadInputsFromXML.java
+++ b/taverna-reference-ui/src/main/java/net/sf/taverna/t2/reference/ui/referenceactions/LoadInputsFromXML.java
@@ -21,7 +21,6 @@
package net.sf.taverna.t2.reference.ui.referenceactions;
import static javax.swing.JFileChooser.APPROVE_OPTION;
-import static net.sf.taverna.t2.baclava.factory.DataThingXMLFactory.parseDataDocument;
import static net.sf.taverna.t2.workbench.icons.WorkbenchIcons.xmlNodeIcon;
import java.awt.event.ActionEvent;
@@ -36,7 +35,6 @@ import java.util.prefs.Preferences;
import javax.swing.AbstractAction;
import javax.swing.JFileChooser;
-import net.sf.taverna.t2.baclava.DataThing;
import net.sf.taverna.t2.lang.ui.ExtensionFileFilter;
import net.sf.taverna.t2.reference.ui.RegistrationPanel;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-reference-ui/src/main/java/net/sf/taverna/t2/reference/ui/referenceactions/SaveInputsAsXML.java
----------------------------------------------------------------------
diff --git a/taverna-reference-ui/src/main/java/net/sf/taverna/t2/reference/ui/referenceactions/SaveInputsAsXML.java b/taverna-reference-ui/src/main/java/net/sf/taverna/t2/reference/ui/referenceactions/SaveInputsAsXML.java
index a7a51be..0b2fcd5 100644
--- a/taverna-reference-ui/src/main/java/net/sf/taverna/t2/reference/ui/referenceactions/SaveInputsAsXML.java
+++ b/taverna-reference-ui/src/main/java/net/sf/taverna/t2/reference/ui/referenceactions/SaveInputsAsXML.java
@@ -28,7 +28,6 @@ import static javax.swing.JOptionPane.YES_NO_OPTION;
import static javax.swing.JOptionPane.YES_OPTION;
import static javax.swing.JOptionPane.showConfirmDialog;
import static javax.swing.JOptionPane.showMessageDialog;
-import static net.sf.taverna.t2.baclava.factory.DataThingFactory.bake;
import static net.sf.taverna.t2.workbench.icons.WorkbenchIcons.xmlNodeIcon;
import static org.jdom.Namespace.getNamespace;
import static org.jdom.output.Format.getPrettyFormat;
@@ -44,8 +43,7 @@ import java.util.prefs.Preferences;
import javax.swing.AbstractAction;
import javax.swing.JFileChooser;
-import net.sf.taverna.t2.baclava.DataThing;
-import net.sf.taverna.t2.invocation.InvocationContext;
+import org.apache.taverna.invocation.InvocationContext;
import net.sf.taverna.t2.lang.ui.ExtensionFileFilter;
import net.sf.taverna.t2.reference.ui.RegistrationPanel;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-renderers-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-renderers-api/pom.xml b/taverna-renderers-api/pom.xml
index 0ad2c0d..db18143 100644
--- a/taverna-renderers-api/pom.xml
+++ b/taverna-renderers-api/pom.xml
@@ -28,9 +28,15 @@
<name>Apache Taverna Renderers API</name>
<dependencies>
<dependency>
- <groupId>org.apache.taverna.language</groupId>
- <artifactId>taverna-databundle</artifactId>
- <version>${taverna.language.version}</version>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>taverna-databundle</artifactId>
+ <version>${taverna.language.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>taverna-robundle</artifactId>
+ <version>${taverna.language.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-renderers-api/src/main/java/net/sf/taverna/t2/renderers/RendererUtils.java
----------------------------------------------------------------------
diff --git a/taverna-renderers-api/src/main/java/net/sf/taverna/t2/renderers/RendererUtils.java b/taverna-renderers-api/src/main/java/net/sf/taverna/t2/renderers/RendererUtils.java
index 6d61421..39a221f 100644
--- a/taverna-renderers-api/src/main/java/net/sf/taverna/t2/renderers/RendererUtils.java
+++ b/taverna-renderers-api/src/main/java/net/sf/taverna/t2/renderers/RendererUtils.java
@@ -20,10 +20,10 @@
******************************************************************************/
package net.sf.taverna.t2.renderers;
-import static org.purl.wf4ever.robundle.Bundles.getReference;
-import static org.purl.wf4ever.robundle.Bundles.getStringValue;
-import static org.purl.wf4ever.robundle.Bundles.isReference;
-import static uk.org.taverna.databundle.DataBundles.isValue;
+import static org.apache.taverna.robundle.Bundles.getReference;
+import static org.apache.taverna.robundle.Bundles.getStringValue;
+import static org.apache.taverna.robundle.Bundles.isReference;
+import static org.apache.taverna.databundle.DataBundles.isValue;
import java.io.IOException;
import java.io.InputStream;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-renderers-exts/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-renderers-exts/pom.xml b/taverna-renderers-exts/pom.xml
index 64f5523..d0d07ac 100644
--- a/taverna-renderers-exts/pom.xml
+++ b/taverna-renderers-exts/pom.xml
@@ -63,12 +63,18 @@
<artifactId>com.springsource.org.apache.commons.io</artifactId>
<version>${commons.io.version}</version>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.batik</groupId>
+ <artifactId>batik-osgi</artifactId>
+ <version>${batik.version}</version>
+ </dependency>
<dependency>
<groupId>org.icepdf</groupId>
<artifactId>icepdf-viewer</artifactId>
<version>${org.icepdf.version}</version>
</dependency>
+
</dependencies>
<packaging>bundle</packaging>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-renderers-exts/src/main/java/net/sf/taverna/t2/renderers/HTMLBrowserRenderer.java
----------------------------------------------------------------------
diff --git a/taverna-renderers-exts/src/main/java/net/sf/taverna/t2/renderers/HTMLBrowserRenderer.java b/taverna-renderers-exts/src/main/java/net/sf/taverna/t2/renderers/HTMLBrowserRenderer.java
index 048c728..879c695 100644
--- a/taverna-renderers-exts/src/main/java/net/sf/taverna/t2/renderers/HTMLBrowserRenderer.java
+++ b/taverna-renderers-exts/src/main/java/net/sf/taverna/t2/renderers/HTMLBrowserRenderer.java
@@ -33,7 +33,7 @@ import javax.swing.JEditorPane;
import org.apache.log4j.Logger;
-import uk.org.taverna.databundle.DataBundles;
+import org.apache.taverna.databundle.DataBundles;
/**
* Web browser renderer for MIME type text/html.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-renderers-exts/src/main/java/net/sf/taverna/t2/renderers/JMolRenderer.java
----------------------------------------------------------------------
diff --git a/taverna-renderers-exts/src/main/java/net/sf/taverna/t2/renderers/JMolRenderer.java b/taverna-renderers-exts/src/main/java/net/sf/taverna/t2/renderers/JMolRenderer.java
index e106a56..fd3d305 100644
--- a/taverna-renderers-exts/src/main/java/net/sf/taverna/t2/renderers/JMolRenderer.java
+++ b/taverna-renderers-exts/src/main/java/net/sf/taverna/t2/renderers/JMolRenderer.java
@@ -37,7 +37,7 @@ import org.jmol.api.JmolSimpleViewer;
import org.jmol.api.JmolViewer;
import org.jmol.viewer.Viewer;
-import uk.org.taverna.databundle.DataBundles;
+import org.apache.taverna.databundle.DataBundles;
/**
* Renders using the Jmol software for chemical structures
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-renderers-exts/src/main/java/net/sf/taverna/t2/renderers/SVGRenderer.java
----------------------------------------------------------------------
diff --git a/taverna-renderers-exts/src/main/java/net/sf/taverna/t2/renderers/SVGRenderer.java b/taverna-renderers-exts/src/main/java/net/sf/taverna/t2/renderers/SVGRenderer.java
index e8edd91..d88c042 100644
--- a/taverna-renderers-exts/src/main/java/net/sf/taverna/t2/renderers/SVGRenderer.java
+++ b/taverna-renderers-exts/src/main/java/net/sf/taverna/t2/renderers/SVGRenderer.java
@@ -34,7 +34,7 @@ import org.apache.batik.swing.JSVGCanvas;
import org.apache.commons.io.FileUtils;
import org.apache.log4j.Logger;
-import uk.org.taverna.databundle.DataBundles;
+import org.apache.taverna.databundle.DataBundles;
/**
* This class renders SVG Documents.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-renderers-exts/src/main/java/net/sf/taverna/t2/renderers/SeqVistaRenderer.java
----------------------------------------------------------------------
diff --git a/taverna-renderers-exts/src/main/java/net/sf/taverna/t2/renderers/SeqVistaRenderer.java b/taverna-renderers-exts/src/main/java/net/sf/taverna/t2/renderers/SeqVistaRenderer.java
index d4aaf5a..46910e7 100644
--- a/taverna-renderers-exts/src/main/java/net/sf/taverna/t2/renderers/SeqVistaRenderer.java
+++ b/taverna-renderers-exts/src/main/java/net/sf/taverna/t2/renderers/SeqVistaRenderer.java
@@ -30,7 +30,7 @@ import javax.swing.UIManager;
import org.apache.log4j.Logger;
-import uk.org.taverna.databundle.DataBundles;
+import org.apache.taverna.databundle.DataBundles;
import cht.svista.SeqVISTA;
/**
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ed0a8e1f/taverna-renderers-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-renderers-impl/pom.xml b/taverna-renderers-impl/pom.xml
index acbc457..d425140 100644
--- a/taverna-renderers-impl/pom.xml
+++ b/taverna-renderers-impl/pom.xml
@@ -42,6 +42,11 @@
</build>
<dependencies>
<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-renderers-api</artifactId>
<version>${project.parent.version}</version>
@@ -73,6 +78,5 @@
<version>${org.fife.ui.hexeditor.version}</version>
</dependency>
-
</dependencies>
</project>
[2/3] incubator-taverna-workbench git commit: more refactoring
Posted by re...@apache.org.
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,