You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2015/02/23 11:35:46 UTC
[31/58] [abbrv] incubator-taverna-plugin-component git commit:
org.apache.taverna.component.api.*
org.apache.taverna.component.api.*
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/commit/2421ba84
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/tree/2421ba84
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/diff/2421ba84
Branch: refs/heads/master
Commit: 2421ba84df2af2084cd2e496f7d34caca38866a4
Parents: 8b8dbce
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Sat Feb 21 19:24:01 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Sat Feb 21 19:24:01 2015 +0000
----------------------------------------------------------------------
...bstractSemanticAnnotationContextualView.java | 2 +-
.../annotation/AnnotateSemanticsMenuAction.java | 5 +-
.../AnnotationPropertyPanelFactory.java | 2 +-
.../DatatypePropertyPanelFactory.java | 2 +-
.../DateTimePropertyPanelFactory.java | 2 +-
.../FallbackPropertyPanelFactory.java | 2 +-
...jectPropertyWithIndividualsPanelFactory.java | 3 +-
.../annotation/PropertyPanelFactorySPI.java | 2 +-
.../SemanticAnnotationContextualView.java | 14 +-
...SemanticAnnotationContextualViewFactory.java | 5 +-
.../annotation/SemanticAnnotationPanel.java | 3 +-
.../annotation/SemanticAnnotationUtils.java | 7 +-
.../annotation/UnresolveablePredicatePanel.java | 2 +-
.../preference/ComponentPreference.java | 7 +-
.../ui/ComponentActivityConfigurationBean.java | 23 +--
.../ui/config/ComponentConfigurationPanel.java | 16 +-
.../ui/config/ComponentConfigureAction.java | 3 +-
.../ComponentDataflowHealthCheckExplainer.java | 3 +-
.../ui/file/ComponentDataflowHealthChecker.java | 10 +-
.../t2/component/ui/file/ComponentOpener.java | 8 +-
.../t2/component/ui/file/ComponentSaver.java | 14 +-
.../component/ui/file/FileManagerObserver.java | 2 +-
.../AbstractContextComponentMenuAction.java | 3 +-
.../ui/menu/ComponentConfigureMenuAction.java | 3 +-
...penComponentFromComponentActivityAction.java | 4 +-
...omponentFromComponentActivityMenuAction.java | 3 +-
.../ui/menu/ReplaceByComponentAction.java | 13 +-
.../ui/menu/ReplaceByComponentMenuAction.java | 3 +-
.../ui/menu/component/ComponentCopyAction.java | 10 +-
.../menu/component/ComponentCreatorSupport.java | 8 +-
.../menu/component/ComponentDeleteAction.java | 6 +-
.../ui/menu/component/ComponentMergeAction.java | 6 +-
.../menu/component/ComponentSearchAction.java | 8 +-
.../component/ComponentSearchMenuAction.java | 3 +-
.../ComponentServiceCreatorAction.java | 2 +-
.../ComponentWorkflowCreatorAction.java | 2 +-
.../OpenWorkflowFromComponentAction.java | 8 +-
.../family/ComponentFamilyCreateAction.java | 10 +-
.../family/ComponentFamilyDeleteAction.java | 8 +-
.../profile/ComponentProfileCopyAction.java | 10 +-
.../profile/ComponentProfileDeleteAction.java | 4 +-
.../profile/ComponentProfileImportAction.java | 12 +-
.../ComponentProfileImportMenuAction.java | 3 +-
.../ui/panel/ComponentChoiceMessage.java | 4 +-
.../ui/panel/ComponentChooserPanel.java | 6 +-
.../ui/panel/ComponentListCellRenderer.java | 8 +-
.../ui/panel/ComponentVersionChooserPanel.java | 8 +-
.../component/ui/panel/FamilyChoiceMessage.java | 2 +-
.../component/ui/panel/FamilyChooserPanel.java | 8 +-
.../component/ui/panel/LicenseChooserPanel.java | 6 +-
.../t2/component/ui/panel/PrefixPanel.java | 5 +-
.../ui/panel/ProfileChoiceMessage.java | 2 +-
.../component/ui/panel/ProfileChooserPanel.java | 6 +-
...stryAndFamilyChooserComponentEntryPanel.java | 7 +-
.../ui/panel/RegistryAndFamilyChooserPanel.java | 4 +-
.../ui/panel/RegistryChoiceMessage.java | 2 +-
.../ui/panel/RegistryChooserPanel.java | 2 +-
.../component/ui/panel/SearchChoicePanel.java | 8 +-
.../ui/panel/SharingPolicyChooserPanel.java | 6 +-
.../ui/preference/ComponentPreferencePanel.java | 6 +-
.../ui/preference/RegistryTableModel.java | 2 +-
.../serviceprovider/ComponentServiceDesc.java | 16 +-
.../ComponentServiceProvider.java | 16 +-
.../ComponentServiceProviderConfig.java | 9 +-
.../component/ui/util/ComponentHealthCheck.java | 6 +-
.../sf/taverna/t2/component/ui/util/Utils.java | 5 +-
.../ComponentActivityContextViewFactory.java | 5 +-
...itySemanticAnnotationContextViewFactory.java | 8 +-
...omponentActivitySemanticAnnotationPanel.java | 2 +-
.../ui/view/ComponentContextViewFactory.java | 5 +-
.../ui/view/ComponentContextualView.java | 3 +-
.../taverna/t2/component/ui/view/ViewUtil.java | 8 +-
.../spring/component-activity-context.xml | 4 +-
.../taverna/t2/component/ComponentActivity.java | 4 +-
.../ComponentActivityConfigurationBean.java | 18 +-
.../t2/component/ComponentActivityFactory.java | 4 +-
.../ComponentActivityUpgradeChecker.java | 2 +-
.../sf/taverna/t2/component/ProxyCallback.java | 6 +-
.../component/profile/ActivityProfileImpl.java | 5 +-
.../component/profile/BaseProfileLocator.java | 3 +-
.../component/profile/ComponentProfileImpl.java | 27 ++-
.../t2/component/profile/PortProfileImpl.java | 5 +-
.../profile/SemanticAnnotationProfileImpl.java | 2 +-
.../t2/component/registry/Component.java | 7 +-
.../t2/component/registry/ComponentFamily.java | 13 +-
.../registry/ComponentImplementationCache.java | 5 +-
.../component/registry/ComponentRegistry.java | 14 +-
.../t2/component/registry/ComponentUtil.java | 14 +-
.../t2/component/registry/ComponentVersion.java | 7 +-
.../ComponentVersionIdentification.java | 14 +-
.../registry/local/LocalComponent.java | 8 +-
.../registry/local/LocalComponentFamily.java | 8 +-
.../registry/local/LocalComponentRegistry.java | 12 +-
.../local/LocalComponentRegistryFactory.java | 4 +-
.../registry/local/LocalComponentVersion.java | 2 +-
.../t2/component/registry/standard/Client.java | 2 +-
.../registry/standard/NewComponent.java | 11 +-
.../registry/standard/NewComponentFamily.java | 9 +-
.../registry/standard/NewComponentLicense.java | 3 +-
.../registry/standard/NewComponentProfile.java | 3 +-
.../registry/standard/NewComponentRegistry.java | 16 +-
.../standard/NewComponentRegistryFactory.java | 2 +-
.../t2/component/registry/standard/Policy.java | 4 +-
.../taverna/t2/component/utils/SystemUtils.java | 3 +-
.../spring/component-activity-context.xml | 2 +-
.../component/registry/ComponentFamilyTest.java | 7 +-
.../registry/ComponentRegistryTest.java | 7 +-
.../t2/component/registry/ComponentTest.java | 9 +-
.../registry/ComponentVersionTest.java | 7 +-
.../taverna/t2/component/registry/Harness.java | 2 +-
.../local/LocalComponentRegistryTest.java | 2 +-
.../standard/NewComponentRegistryTest.java | 2 +-
.../registry/standard/RegistrySupport.java | 6 +-
.../sf/taverna/t2/component/api/Component.java | 71 -------
.../t2/component/api/ComponentException.java | 50 -----
.../t2/component/api/ComponentFactory.java | 27 ---
.../net/sf/taverna/t2/component/api/Family.java | 99 ---------
.../sf/taverna/t2/component/api/License.java | 12 --
.../sf/taverna/t2/component/api/NamedItem.java | 8 -
.../sf/taverna/t2/component/api/Registry.java | 139 -------------
.../taverna/t2/component/api/SharingPolicy.java | 17 --
.../sf/taverna/t2/component/api/Version.java | 206 -------------------
.../component/api/config/ComponentConfig.java | 5 -
.../api/config/ComponentPropertyNames.java | 14 --
.../taverna/t2/component/api/package-info.java | 6 -
.../component/api/profile/ActivityProfile.java | 5 -
.../component/api/profile/AnnotatedElement.java | 10 -
.../api/profile/ExceptionHandling.java | 32 ---
.../api/profile/ExceptionReplacement.java | 27 ---
.../component/api/profile/HandleException.java | 39 ----
.../t2/component/api/profile/PortProfile.java | 5 -
.../t2/component/api/profile/Profile.java | 47 -----
.../api/profile/SemanticAnnotationProfile.java | 54 -----
.../apache/taverna/component/api/Component.java | 71 +++++++
.../component/api/ComponentException.java | 50 +++++
.../taverna/component/api/ComponentFactory.java | 27 +++
.../apache/taverna/component/api/Family.java | 100 +++++++++
.../apache/taverna/component/api/License.java | 12 ++
.../apache/taverna/component/api/NamedItem.java | 8 +
.../apache/taverna/component/api/Registry.java | 139 +++++++++++++
.../taverna/component/api/SharingPolicy.java | 17 ++
.../apache/taverna/component/api/Version.java | 206 +++++++++++++++++++
.../component/api/config/ComponentConfig.java | 5 +
.../api/config/ComponentPropertyNames.java | 14 ++
.../taverna/component/api/package-info.java | 6 +
.../component/api/profile/ActivityProfile.java | 5 +
.../component/api/profile/AnnotatedElement.java | 10 +
.../api/profile/ExceptionHandling.java | 32 +++
.../api/profile/ExceptionReplacement.java | 27 +++
.../component/api/profile/HandleException.java | 39 ++++
.../component/api/profile/PortProfile.java | 5 +
.../taverna/component/api/profile/Profile.java | 47 +++++
.../api/profile/SemanticAnnotationProfile.java | 54 +++++
.../src/main/resources/ComponentProfile.xsd | 2 +-
154 files changed, 1249 insertions(+), 1226 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/AbstractSemanticAnnotationContextualView.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/AbstractSemanticAnnotationContextualView.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/AbstractSemanticAnnotationContextualView.java
index 045330b..93b07a2 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/AbstractSemanticAnnotationContextualView.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/AbstractSemanticAnnotationContextualView.java
@@ -30,11 +30,11 @@ import javax.swing.JPanel;
import javax.swing.JSeparator;
import javax.swing.SwingWorker;
-import net.sf.taverna.t2.component.api.profile.SemanticAnnotationProfile;
import net.sf.taverna.t2.workbench.file.FileManager;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.ContextualView;
import org.apache.log4j.Logger;
+import org.apache.taverna.component.api.profile.SemanticAnnotationProfile;
import uk.org.taverna.scufl2.api.common.AbstractNamed;
import uk.org.taverna.scufl2.api.common.Named;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/AnnotateSemanticsMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/AnnotateSemanticsMenuAction.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/AnnotateSemanticsMenuAction.java
index 9e6cf62..92d2935 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/AnnotateSemanticsMenuAction.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/AnnotateSemanticsMenuAction.java
@@ -21,11 +21,12 @@ import javax.swing.JDialog;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
+import org.apache.taverna.component.api.ComponentFactory;
+import org.apache.taverna.component.api.Version;
+
import uk.org.taverna.scufl2.api.activity.Activity;
import uk.org.taverna.scufl2.api.common.AbstractNamed;
import uk.org.taverna.scufl2.api.port.ActivityPort;
-import net.sf.taverna.t2.component.api.ComponentFactory;
-import net.sf.taverna.t2.component.api.Version;
import net.sf.taverna.t2.lang.ui.DeselectingButton;
import net.sf.taverna.t2.ui.menu.AbstractContextualMenuAction;
import net.sf.taverna.t2.workbench.file.FileManager;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/AnnotationPropertyPanelFactory.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/AnnotationPropertyPanelFactory.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/AnnotationPropertyPanelFactory.java
index 6c07e16..5f1ff0e 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/AnnotationPropertyPanelFactory.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/AnnotationPropertyPanelFactory.java
@@ -27,7 +27,7 @@ import static net.sf.taverna.t2.component.annotation.SemanticAnnotationUtils.get
import javax.swing.JComponent;
import javax.swing.JTextArea;
-import net.sf.taverna.t2.component.api.profile.SemanticAnnotationProfile;
+import org.apache.taverna.component.api.profile.SemanticAnnotationProfile;
import com.hp.hpl.jena.ontology.OntProperty;
import com.hp.hpl.jena.rdf.model.RDFNode;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/DatatypePropertyPanelFactory.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/DatatypePropertyPanelFactory.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/DatatypePropertyPanelFactory.java
index 84095b1..a8d6344 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/DatatypePropertyPanelFactory.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/DatatypePropertyPanelFactory.java
@@ -27,7 +27,7 @@ import static net.sf.taverna.t2.component.annotation.SemanticAnnotationUtils.get
import javax.swing.JComponent;
import javax.swing.JTextArea;
-import net.sf.taverna.t2.component.api.profile.SemanticAnnotationProfile;
+import org.apache.taverna.component.api.profile.SemanticAnnotationProfile;
import com.hp.hpl.jena.ontology.OntProperty;
import com.hp.hpl.jena.rdf.model.RDFNode;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/DateTimePropertyPanelFactory.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/DateTimePropertyPanelFactory.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/DateTimePropertyPanelFactory.java
index fb0acc2..566f49d 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/DateTimePropertyPanelFactory.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/DateTimePropertyPanelFactory.java
@@ -33,7 +33,7 @@ import javax.swing.JSpinner;
import javax.swing.SpinnerDateModel;
import javax.swing.text.DefaultCaret;
-import net.sf.taverna.t2.component.api.profile.SemanticAnnotationProfile;
+import org.apache.taverna.component.api.profile.SemanticAnnotationProfile;
import com.hp.hpl.jena.datatypes.xsd.XSDDateTime;
import com.hp.hpl.jena.ontology.OntProperty;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/FallbackPropertyPanelFactory.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/FallbackPropertyPanelFactory.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/FallbackPropertyPanelFactory.java
index 6555093..5b32370 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/FallbackPropertyPanelFactory.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/FallbackPropertyPanelFactory.java
@@ -6,7 +6,7 @@ package net.sf.taverna.t2.component.annotation;
import javax.swing.JComponent;
import javax.swing.JLabel;
-import net.sf.taverna.t2.component.api.profile.SemanticAnnotationProfile;
+import org.apache.taverna.component.api.profile.SemanticAnnotationProfile;
import com.hp.hpl.jena.rdf.model.RDFNode;
import com.hp.hpl.jena.rdf.model.Statement;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/ObjectPropertyWithIndividualsPanelFactory.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/ObjectPropertyWithIndividualsPanelFactory.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/ObjectPropertyWithIndividualsPanelFactory.java
index 94cfe6a..c6c27dd 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/ObjectPropertyWithIndividualsPanelFactory.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/ObjectPropertyWithIndividualsPanelFactory.java
@@ -47,8 +47,9 @@ import javax.swing.JList;
import javax.swing.JPanel;
import javax.swing.ListCellRenderer;
+import org.apache.taverna.component.api.profile.SemanticAnnotationProfile;
+
import net.sf.taverna.t2.component.localworld.LocalWorld;
-import net.sf.taverna.t2.component.api.profile.SemanticAnnotationProfile;
import net.sf.taverna.t2.lang.ui.DeselectingButton;
import com.hp.hpl.jena.ontology.Individual;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/PropertyPanelFactorySPI.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/PropertyPanelFactorySPI.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/PropertyPanelFactorySPI.java
index 4a47dbb..e9a9981 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/PropertyPanelFactorySPI.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/PropertyPanelFactorySPI.java
@@ -27,7 +27,7 @@ import javax.swing.JComponent;
import javax.swing.JTextArea;
import javax.swing.border.EmptyBorder;
-import net.sf.taverna.t2.component.api.profile.SemanticAnnotationProfile;
+import org.apache.taverna.component.api.profile.SemanticAnnotationProfile;
import com.hp.hpl.jena.rdf.model.RDFNode;
import com.hp.hpl.jena.rdf.model.Statement;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/SemanticAnnotationContextualView.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/SemanticAnnotationContextualView.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/SemanticAnnotationContextualView.java
index 8446192..b347252 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/SemanticAnnotationContextualView.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/SemanticAnnotationContextualView.java
@@ -26,16 +26,16 @@ import static org.apache.log4j.Logger.getLogger;
import java.util.ArrayList;
import java.util.List;
-import net.sf.taverna.t2.component.api.ComponentException;
-import net.sf.taverna.t2.component.api.ComponentFactory;
-import net.sf.taverna.t2.component.api.Family;
-import net.sf.taverna.t2.component.api.Registry;
-import net.sf.taverna.t2.component.api.Version;
-import net.sf.taverna.t2.component.api.profile.Profile;
-import net.sf.taverna.t2.component.api.profile.SemanticAnnotationProfile;
import net.sf.taverna.t2.workbench.file.FileManager;
import org.apache.log4j.Logger;
+import org.apache.taverna.component.api.ComponentException;
+import org.apache.taverna.component.api.ComponentFactory;
+import org.apache.taverna.component.api.Family;
+import org.apache.taverna.component.api.Registry;
+import org.apache.taverna.component.api.Version;
+import org.apache.taverna.component.api.profile.Profile;
+import org.apache.taverna.component.api.profile.SemanticAnnotationProfile;
import uk.org.taverna.scufl2.api.common.AbstractNamed;
import uk.org.taverna.scufl2.api.container.WorkflowBundle;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/SemanticAnnotationContextualViewFactory.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/SemanticAnnotationContextualViewFactory.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/SemanticAnnotationContextualViewFactory.java
index afe983b..448bd14 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/SemanticAnnotationContextualViewFactory.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/SemanticAnnotationContextualViewFactory.java
@@ -23,12 +23,13 @@ package net.sf.taverna.t2.component.annotation;
import java.util.Arrays;
import java.util.List;
+import org.apache.taverna.component.api.ComponentFactory;
+import org.apache.taverna.component.api.Version;
+
import uk.org.taverna.scufl2.api.activity.Activity;
import uk.org.taverna.scufl2.api.common.AbstractNamed;
import uk.org.taverna.scufl2.api.container.WorkflowBundle;
import uk.org.taverna.scufl2.api.port.ActivityPort;
-import net.sf.taverna.t2.component.api.ComponentFactory;
-import net.sf.taverna.t2.component.api.Version;
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;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/SemanticAnnotationPanel.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/SemanticAnnotationPanel.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/SemanticAnnotationPanel.java
index e049d32..98266f5 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/SemanticAnnotationPanel.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/SemanticAnnotationPanel.java
@@ -39,7 +39,8 @@ import javax.swing.JScrollPane;
import javax.swing.JTextArea;
import javax.swing.border.EmptyBorder;
-import net.sf.taverna.t2.component.api.profile.SemanticAnnotationProfile;
+import org.apache.taverna.component.api.profile.SemanticAnnotationProfile;
+
import net.sf.taverna.t2.lang.ui.DeselectingButton;
import com.hp.hpl.jena.ontology.OntProperty;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/SemanticAnnotationUtils.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/SemanticAnnotationUtils.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/SemanticAnnotationUtils.java
index c13990f..0fd8c27 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/SemanticAnnotationUtils.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/SemanticAnnotationUtils.java
@@ -31,11 +31,10 @@ import java.util.GregorianCalendar;
import java.util.HashSet;
import java.util.Set;
-import net.sf.taverna.t2.component.api.profile.Profile;
-import net.sf.taverna.t2.component.api.ComponentException;
-import net.sf.taverna.t2.component.api.profile.SemanticAnnotationProfile;
-
import org.apache.log4j.Logger;
+import org.apache.taverna.component.api.ComponentException;
+import org.apache.taverna.component.api.profile.Profile;
+import org.apache.taverna.component.api.profile.SemanticAnnotationProfile;
import uk.org.taverna.scufl2.api.annotation.Annotation;
import uk.org.taverna.scufl2.api.common.AbstractNamed;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/UnresolveablePredicatePanel.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/UnresolveablePredicatePanel.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/UnresolveablePredicatePanel.java
index dfad45b..8e369e1 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/UnresolveablePredicatePanel.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/annotation/UnresolveablePredicatePanel.java
@@ -10,7 +10,7 @@ import java.awt.BorderLayout;
import javax.swing.JLabel;
import javax.swing.JPanel;
-import net.sf.taverna.t2.component.api.profile.SemanticAnnotationProfile;
+import org.apache.taverna.component.api.profile.SemanticAnnotationProfile;
/**
* @author alanrw
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/preference/ComponentPreference.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/preference/ComponentPreference.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/preference/ComponentPreference.java
index a626ad0..0645c14 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/preference/ComponentPreference.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/preference/ComponentPreference.java
@@ -18,11 +18,10 @@ import java.util.Map.Entry;
import java.util.SortedMap;
import java.util.TreeMap;
-import net.sf.taverna.t2.component.api.ComponentFactory;
-import net.sf.taverna.t2.component.api.Registry;
-import net.sf.taverna.t2.component.api.ComponentException;
-
import org.apache.log4j.Logger;
+import org.apache.taverna.component.api.ComponentException;
+import org.apache.taverna.component.api.ComponentFactory;
+import org.apache.taverna.component.api.Registry;
import uk.org.taverna.configuration.AbstractConfigurable;
import uk.org.taverna.configuration.ConfigurationManager;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/ComponentActivityConfigurationBean.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/ComponentActivityConfigurationBean.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/ComponentActivityConfigurationBean.java
index 1971c43..81f3cc7 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/ComponentActivityConfigurationBean.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/ComponentActivityConfigurationBean.java
@@ -1,11 +1,11 @@
package net.sf.taverna.t2.component.ui;
-import static net.sf.taverna.t2.component.api.config.ComponentPropertyNames.COMPONENT_NAME;
-import static net.sf.taverna.t2.component.api.config.ComponentPropertyNames.COMPONENT_VERSION;
-import static net.sf.taverna.t2.component.api.config.ComponentPropertyNames.FAMILY_NAME;
-import static net.sf.taverna.t2.component.api.config.ComponentPropertyNames.REGISTRY_BASE;
import static net.sf.taverna.t2.component.ui.ComponentConstants.ACTIVITY_URI;
import static org.apache.log4j.Logger.getLogger;
+import static org.apache.taverna.component.api.config.ComponentPropertyNames.COMPONENT_NAME;
+import static org.apache.taverna.component.api.config.ComponentPropertyNames.COMPONENT_VERSION;
+import static org.apache.taverna.component.api.config.ComponentPropertyNames.FAMILY_NAME;
+import static org.apache.taverna.component.api.config.ComponentPropertyNames.REGISTRY_BASE;
import java.net.MalformedURLException;
import java.net.URL;
@@ -13,14 +13,13 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import net.sf.taverna.t2.component.api.Component;
-import net.sf.taverna.t2.component.api.ComponentException;
-import net.sf.taverna.t2.component.api.ComponentFactory;
-import net.sf.taverna.t2.component.api.Version;
-import net.sf.taverna.t2.component.api.config.ComponentPropertyNames;
-import net.sf.taverna.t2.component.api.profile.ExceptionHandling;
-
import org.apache.log4j.Logger;
+import org.apache.taverna.component.api.Component;
+import org.apache.taverna.component.api.ComponentException;
+import org.apache.taverna.component.api.ComponentFactory;
+import org.apache.taverna.component.api.Version;
+import org.apache.taverna.component.api.config.ComponentPropertyNames;
+import org.apache.taverna.component.api.profile.ExceptionHandling;
import uk.org.taverna.scufl2.api.activity.Activity;
import uk.org.taverna.scufl2.api.configurations.Configuration;
@@ -112,7 +111,7 @@ public class ComponentActivityConfigurationBean extends Version.Identifier {
.getComponentProfile().getExceptionHandling();
if (eh != null)
result.outputs.add(makeOutputDefinition(1, ERROR_CHANNEL));
- } catch (net.sf.taverna.t2.component.api.ComponentException e) {
+ } catch (org.apache.taverna.component.api.ComponentException e) {
logger.error("failed to get exception handling for family", e);
}
return result;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/config/ComponentConfigurationPanel.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/config/ComponentConfigurationPanel.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/config/ComponentConfigurationPanel.java
index e0a119b..169b170 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/config/ComponentConfigurationPanel.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/config/ComponentConfigurationPanel.java
@@ -1,12 +1,12 @@
package net.sf.taverna.t2.component.ui.config;
import static java.awt.event.ItemEvent.SELECTED;
-import static net.sf.taverna.t2.component.api.config.ComponentPropertyNames.COMPONENT_NAME;
-import static net.sf.taverna.t2.component.api.config.ComponentPropertyNames.COMPONENT_VERSION;
-import static net.sf.taverna.t2.component.api.config.ComponentPropertyNames.FAMILY_NAME;
-import static net.sf.taverna.t2.component.api.config.ComponentPropertyNames.REGISTRY_BASE;
import static net.sf.taverna.t2.component.ui.util.Utils.SHORT_STRING;
import static org.apache.log4j.Logger.getLogger;
+import static org.apache.taverna.component.api.config.ComponentPropertyNames.COMPONENT_NAME;
+import static org.apache.taverna.component.api.config.ComponentPropertyNames.COMPONENT_VERSION;
+import static org.apache.taverna.component.api.config.ComponentPropertyNames.FAMILY_NAME;
+import static org.apache.taverna.component.api.config.ComponentPropertyNames.REGISTRY_BASE;
import java.awt.GridBagConstraints;
import java.awt.GridLayout;
@@ -20,14 +20,14 @@ import java.util.SortedMap;
import javax.swing.JComboBox;
import javax.swing.JLabel;
-import net.sf.taverna.t2.component.api.Component;
-import net.sf.taverna.t2.component.api.ComponentException;
-import net.sf.taverna.t2.component.api.ComponentFactory;
-import net.sf.taverna.t2.component.api.Version;
import net.sf.taverna.t2.component.ui.panel.ComponentListCellRenderer;
import net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ActivityConfigurationPanel;
import org.apache.log4j.Logger;
+import org.apache.taverna.component.api.Component;
+import org.apache.taverna.component.api.ComponentException;
+import org.apache.taverna.component.api.ComponentFactory;
+import org.apache.taverna.component.api.Version;
import uk.org.taverna.commons.services.ServiceRegistry;
import uk.org.taverna.scufl2.api.activity.Activity;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/config/ComponentConfigureAction.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/config/ComponentConfigureAction.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/config/ComponentConfigureAction.java
index 58698c6..e6c46b9 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/config/ComponentConfigureAction.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/config/ComponentConfigureAction.java
@@ -3,7 +3,8 @@ package net.sf.taverna.t2.component.ui.config;
import java.awt.Frame;
import java.awt.event.ActionEvent;
-import net.sf.taverna.t2.component.api.ComponentFactory;
+import org.apache.taverna.component.api.ComponentFactory;
+
import net.sf.taverna.t2.servicedescriptions.ServiceDescriptionRegistry;
import net.sf.taverna.t2.workbench.activityicons.ActivityIconManager;
import net.sf.taverna.t2.workbench.edits.EditManager;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/file/ComponentDataflowHealthCheckExplainer.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/file/ComponentDataflowHealthCheckExplainer.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/file/ComponentDataflowHealthCheckExplainer.java
index 6f966d9..a625f29 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/file/ComponentDataflowHealthCheckExplainer.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/file/ComponentDataflowHealthCheckExplainer.java
@@ -15,7 +15,8 @@ import java.util.Set;
import javax.swing.JComponent;
import javax.swing.JTextArea;
-import net.sf.taverna.t2.component.api.profile.SemanticAnnotationProfile;
+import org.apache.taverna.component.api.profile.SemanticAnnotationProfile;
+
import net.sf.taverna.t2.component.ui.util.ComponentHealthCheck;
import net.sf.taverna.t2.visit.VisitKind;
import net.sf.taverna.t2.visit.VisitReport;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/file/ComponentDataflowHealthChecker.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/file/ComponentDataflowHealthChecker.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/file/ComponentDataflowHealthChecker.java
index 77f6251..3ae26c4 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/file/ComponentDataflowHealthChecker.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/file/ComponentDataflowHealthChecker.java
@@ -11,17 +11,17 @@ import static org.apache.log4j.Logger.getLogger;
import java.util.List;
import java.util.Set;
-import net.sf.taverna.t2.component.api.ComponentFactory;
-import net.sf.taverna.t2.component.api.Family;
-import net.sf.taverna.t2.component.api.ComponentException;
-import net.sf.taverna.t2.component.api.Version;
-import net.sf.taverna.t2.component.api.profile.SemanticAnnotationProfile;
import net.sf.taverna.t2.component.ui.util.ComponentHealthCheck;
import net.sf.taverna.t2.visit.VisitReport;
import net.sf.taverna.t2.workbench.file.FileManager;
import net.sf.taverna.t2.workflowmodel.health.HealthChecker;
import org.apache.log4j.Logger;
+import org.apache.taverna.component.api.ComponentException;
+import org.apache.taverna.component.api.ComponentFactory;
+import org.apache.taverna.component.api.Family;
+import org.apache.taverna.component.api.Version;
+import org.apache.taverna.component.api.profile.SemanticAnnotationProfile;
import uk.org.taverna.scufl2.api.container.WorkflowBundle;
import uk.org.taverna.scufl2.api.core.Workflow;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/file/ComponentOpener.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/file/ComponentOpener.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/file/ComponentOpener.java
index a1c31cd..4e200f3 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/file/ComponentOpener.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/file/ComponentOpener.java
@@ -9,10 +9,6 @@ import java.util.Arrays;
import java.util.Date;
import java.util.List;
-import net.sf.taverna.t2.component.api.ComponentException;
-import net.sf.taverna.t2.component.api.ComponentFactory;
-import net.sf.taverna.t2.component.api.Version;
-import net.sf.taverna.t2.component.api.Version.ID;
import net.sf.taverna.t2.workbench.file.AbstractDataflowPersistenceHandler;
import net.sf.taverna.t2.workbench.file.DataflowInfo;
import net.sf.taverna.t2.workbench.file.DataflowPersistenceHandler;
@@ -20,6 +16,10 @@ import net.sf.taverna.t2.workbench.file.FileType;
import net.sf.taverna.t2.workbench.file.exceptions.OpenException;
import org.apache.log4j.Logger;
+import org.apache.taverna.component.api.ComponentException;
+import org.apache.taverna.component.api.ComponentFactory;
+import org.apache.taverna.component.api.Version;
+import org.apache.taverna.component.api.Version.ID;
import uk.org.taverna.scufl2.api.container.WorkflowBundle;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/file/ComponentSaver.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/file/ComponentSaver.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/file/ComponentSaver.java
index 9751c6d..c2db36c 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/file/ComponentSaver.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/file/ComponentSaver.java
@@ -16,13 +16,6 @@ import java.util.List;
import javax.swing.JScrollPane;
import javax.swing.JTextArea;
-import net.sf.taverna.t2.component.api.Component;
-import net.sf.taverna.t2.component.api.ComponentFactory;
-import net.sf.taverna.t2.component.api.Family;
-import net.sf.taverna.t2.component.api.Registry;
-import net.sf.taverna.t2.component.api.ComponentException;
-import net.sf.taverna.t2.component.api.Version;
-import net.sf.taverna.t2.component.api.profile.SemanticAnnotationProfile;
import net.sf.taverna.t2.component.ui.serviceprovider.ComponentServiceProvider;
import net.sf.taverna.t2.workbench.file.AbstractDataflowPersistenceHandler;
import net.sf.taverna.t2.workbench.file.DataflowInfo;
@@ -31,6 +24,13 @@ import net.sf.taverna.t2.workbench.file.FileType;
import net.sf.taverna.t2.workbench.file.exceptions.SaveException;
import org.apache.log4j.Logger;
+import org.apache.taverna.component.api.Component;
+import org.apache.taverna.component.api.ComponentException;
+import org.apache.taverna.component.api.ComponentFactory;
+import org.apache.taverna.component.api.Family;
+import org.apache.taverna.component.api.Registry;
+import org.apache.taverna.component.api.Version;
+import org.apache.taverna.component.api.profile.SemanticAnnotationProfile;
import uk.org.taverna.scufl2.api.container.WorkflowBundle;
import uk.org.taverna.scufl2.validation.ValidationReport;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/file/FileManagerObserver.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/file/FileManagerObserver.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/file/FileManagerObserver.java
index 3fa679e..60da60f 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/file/FileManagerObserver.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/file/FileManagerObserver.java
@@ -11,7 +11,6 @@ import java.awt.Insets;
import javax.swing.border.Border;
-import net.sf.taverna.t2.component.api.Version;
import net.sf.taverna.t2.component.ui.util.Utils;
import net.sf.taverna.t2.lang.observer.Observable;
import net.sf.taverna.t2.lang.observer.Observer;
@@ -23,6 +22,7 @@ import net.sf.taverna.t2.workbench.models.graph.svg.SVGGraphController;
import net.sf.taverna.t2.workbench.views.graph.GraphViewComponent;
import org.apache.batik.swing.JSVGCanvas;
+import org.apache.taverna.component.api.Version;
import uk.org.taverna.scufl2.api.container.WorkflowBundle;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/AbstractContextComponentMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/AbstractContextComponentMenuAction.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/AbstractContextComponentMenuAction.java
index 484d846..510a910 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/AbstractContextComponentMenuAction.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/AbstractContextComponentMenuAction.java
@@ -2,7 +2,8 @@ package net.sf.taverna.t2.component.ui.menu;
import java.net.URI;
-import net.sf.taverna.t2.component.api.config.ComponentConfig;
+import org.apache.taverna.component.api.config.ComponentConfig;
+
import net.sf.taverna.t2.ui.menu.AbstractContextualMenuAction;
import uk.org.taverna.scufl2.api.activity.Activity;
import uk.org.taverna.scufl2.api.core.Processor;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/ComponentConfigureMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/ComponentConfigureMenuAction.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/ComponentConfigureMenuAction.java
index 6d1433b..ca7c88d 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/ComponentConfigureMenuAction.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/ComponentConfigureMenuAction.java
@@ -5,8 +5,9 @@ import static net.sf.taverna.t2.component.ui.ComponentConstants.ACTIVITY_URI;
import javax.swing.Action;
+import org.apache.taverna.component.api.ComponentFactory;
+
import uk.org.taverna.commons.services.ServiceRegistry;
-import net.sf.taverna.t2.component.api.ComponentFactory;
import net.sf.taverna.t2.component.ui.config.ComponentConfigureAction;
import net.sf.taverna.t2.servicedescriptions.ServiceDescriptionRegistry;
import net.sf.taverna.t2.workbench.activityicons.ActivityIconManager;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/OpenComponentFromComponentActivityAction.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/OpenComponentFromComponentActivityAction.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/OpenComponentFromComponentActivityAction.java
index dc204fe..a98af8d 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/OpenComponentFromComponentActivityAction.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/OpenComponentFromComponentActivityAction.java
@@ -8,8 +8,6 @@ import static org.apache.log4j.Logger.getLogger;
import java.awt.event.ActionEvent;
import java.net.MalformedURLException;
-import net.sf.taverna.t2.component.api.ComponentFactory;
-import net.sf.taverna.t2.component.api.Version;
import net.sf.taverna.t2.component.ui.ComponentAction;
import net.sf.taverna.t2.component.ui.ComponentActivityConfigurationBean;
import net.sf.taverna.t2.component.ui.serviceprovider.ComponentServiceIcon;
@@ -19,6 +17,8 @@ import net.sf.taverna.t2.workbench.file.exceptions.OpenException;
import net.sf.taverna.t2.workbench.views.graph.GraphViewComponent;
import org.apache.log4j.Logger;
+import org.apache.taverna.component.api.ComponentFactory;
+import org.apache.taverna.component.api.Version;
import uk.org.taverna.scufl2.api.activity.Activity;
import uk.org.taverna.scufl2.api.container.WorkflowBundle;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/OpenComponentFromComponentActivityMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/OpenComponentFromComponentActivityMenuAction.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/OpenComponentFromComponentActivityMenuAction.java
index 827660c..8d46720 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/OpenComponentFromComponentActivityMenuAction.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/OpenComponentFromComponentActivityMenuAction.java
@@ -7,9 +7,10 @@ import java.net.URI;
import javax.swing.Action;
+import org.apache.taverna.component.api.ComponentFactory;
+
import uk.org.taverna.scufl2.api.activity.Activity;
import uk.org.taverna.scufl2.api.core.Processor;
-import net.sf.taverna.t2.component.api.ComponentFactory;
import net.sf.taverna.t2.component.ui.serviceprovider.ComponentServiceIcon;
import net.sf.taverna.t2.ui.menu.AbstractContextualMenuAction;
import net.sf.taverna.t2.workbench.file.FileManager;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/ReplaceByComponentAction.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/ReplaceByComponentAction.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/ReplaceByComponentAction.java
index 3552115..8e8806a 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/ReplaceByComponentAction.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/ReplaceByComponentAction.java
@@ -10,9 +10,9 @@ import static javax.swing.JOptionPane.OK_CANCEL_OPTION;
import static javax.swing.JOptionPane.OK_OPTION;
import static javax.swing.JOptionPane.showConfirmDialog;
import static javax.swing.JOptionPane.showMessageDialog;
-import static net.sf.taverna.t2.component.api.config.ComponentPropertyNames.COMPONENT_NAME;
import static net.sf.taverna.t2.component.ui.ComponentActivityConfigurationBean.ignorableNames;
import static net.sf.taverna.t2.component.ui.util.Utils.uniqueName;
+import static org.apache.taverna.component.api.config.ComponentPropertyNames.COMPONENT_NAME;
import static uk.org.taverna.scufl2.api.common.Scufl2Tools.NESTED_WORKFLOW;
import java.awt.BorderLayout;
@@ -27,11 +27,12 @@ import javax.swing.JCheckBox;
import javax.swing.JPanel;
import javax.swing.JSeparator;
-import net.sf.taverna.t2.component.api.Component;
-import net.sf.taverna.t2.component.api.ComponentFactory;
-import net.sf.taverna.t2.component.api.Family;
-import net.sf.taverna.t2.component.api.Registry;
-import net.sf.taverna.t2.component.api.Version;
+import org.apache.taverna.component.api.Component;
+import org.apache.taverna.component.api.ComponentFactory;
+import org.apache.taverna.component.api.Family;
+import org.apache.taverna.component.api.Registry;
+import org.apache.taverna.component.api.Version;
+
import net.sf.taverna.t2.component.preference.ComponentPreference;
import net.sf.taverna.t2.component.ui.ComponentActivityConfigurationBean;
import net.sf.taverna.t2.component.ui.panel.ComponentChooserPanel;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/ReplaceByComponentMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/ReplaceByComponentMenuAction.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/ReplaceByComponentMenuAction.java
index f6c29ea..f2d5fb0 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/ReplaceByComponentMenuAction.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/ReplaceByComponentMenuAction.java
@@ -7,7 +7,8 @@ import java.net.URI;
import javax.swing.Action;
-import net.sf.taverna.t2.component.api.ComponentFactory;
+import org.apache.taverna.component.api.ComponentFactory;
+
import net.sf.taverna.t2.component.preference.ComponentPreference;
import net.sf.taverna.t2.component.ui.serviceprovider.ComponentServiceIcon;
import net.sf.taverna.t2.ui.menu.AbstractContextualMenuAction;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentCopyAction.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentCopyAction.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentCopyAction.java
index d36a819..696d53c 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentCopyAction.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentCopyAction.java
@@ -21,11 +21,6 @@ import javax.swing.AbstractAction;
import javax.swing.JPanel;
import javax.swing.border.TitledBorder;
-import net.sf.taverna.t2.component.api.Component;
-import net.sf.taverna.t2.component.api.ComponentException;
-import net.sf.taverna.t2.component.api.Family;
-import net.sf.taverna.t2.component.api.Version;
-import net.sf.taverna.t2.component.api.profile.Profile;
import net.sf.taverna.t2.component.preference.ComponentPreference;
import net.sf.taverna.t2.component.ui.panel.ComponentChoiceMessage;
import net.sf.taverna.t2.component.ui.panel.ComponentChooserPanel;
@@ -38,6 +33,11 @@ import net.sf.taverna.t2.lang.observer.Observable;
import net.sf.taverna.t2.lang.observer.Observer;
import org.apache.log4j.Logger;
+import org.apache.taverna.component.api.Component;
+import org.apache.taverna.component.api.ComponentException;
+import org.apache.taverna.component.api.Family;
+import org.apache.taverna.component.api.Version;
+import org.apache.taverna.component.api.profile.Profile;
/**
* @author alanrw
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentCreatorSupport.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentCreatorSupport.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentCreatorSupport.java
index 3612ccc..7c715bf 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentCreatorSupport.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentCreatorSupport.java
@@ -15,6 +15,10 @@ import java.util.List;
import java.util.Map;
import org.apache.log4j.Logger;
+import org.apache.taverna.component.api.Component;
+import org.apache.taverna.component.api.ComponentException;
+import org.apache.taverna.component.api.ComponentFactory;
+import org.apache.taverna.component.api.Version;
import org.jdom.Element;
import org.jdom.JDOMException;
@@ -27,10 +31,6 @@ 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 net.sf.taverna.t2.component.api.Component;
-import net.sf.taverna.t2.component.api.ComponentException;
-import net.sf.taverna.t2.component.api.ComponentFactory;
-import net.sf.taverna.t2.component.api.Version;
import net.sf.taverna.t2.component.preference.ComponentPreference;
import net.sf.taverna.t2.component.ui.ComponentActivityConfigurationBean;
import net.sf.taverna.t2.component.ui.panel.RegistryAndFamilyChooserComponentEntryPanel;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentDeleteAction.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentDeleteAction.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentDeleteAction.java
index a946499..b87eaba 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentDeleteAction.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentDeleteAction.java
@@ -19,9 +19,6 @@ import java.util.concurrent.ExecutionException;
import javax.swing.AbstractAction;
import javax.swing.SwingWorker;
-import net.sf.taverna.t2.component.api.Component;
-import net.sf.taverna.t2.component.api.ComponentException;
-import net.sf.taverna.t2.component.api.Version;
import net.sf.taverna.t2.component.preference.ComponentPreference;
import net.sf.taverna.t2.component.ui.panel.ComponentChooserPanel;
import net.sf.taverna.t2.component.ui.serviceprovider.ComponentServiceIcon;
@@ -30,6 +27,9 @@ import net.sf.taverna.t2.component.ui.util.Utils;
import net.sf.taverna.t2.workbench.file.FileManager;
import org.apache.log4j.Logger;
+import org.apache.taverna.component.api.Component;
+import org.apache.taverna.component.api.ComponentException;
+import org.apache.taverna.component.api.Version;
import uk.org.taverna.scufl2.api.configurations.Configuration;
import uk.org.taverna.scufl2.api.container.WorkflowBundle;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentMergeAction.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentMergeAction.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentMergeAction.java
index 66cdb5c..82f0b1e 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentMergeAction.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentMergeAction.java
@@ -21,9 +21,6 @@ import javax.swing.AbstractAction;
import javax.swing.JPanel;
import javax.swing.border.TitledBorder;
-import net.sf.taverna.t2.component.api.Component;
-import net.sf.taverna.t2.component.api.ComponentException;
-import net.sf.taverna.t2.component.api.Version;
import net.sf.taverna.t2.component.preference.ComponentPreference;
import net.sf.taverna.t2.component.ui.panel.ComponentChoiceMessage;
import net.sf.taverna.t2.component.ui.panel.ComponentChooserPanel;
@@ -33,6 +30,9 @@ import net.sf.taverna.t2.lang.observer.Observable;
import net.sf.taverna.t2.lang.observer.Observer;
import org.apache.log4j.Logger;
+import org.apache.taverna.component.api.Component;
+import org.apache.taverna.component.api.ComponentException;
+import org.apache.taverna.component.api.Version;
/**
* @author alanrw
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentSearchAction.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentSearchAction.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentSearchAction.java
index 28d202e..5574edd 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentSearchAction.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentSearchAction.java
@@ -26,10 +26,6 @@ import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTextArea;
-import net.sf.taverna.t2.component.api.ComponentFactory;
-import net.sf.taverna.t2.component.api.Registry;
-import net.sf.taverna.t2.component.api.Version;
-import net.sf.taverna.t2.component.api.profile.Profile;
import net.sf.taverna.t2.component.preference.ComponentPreference;
import net.sf.taverna.t2.component.ui.panel.PrefixPanel;
import net.sf.taverna.t2.component.ui.panel.ProfileChooserPanel;
@@ -42,6 +38,10 @@ import net.sf.taverna.t2.workbench.edits.EditManager;
import net.sf.taverna.t2.workbench.selection.SelectionManager;
import org.apache.log4j.Logger;
+import org.apache.taverna.component.api.ComponentFactory;
+import org.apache.taverna.component.api.Registry;
+import org.apache.taverna.component.api.Version;
+import org.apache.taverna.component.api.profile.Profile;
import uk.org.taverna.commons.services.ServiceRegistry;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentSearchMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentSearchMenuAction.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentSearchMenuAction.java
index 999b000..9695cf8 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentSearchMenuAction.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentSearchMenuAction.java
@@ -7,8 +7,9 @@ import java.net.URI;
import javax.swing.Action;
+import org.apache.taverna.component.api.ComponentFactory;
+
import uk.org.taverna.commons.services.ServiceRegistry;
-import net.sf.taverna.t2.component.api.ComponentFactory;
import net.sf.taverna.t2.component.preference.ComponentPreference;
import net.sf.taverna.t2.component.ui.serviceprovider.ComponentServiceIcon;
import net.sf.taverna.t2.ui.menu.MenuManager;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentServiceCreatorAction.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentServiceCreatorAction.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentServiceCreatorAction.java
index d2298c2..f5d0c87 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentServiceCreatorAction.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentServiceCreatorAction.java
@@ -12,12 +12,12 @@ import java.awt.event.ActionEvent;
import javax.swing.AbstractAction;
-import net.sf.taverna.t2.component.api.Version;
import net.sf.taverna.t2.component.ui.menu.component.ComponentCreatorSupport.CopiedProcessor;
import net.sf.taverna.t2.component.ui.serviceprovider.ComponentServiceIcon;
import net.sf.taverna.t2.workbench.selection.SelectionManager;
import org.apache.log4j.Logger;
+import org.apache.taverna.component.api.Version;
import com.fasterxml.jackson.databind.JsonNode;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentWorkflowCreatorAction.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentWorkflowCreatorAction.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentWorkflowCreatorAction.java
index 925f076..e186c10 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentWorkflowCreatorAction.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/ComponentWorkflowCreatorAction.java
@@ -9,7 +9,6 @@ import static org.apache.log4j.Logger.getLogger;
import java.awt.event.ActionEvent;
-import net.sf.taverna.t2.component.api.Version;
import net.sf.taverna.t2.component.ui.ComponentAction;
import net.sf.taverna.t2.component.ui.serviceprovider.ComponentServiceIcon;
import net.sf.taverna.t2.component.ui.util.Utils;
@@ -20,6 +19,7 @@ import net.sf.taverna.t2.workbench.file.events.FileManagerEvent;
import net.sf.taverna.t2.workbench.views.graph.GraphViewComponent;
import org.apache.log4j.Logger;
+import org.apache.taverna.component.api.Version;
import uk.org.taverna.scufl2.api.container.WorkflowBundle;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/OpenWorkflowFromComponentAction.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/OpenWorkflowFromComponentAction.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/OpenWorkflowFromComponentAction.java
index 9653e3b..41ac068 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/OpenWorkflowFromComponentAction.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/component/OpenWorkflowFromComponentAction.java
@@ -17,10 +17,6 @@ import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JOptionPane;
-import net.sf.taverna.t2.component.api.Component;
-import net.sf.taverna.t2.component.api.Family;
-import net.sf.taverna.t2.component.api.Registry;
-import net.sf.taverna.t2.component.api.Version;
import net.sf.taverna.t2.component.preference.ComponentPreference;
import net.sf.taverna.t2.component.ui.ComponentAction;
import net.sf.taverna.t2.component.ui.panel.ComponentChoiceMessage;
@@ -34,6 +30,10 @@ import net.sf.taverna.t2.workbench.file.exceptions.OpenException;
import net.sf.taverna.t2.workbench.views.graph.GraphViewComponent;
import org.apache.log4j.Logger;
+import org.apache.taverna.component.api.Component;
+import org.apache.taverna.component.api.Family;
+import org.apache.taverna.component.api.Registry;
+import org.apache.taverna.component.api.Version;
import uk.org.taverna.scufl2.api.container.WorkflowBundle;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/family/ComponentFamilyCreateAction.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/family/ComponentFamilyCreateAction.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/family/ComponentFamilyCreateAction.java
index bc49233..f2f421c 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/family/ComponentFamilyCreateAction.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/family/ComponentFamilyCreateAction.java
@@ -24,11 +24,6 @@ import javax.swing.JTextArea;
import javax.swing.JTextField;
import javax.swing.border.TitledBorder;
-import net.sf.taverna.t2.component.api.ComponentException;
-import net.sf.taverna.t2.component.api.License;
-import net.sf.taverna.t2.component.api.Registry;
-import net.sf.taverna.t2.component.api.SharingPolicy;
-import net.sf.taverna.t2.component.api.profile.Profile;
import net.sf.taverna.t2.component.preference.ComponentPreference;
import net.sf.taverna.t2.component.ui.panel.LicenseChooserPanel;
import net.sf.taverna.t2.component.ui.panel.ProfileChooserPanel;
@@ -37,6 +32,11 @@ import net.sf.taverna.t2.component.ui.panel.SharingPolicyChooserPanel;
import net.sf.taverna.t2.component.ui.serviceprovider.ComponentServiceIcon;
import org.apache.log4j.Logger;
+import org.apache.taverna.component.api.ComponentException;
+import org.apache.taverna.component.api.License;
+import org.apache.taverna.component.api.Registry;
+import org.apache.taverna.component.api.SharingPolicy;
+import org.apache.taverna.component.api.profile.Profile;
/**
* @author alanrw
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/family/ComponentFamilyDeleteAction.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/family/ComponentFamilyDeleteAction.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/family/ComponentFamilyDeleteAction.java
index e97c843..58ff4ce 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/family/ComponentFamilyDeleteAction.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/family/ComponentFamilyDeleteAction.java
@@ -25,10 +25,6 @@ import javax.swing.AbstractAction;
import javax.swing.JPanel;
import javax.swing.SwingWorker;
-import net.sf.taverna.t2.component.api.ComponentException;
-import net.sf.taverna.t2.component.api.Family;
-import net.sf.taverna.t2.component.api.Registry;
-import net.sf.taverna.t2.component.api.Version;
import net.sf.taverna.t2.component.preference.ComponentPreference;
import net.sf.taverna.t2.component.ui.panel.FamilyChooserPanel;
import net.sf.taverna.t2.component.ui.panel.RegistryChooserPanel;
@@ -38,6 +34,10 @@ import net.sf.taverna.t2.component.ui.util.Utils;
import net.sf.taverna.t2.workbench.file.FileManager;
import org.apache.log4j.Logger;
+import org.apache.taverna.component.api.ComponentException;
+import org.apache.taverna.component.api.Family;
+import org.apache.taverna.component.api.Registry;
+import org.apache.taverna.component.api.Version;
import uk.org.taverna.scufl2.api.configurations.Configuration;
import uk.org.taverna.scufl2.api.container.WorkflowBundle;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/profile/ComponentProfileCopyAction.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/profile/ComponentProfileCopyAction.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/profile/ComponentProfileCopyAction.java
index 802f382..a7acd82 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/profile/ComponentProfileCopyAction.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/profile/ComponentProfileCopyAction.java
@@ -20,12 +20,12 @@ import javax.swing.JPanel;
import javax.swing.border.TitledBorder;
import org.apache.log4j.Logger;
+import org.apache.taverna.component.api.ComponentException;
+import org.apache.taverna.component.api.License;
+import org.apache.taverna.component.api.Registry;
+import org.apache.taverna.component.api.SharingPolicy;
+import org.apache.taverna.component.api.profile.Profile;
-import net.sf.taverna.t2.component.api.License;
-import net.sf.taverna.t2.component.api.profile.Profile;
-import net.sf.taverna.t2.component.api.Registry;
-import net.sf.taverna.t2.component.api.ComponentException;
-import net.sf.taverna.t2.component.api.SharingPolicy;
import net.sf.taverna.t2.component.preference.ComponentPreference;
import net.sf.taverna.t2.component.ui.panel.LicenseChooserPanel;
import net.sf.taverna.t2.component.ui.panel.ProfileChooserPanel;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/profile/ComponentProfileDeleteAction.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/profile/ComponentProfileDeleteAction.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/profile/ComponentProfileDeleteAction.java
index 47d36ab..b5e7ed9 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/profile/ComponentProfileDeleteAction.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/profile/ComponentProfileDeleteAction.java
@@ -21,14 +21,14 @@ import javax.swing.AbstractAction;
import javax.swing.JPanel;
import javax.swing.border.TitledBorder;
-import net.sf.taverna.t2.component.api.ComponentException;
-import net.sf.taverna.t2.component.api.profile.Profile;
import net.sf.taverna.t2.component.preference.ComponentPreference;
import net.sf.taverna.t2.component.ui.panel.ProfileChooserPanel;
import net.sf.taverna.t2.component.ui.panel.RegistryChooserPanel;
import net.sf.taverna.t2.component.ui.serviceprovider.ComponentServiceIcon;
import org.apache.log4j.Logger;
+import org.apache.taverna.component.api.ComponentException;
+import org.apache.taverna.component.api.profile.Profile;
/**
* @author alanrw
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/profile/ComponentProfileImportAction.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/profile/ComponentProfileImportAction.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/profile/ComponentProfileImportAction.java
index 50df661..dfc5d99 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/profile/ComponentProfileImportAction.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/profile/ComponentProfileImportAction.java
@@ -28,12 +28,6 @@ import javax.swing.JPanel;
import javax.swing.JTextField;
import javax.swing.filechooser.FileNameExtensionFilter;
-import net.sf.taverna.t2.component.api.ComponentException;
-import net.sf.taverna.t2.component.api.ComponentFactory;
-import net.sf.taverna.t2.component.api.License;
-import net.sf.taverna.t2.component.api.Registry;
-import net.sf.taverna.t2.component.api.SharingPolicy;
-import net.sf.taverna.t2.component.api.profile.Profile;
import net.sf.taverna.t2.component.preference.ComponentPreference;
import net.sf.taverna.t2.component.ui.panel.LicenseChooserPanel;
import net.sf.taverna.t2.component.ui.panel.RegistryChooserPanel;
@@ -42,6 +36,12 @@ import net.sf.taverna.t2.component.ui.serviceprovider.ComponentServiceIcon;
import net.sf.taverna.t2.lang.ui.DeselectingButton;
import org.apache.log4j.Logger;
+import org.apache.taverna.component.api.ComponentException;
+import org.apache.taverna.component.api.ComponentFactory;
+import org.apache.taverna.component.api.License;
+import org.apache.taverna.component.api.Registry;
+import org.apache.taverna.component.api.SharingPolicy;
+import org.apache.taverna.component.api.profile.Profile;
/**
* @author alanrw
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/profile/ComponentProfileImportMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/profile/ComponentProfileImportMenuAction.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/profile/ComponentProfileImportMenuAction.java
index 8c7f482..160c70d 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/profile/ComponentProfileImportMenuAction.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/menu/profile/ComponentProfileImportMenuAction.java
@@ -9,7 +9,8 @@ import java.net.URI;
import javax.swing.Action;
-import net.sf.taverna.t2.component.api.ComponentFactory;
+import org.apache.taverna.component.api.ComponentFactory;
+
import net.sf.taverna.t2.component.preference.ComponentPreference;
import net.sf.taverna.t2.component.ui.serviceprovider.ComponentServiceIcon;
import net.sf.taverna.t2.ui.menu.AbstractMenuAction;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/ComponentChoiceMessage.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/ComponentChoiceMessage.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/ComponentChoiceMessage.java
index 4de9295..e74c362 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/ComponentChoiceMessage.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/ComponentChoiceMessage.java
@@ -3,8 +3,8 @@
*/
package net.sf.taverna.t2.component.ui.panel;
-import net.sf.taverna.t2.component.api.Component;
-import net.sf.taverna.t2.component.api.Family;
+import org.apache.taverna.component.api.Component;
+import org.apache.taverna.component.api.Family;
/**
* @author alanrw
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/ComponentChooserPanel.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/ComponentChooserPanel.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/ComponentChooserPanel.java
index 0e4fe68..344962f 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/ComponentChooserPanel.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/ComponentChooserPanel.java
@@ -24,14 +24,14 @@ import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.SwingWorker;
-import net.sf.taverna.t2.component.api.Component;
-import net.sf.taverna.t2.component.api.Family;
-import net.sf.taverna.t2.component.api.Registry;
import net.sf.taverna.t2.component.preference.ComponentPreference;
import net.sf.taverna.t2.lang.observer.Observable;
import net.sf.taverna.t2.lang.observer.Observer;
import org.apache.log4j.Logger;
+import org.apache.taverna.component.api.Component;
+import org.apache.taverna.component.api.Family;
+import org.apache.taverna.component.api.Registry;
/**
* @author alanrw
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/ComponentListCellRenderer.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/ComponentListCellRenderer.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/ComponentListCellRenderer.java
index 1446faf..a4c2121 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/ComponentListCellRenderer.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/ComponentListCellRenderer.java
@@ -7,10 +7,10 @@ import javax.swing.DefaultListCellRenderer;
import javax.swing.JList;
import javax.swing.ListCellRenderer;
-import net.sf.taverna.t2.component.api.Component;
-import net.sf.taverna.t2.component.api.Family;
-import net.sf.taverna.t2.component.api.Registry;
-import net.sf.taverna.t2.component.api.Version;
+import org.apache.taverna.component.api.Component;
+import org.apache.taverna.component.api.Family;
+import org.apache.taverna.component.api.Registry;
+import org.apache.taverna.component.api.Version;
/**
* @author alanrw
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/ComponentVersionChooserPanel.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/ComponentVersionChooserPanel.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/ComponentVersionChooserPanel.java
index f36c99a..58f42fd 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/ComponentVersionChooserPanel.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/ComponentVersionChooserPanel.java
@@ -23,15 +23,15 @@ import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.SwingWorker;
-import net.sf.taverna.t2.component.api.Component;
-import net.sf.taverna.t2.component.api.Family;
-import net.sf.taverna.t2.component.api.Registry;
-import net.sf.taverna.t2.component.api.Version;
import net.sf.taverna.t2.component.preference.ComponentPreference;
import net.sf.taverna.t2.lang.observer.Observable;
import net.sf.taverna.t2.lang.observer.Observer;
import org.apache.log4j.Logger;
+import org.apache.taverna.component.api.Component;
+import org.apache.taverna.component.api.Family;
+import org.apache.taverna.component.api.Registry;
+import org.apache.taverna.component.api.Version;
/**
* @author alanrw
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/FamilyChoiceMessage.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/FamilyChoiceMessage.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/FamilyChoiceMessage.java
index adc0306..75ce6c0 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/FamilyChoiceMessage.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/FamilyChoiceMessage.java
@@ -3,7 +3,7 @@
*/
package net.sf.taverna.t2.component.ui.panel;
-import net.sf.taverna.t2.component.api.Family;
+import org.apache.taverna.component.api.Family;
/**
* @author alanrw
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/FamilyChooserPanel.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/FamilyChooserPanel.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/FamilyChooserPanel.java
index e8b7438..262bb5c 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/FamilyChooserPanel.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/FamilyChooserPanel.java
@@ -25,14 +25,14 @@ import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.SwingWorker;
-import net.sf.taverna.t2.component.api.ComponentException;
-import net.sf.taverna.t2.component.api.Family;
-import net.sf.taverna.t2.component.api.Registry;
-import net.sf.taverna.t2.component.api.profile.Profile;
import net.sf.taverna.t2.lang.observer.Observable;
import net.sf.taverna.t2.lang.observer.Observer;
import org.apache.log4j.Logger;
+import org.apache.taverna.component.api.ComponentException;
+import org.apache.taverna.component.api.Family;
+import org.apache.taverna.component.api.Registry;
+import org.apache.taverna.component.api.profile.Profile;
/**
* @author alanrw
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/LicenseChooserPanel.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/LicenseChooserPanel.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/LicenseChooserPanel.java
index 68e7011..cdec8b9 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/LicenseChooserPanel.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/LicenseChooserPanel.java
@@ -41,13 +41,13 @@ import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.SwingWorker;
-import net.sf.taverna.t2.component.api.ComponentException;
-import net.sf.taverna.t2.component.api.License;
-import net.sf.taverna.t2.component.api.Registry;
import net.sf.taverna.t2.lang.observer.Observable;
import net.sf.taverna.t2.lang.observer.Observer;
import org.apache.log4j.Logger;
+import org.apache.taverna.component.api.ComponentException;
+import org.apache.taverna.component.api.License;
+import org.apache.taverna.component.api.Registry;
/**
* @author alanrw
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/PrefixPanel.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/PrefixPanel.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/PrefixPanel.java
index 51c51b5..34b3485 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/PrefixPanel.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/PrefixPanel.java
@@ -17,8 +17,9 @@ import javax.swing.JScrollPane;
import javax.swing.JTable;
import javax.swing.table.DefaultTableModel;
-import net.sf.taverna.t2.component.api.ComponentException;
-import net.sf.taverna.t2.component.api.profile.Profile;
+import org.apache.taverna.component.api.ComponentException;
+import org.apache.taverna.component.api.profile.Profile;
+
import net.sf.taverna.t2.lang.observer.Observable;
import net.sf.taverna.t2.lang.observer.Observer;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/2421ba84/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/ProfileChoiceMessage.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/ProfileChoiceMessage.java b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/ProfileChoiceMessage.java
index a5cb21e..eabad3b 100644
--- a/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/ProfileChoiceMessage.java
+++ b/taverna-component-activity-ui/src/main/java/net/sf/taverna/t2/component/ui/panel/ProfileChoiceMessage.java
@@ -3,7 +3,7 @@
*/
package net.sf.taverna.t2.component.ui.panel;
-import net.sf.taverna.t2.component.api.profile.Profile;
+import org.apache.taverna.component.api.profile.Profile;
/**
* @author alanrw