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 2018/06/29 10:54:53 UTC

[06/27] incubator-taverna-plugin-component git commit: package name -> io.github.taverna_extras.component.*

package name -> io.github.taverna_extras.component.*


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/66649799
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/tree/66649799
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/diff/66649799

Branch: refs/heads/master
Commit: 666497993c6991debdef249991035bbf21eedd21
Parents: 09a209b
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Jun 29 11:50:14 2018 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Jun 29 11:50:14 2018 +0100

----------------------------------------------------------------------
 .../taverna/component/ui/ComponentAction.java   |   4 +-
 .../ui/ComponentActivityConfigurationBean.java  |  26 ++---
 .../component/ui/ComponentConstants.java        |   2 +-
 ...bstractSemanticAnnotationContextualView.java |   8 +-
 .../annotation/AnnotateSemanticsMenuAction.java |   6 +-
 .../AnnotationPropertyPanelFactory.java         |   6 +-
 .../DatatypePropertyPanelFactory.java           |   6 +-
 .../DateTimePropertyPanelFactory.java           |   4 +-
 .../FallbackPropertyPanelFactory.java           |   4 +-
 .../component/ui/annotation/GreyBorder.java     |   2 +-
 ...jectPropertyWithIndividualsPanelFactory.java |   8 +-
 .../ui/annotation/PropertyPanelFactorySPI.java  |   6 +-
 .../SemanticAnnotationContextualView.java       |  16 +--
 ...SemanticAnnotationContextualViewFactory.java |   6 +-
 .../ui/annotation/SemanticAnnotationPanel.java  |   8 +-
 .../ui/annotation/SemanticAnnotationUtils.java  |   8 +-
 .../ui/annotation/TurtleContextualView.java     |   6 +-
 .../ui/annotation/TurtleInputPanel.java         |   4 +-
 .../annotation/UnrecognizedStatementPanel.java  |   2 +-
 .../annotation/UnresolveablePredicatePanel.java |   4 +-
 .../ui/config/ComponentConfigurationPanel.java  |  22 ++--
 .../ui/config/ComponentConfigureAction.java     |   4 +-
 .../ComponentDataflowHealthCheckExplainer.java  |  10 +-
 .../ui/file/ComponentDataflowHealthChecker.java |  18 ++--
 .../component/ui/file/ComponentOpener.java      |  10 +-
 .../component/ui/file/ComponentSaver.java       |  20 ++--
 .../component/ui/file/FileManagerObserver.java  |  10 +-
 .../component/ui/localworld/LocalWorld.java     |   6 +-
 .../AbstractContextComponentMenuAction.java     |   4 +-
 .../ui/menu/ComponentConfigureMenuAction.java   |   8 +-
 .../component/ui/menu/ComponentMenu.java        |   2 +-
 .../component/ui/menu/ComponentSection.java     |   2 +-
 .../ui/menu/NestedWorkflowCreationDialog.java   |   4 +-
 .../menu/NestedWorkflowCreatorMenuAction.java   |   2 +-
 ...penComponentFromComponentActivityAction.java |  12 +--
 ...omponentFromComponentActivityMenuAction.java |   6 +-
 .../ui/menu/ReplaceByComponentAction.java       |  28 ++---
 .../ui/menu/ReplaceByComponentMenuAction.java   |   8 +-
 .../component/AbstractComponentMenuAction.java  |   4 +-
 .../ui/menu/component/ComponentCloseAction.java |   6 +-
 .../component/ComponentCloseMenuAction.java     |   6 +-
 .../ui/menu/component/ComponentCopyAction.java  |  28 ++---
 .../menu/component/ComponentCopyMenuAction.java |   8 +-
 .../menu/component/ComponentCreatorSupport.java |  20 ++--
 .../menu/component/ComponentDeleteAction.java   |  18 ++--
 .../component/ComponentDeleteMenuAction.java    |   8 +-
 .../ui/menu/component/ComponentMenuAction.java  |   4 +-
 .../ui/menu/component/ComponentMenuSection.java |   4 +-
 .../ui/menu/component/ComponentMergeAction.java |  18 ++--
 .../component/ComponentMergeMenuAction.java     |   6 +-
 .../ui/menu/component/ComponentSaveAction.java  |   6 +-
 .../menu/component/ComponentSaveMenuAction.java |   6 +-
 .../menu/component/ComponentSearchAction.java   |  24 ++---
 .../component/ComponentSearchMenuAction.java    |   8 +-
 .../ComponentServiceCreatorAction.java          |   8 +-
 .../ComponentServiceCreatorMenuAction.java      |   6 +-
 .../ComponentWorkflowCreatorAction.java         |  10 +-
 .../ComponentWorkflowCreatorMenuAction.java     |   6 +-
 .../FileOpenFromComponentMenuAction.java        |   6 +-
 .../OpenWorkflowFromComponentAction.java        |  20 ++--
 .../family/ComponentFamilyCreateAction.java     |  24 ++---
 .../family/ComponentFamilyCreateMenuAction.java |   8 +-
 .../family/ComponentFamilyDeleteAction.java     |  22 ++--
 .../family/ComponentFamilyDeleteMenuAction.java |   8 +-
 .../menu/family/ComponentFamilyMenuSection.java |   4 +-
 .../profile/ComponentProfileCopyAction.java     |  24 ++---
 .../profile/ComponentProfileCopyMenuAction.java |   8 +-
 .../profile/ComponentProfileDeleteAction.java   |  14 +--
 .../ComponentProfileDeleteMenuAction.java       |   8 +-
 .../profile/ComponentProfileImportAction.java   |  24 ++---
 .../ComponentProfileImportMenuAction.java       |  10 +-
 .../profile/ComponentProfileMenuSection.java    |   4 +-
 .../registry/ComponentRegistryManageAction.java |   6 +-
 .../ComponentRegistryManageMenuAction.java      |   6 +-
 .../registry/ComponentRegistryMenuSection.java  |   4 +-
 .../ui/panel/ComponentChoiceMessage.java        |   6 +-
 .../ui/panel/ComponentChooserPanel.java         |  12 +--
 .../ui/panel/ComponentListCellRenderer.java     |  10 +-
 .../ui/panel/ComponentVersionChooserPanel.java  |  14 +--
 .../component/ui/panel/FamilyChoiceMessage.java |   4 +-
 .../component/ui/panel/FamilyChooserPanel.java  |  12 +--
 .../component/ui/panel/LicenseChooserPanel.java |  10 +-
 .../taverna/component/ui/panel/PrefixPanel.java |   6 +-
 .../ui/panel/ProfileChoiceMessage.java          |   4 +-
 .../component/ui/panel/ProfileChooserPanel.java |  10 +-
 ...stryAndFamilyChooserComponentEntryPanel.java |  10 +-
 .../ui/panel/RegistryAndFamilyChooserPanel.java |   8 +-
 .../ui/panel/RegistryChoiceMessage.java         |   4 +-
 .../ui/panel/RegistryChooserPanel.java          |   8 +-
 .../component/ui/panel/SearchChoicePanel.java   |  14 +--
 .../ui/panel/SharingPolicyChooserPanel.java     |  10 +-
 .../ui/preference/ComponentDefaults.java        |   2 +-
 .../ui/preference/ComponentPreference.java      |  12 +--
 .../ui/preference/ComponentPreferencePanel.java |  10 +-
 .../ComponentPreferenceUIFactory.java           |   2 +-
 .../ui/preference/LocalRegistryPanel.java       |   2 +-
 .../ui/preference/RegistryTableModel.java       |   4 +-
 .../ui/preference/RemoteRegistryPanel.java      |   2 +-
 .../serviceprovider/ComponentServiceDesc.java   |  22 ++--
 .../serviceprovider/ComponentServiceIcon.java   |   4 +-
 .../ComponentServiceProvider.java               |  26 ++---
 .../ComponentServiceProviderConfig.java         |  12 +--
 .../component/ui/serviceprovider/Service.java   |   2 +-
 .../component/ui/util/ComponentFileType.java    |   2 +-
 .../component/ui/util/ComponentHealthCheck.java |  10 +-
 .../apache/taverna/component/ui/util/Utils.java |  14 +--
 .../ComponentActivityContextViewFactory.java    |   8 +-
 ...itySemanticAnnotationContextViewFactory.java |  14 +--
 ...omponentActivitySemanticAnnotationPanel.java |   8 +-
 .../ui/view/ComponentContextViewFactory.java    |   6 +-
 .../ui/view/ComponentContextualView.java        |   6 +-
 .../taverna/component/ui/view/ViewUtil.java     |  12 +--
 ...t2.workbench.report.explainer.VisitExplainer |   2 +-
 ...ponent.ui.annotation.PropertyPanelFactorySPI |  10 +-
 .../spring/component-activity-context.xml       | 106 +++++++++----------
 .../component/activity/ComponentActivity.java   |  14 +--
 .../ComponentActivityConfigurationBean.java     |  26 ++---
 .../activity/ComponentActivityFactory.java      |  14 +--
 .../activity/ComponentActivityLocalChecker.java |   4 +-
 .../ComponentActivityUpgradeChecker.java        |   8 +-
 .../activity/ComponentExceptionFactory.java     |   2 +-
 .../activity/ComponentHealthCheck.java          |   2 +-
 .../ComponentImplementationException.java       |   2 +-
 .../component/activity/ProxyCallback.java       |   8 +-
 .../component/activity/package-info.java        |   2 +-
 .../component/profile/ActivityProfileImpl.java  |  10 +-
 .../component/profile/BaseProfileLocator.java   |   4 +-
 .../component/profile/ComponentProfileImpl.java |  40 +++----
 .../component/profile/PortProfileImpl.java      |  10 +-
 .../profile/SemanticAnnotationProfileImpl.java  |   6 +-
 .../component/registry/ClientVersion.java       |   2 +-
 .../taverna/component/registry/Component.java   |   8 +-
 .../component/registry/ComponentFamily.java     |  14 +--
 .../registry/ComponentImplementationCache.java  |   6 +-
 .../component/registry/ComponentRegistry.java   |  16 +--
 .../component/registry/ComponentUtil.java       |  24 ++---
 .../component/registry/ComponentVersion.java    |   8 +-
 .../ComponentVersionIdentification.java         |  16 +--
 .../registry/local/LocalComponent.java          |  16 +--
 .../registry/local/LocalComponentFamily.java    |  18 ++--
 .../registry/local/LocalComponentRegistry.java  |  22 ++--
 .../local/LocalComponentRegistryFactory.java    |  10 +-
 .../registry/local/LocalComponentVersion.java   |  10 +-
 .../component/registry/standard/Client.java     |  10 +-
 .../registry/standard/NewComponent.java         |  30 +++---
 .../registry/standard/NewComponentFamily.java   |  20 ++--
 .../registry/standard/NewComponentLicense.java  |   6 +-
 .../registry/standard/NewComponentProfile.java  |  14 +--
 .../registry/standard/NewComponentRegistry.java |  58 +++++-----
 .../standard/NewComponentRegistryFactory.java   |  16 +--
 .../component/registry/standard/Policy.java     |  12 +--
 .../registry/standard/annotations/Unused.java   |   2 +-
 .../standard/annotations/package-info.java      |   2 +-
 .../registry/standard/package-info.java         |   2 +-
 .../component/utils/AnnotationUtils.java        |   2 +-
 .../taverna/component/utils/SystemUtils.java    |   6 +-
 .../src/main/resources/EmptyProfile.xml         |   2 +-
 .../spring/component-activity-context.xml       |  22 ++--
 .../main/resources/NewMyExperimentSchema.xsd    |   2 +-
 .../taverna/component/AnnotationTest.java       |   4 +-
 .../component/ComponentActivityTest.java        |   8 +-
 .../component/registry/ComponentFamilyTest.java |   8 +-
 .../registry/ComponentRegistryTest.java         |   8 +-
 .../component/registry/ComponentTest.java       |  10 +-
 .../registry/ComponentVersionTest.java          |   8 +-
 .../taverna/component/registry/Harness.java     |   6 +-
 .../local/LocalComponentFamilyTest.java         |   4 +-
 .../local/LocalComponentRegistryTest.java       |   6 +-
 .../registry/local/LocalComponentTest.java      |   4 +-
 .../local/LocalComponentVersionTest.java        |   4 +-
 .../registry/local/RegistrySupport.java         |   8 +-
 .../standard/NewComponentFamilyTest.java        |   4 +-
 .../standard/NewComponentRegistryTest.java      |  12 +--
 .../registry/standard/NewComponentTest.java     |   4 +-
 .../standard/NewComponentVersionTest.java       |   4 +-
 .../registry/standard/RegistrySupport.java      |  20 ++--
 ...rity.credentialmanager.CredentialProviderSPI |   2 +-
 taverna-component-repository-api/pom.xml        |   2 +-
 .../apache/taverna/component/api/Component.java |   2 +-
 .../component/api/ComponentException.java       |   2 +-
 .../taverna/component/api/ComponentFactory.java |   4 +-
 .../apache/taverna/component/api/Family.java    |   4 +-
 .../apache/taverna/component/api/License.java   |   2 +-
 .../apache/taverna/component/api/NamedItem.java |   2 +-
 .../apache/taverna/component/api/Registry.java  |   4 +-
 .../taverna/component/api/SharingPolicy.java    |   2 +-
 .../apache/taverna/component/api/Version.java   |   2 +-
 .../component/api/config/ComponentConfig.java   |   2 +-
 .../api/config/ComponentPropertyNames.java      |   2 +-
 .../taverna/component/api/package-info.java     |   2 +-
 .../component/api/profile/ActivityProfile.java  |   2 +-
 .../component/api/profile/AnnotatedElement.java |   4 +-
 .../api/profile/ExceptionHandling.java          |   6 +-
 .../api/profile/ExceptionReplacement.java       |   4 +-
 .../component/api/profile/HandleException.java  |   4 +-
 .../component/api/profile/PortProfile.java      |   2 +-
 .../taverna/component/api/profile/Profile.java  |  10 +-
 .../api/profile/SemanticAnnotationProfile.java  |   2 +-
 .../src/main/resources/ComponentProfile.xsd     |   2 +-
 199 files changed, 938 insertions(+), 938 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/ComponentAction.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/ComponentAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/ComponentAction.java
index 56e82be..f359c9d 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/ComponentAction.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/ComponentAction.java
@@ -17,7 +17,7 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui;
+package io.github.taverna_extras.component.ui;
 
 import static java.awt.Color.RED;
 import static javax.swing.SwingUtilities.invokeLater;
@@ -26,7 +26,7 @@ import static org.apache.log4j.Logger.getLogger;
 import javax.swing.AbstractAction;
 
 import org.apache.log4j.Logger;
-import org.apache.taverna.component.ui.serviceprovider.ComponentServiceIcon;
+import io.github.taverna_extras.component.ui.serviceprovider.ComponentServiceIcon;
 
 import org.apache.taverna.scufl2.api.container.WorkflowBundle;
 import org.apache.taverna.workbench.models.graph.GraphController;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/ComponentActivityConfigurationBean.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/ComponentActivityConfigurationBean.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/ComponentActivityConfigurationBean.java
index 8d95abc..26e673e 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/ComponentActivityConfigurationBean.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/ComponentActivityConfigurationBean.java
@@ -17,14 +17,14 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui;
+package io.github.taverna_extras.component.ui;
 
 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 static org.apache.taverna.component.ui.ComponentConstants.ACTIVITY_URI;
+import static io.github.taverna_extras.component.api.config.ComponentPropertyNames.COMPONENT_NAME;
+import static io.github.taverna_extras.component.api.config.ComponentPropertyNames.COMPONENT_VERSION;
+import static io.github.taverna_extras.component.api.config.ComponentPropertyNames.FAMILY_NAME;
+import static io.github.taverna_extras.component.api.config.ComponentPropertyNames.REGISTRY_BASE;
+import static io.github.taverna_extras.component.ui.ComponentConstants.ACTIVITY_URI;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -33,12 +33,12 @@ import java.util.Arrays;
 import java.util.List;
 
 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 io.github.taverna_extras.component.api.Component;
+import io.github.taverna_extras.component.api.ComponentException;
+import io.github.taverna_extras.component.api.ComponentFactory;
+import io.github.taverna_extras.component.api.Version;
+import io.github.taverna_extras.component.api.config.ComponentPropertyNames;
+import io.github.taverna_extras.component.api.profile.ExceptionHandling;
 
 import org.apache.taverna.scufl2.api.activity.Activity;
 import org.apache.taverna.scufl2.api.configurations.Configuration;
@@ -130,7 +130,7 @@ public class ComponentActivityConfigurationBean extends Version.Identifier {
 					.getComponentProfile().getExceptionHandling();
 			if (eh != null)
 				result.outputs.add(makeOutputDefinition(1, ERROR_CHANNEL));
-		} catch (org.apache.taverna.component.api.ComponentException e) {
+		} catch (io.github.taverna_extras.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/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/ComponentConstants.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/ComponentConstants.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/ComponentConstants.java
index 65edecc..baec10f 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/ComponentConstants.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/ComponentConstants.java
@@ -17,7 +17,7 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui;
+package io.github.taverna_extras.component.ui;
 
 import static java.net.URI.create;
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/AbstractSemanticAnnotationContextualView.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/AbstractSemanticAnnotationContextualView.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/AbstractSemanticAnnotationContextualView.java
index 8a0089e..6cc48d0 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/AbstractSemanticAnnotationContextualView.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/AbstractSemanticAnnotationContextualView.java
@@ -17,14 +17,14 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.annotation;
+package io.github.taverna_extras.component.ui.annotation;
 
 import static java.awt.GridBagConstraints.HORIZONTAL;
 import static java.awt.GridBagConstraints.NORTHWEST;
 import static java.lang.String.CASE_INSENSITIVE_ORDER;
 import static org.apache.log4j.Logger.getLogger;
-import static org.apache.taverna.component.ui.annotation.SemanticAnnotationUtils.createSemanticAnnotation;
-import static org.apache.taverna.component.ui.annotation.SemanticAnnotationUtils.getDisplayName;
+import static io.github.taverna_extras.component.ui.annotation.SemanticAnnotationUtils.createSemanticAnnotation;
+import static io.github.taverna_extras.component.ui.annotation.SemanticAnnotationUtils.getDisplayName;
 
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
@@ -47,7 +47,7 @@ import javax.swing.JSeparator;
 import javax.swing.SwingWorker;
 
 import org.apache.log4j.Logger;
-import org.apache.taverna.component.api.profile.SemanticAnnotationProfile;
+import io.github.taverna_extras.component.api.profile.SemanticAnnotationProfile;
 
 import org.apache.taverna.scufl2.api.common.AbstractNamed;
 import org.apache.taverna.scufl2.api.common.Named;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/AnnotateSemanticsMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/AnnotateSemanticsMenuAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/AnnotateSemanticsMenuAction.java
index 423bd94..1543533 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/AnnotateSemanticsMenuAction.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/AnnotateSemanticsMenuAction.java
@@ -17,7 +17,7 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.annotation;
+package io.github.taverna_extras.component.ui.annotation;
 
 import static java.awt.BorderLayout.CENTER;
 import static java.awt.BorderLayout.SOUTH;
@@ -37,8 +37,8 @@ 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 io.github.taverna_extras.component.api.ComponentFactory;
+import io.github.taverna_extras.component.api.Version;
 import org.apache.taverna.lang.ui.DeselectingButton;
 
 import org.apache.taverna.scufl2.api.activity.Activity;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/AnnotationPropertyPanelFactory.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/AnnotationPropertyPanelFactory.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/AnnotationPropertyPanelFactory.java
index 0f8d642..0dfaf0a 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/AnnotationPropertyPanelFactory.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/AnnotationPropertyPanelFactory.java
@@ -17,16 +17,16 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.annotation;
+package io.github.taverna_extras.component.ui.annotation;
 
 import static org.apache.jena.rdf.model.ResourceFactory.createTypedLiteral;
 import static java.lang.Integer.MIN_VALUE;
-import static org.apache.taverna.component.ui.annotation.SemanticAnnotationUtils.getObjectName;
+import static io.github.taverna_extras.component.ui.annotation.SemanticAnnotationUtils.getObjectName;
 
 import javax.swing.JComponent;
 import javax.swing.JTextArea;
 
-import org.apache.taverna.component.api.profile.SemanticAnnotationProfile;
+import io.github.taverna_extras.component.api.profile.SemanticAnnotationProfile;
 
 import org.apache.jena.ontology.OntProperty;
 import org.apache.jena.rdf.model.RDFNode;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/DatatypePropertyPanelFactory.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/DatatypePropertyPanelFactory.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/DatatypePropertyPanelFactory.java
index 5a0c478..bd7ebcc 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/DatatypePropertyPanelFactory.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/DatatypePropertyPanelFactory.java
@@ -17,16 +17,16 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.annotation;
+package io.github.taverna_extras.component.ui.annotation;
 
 import static org.apache.jena.rdf.model.ResourceFactory.createTypedLiteral;
 import static java.lang.Integer.MIN_VALUE;
-import static org.apache.taverna.component.ui.annotation.SemanticAnnotationUtils.getObjectName;
+import static io.github.taverna_extras.component.ui.annotation.SemanticAnnotationUtils.getObjectName;
 
 import javax.swing.JComponent;
 import javax.swing.JTextArea;
 
-import org.apache.taverna.component.api.profile.SemanticAnnotationProfile;
+import io.github.taverna_extras.component.api.profile.SemanticAnnotationProfile;
 
 import org.apache.jena.ontology.OntProperty;
 import org.apache.jena.rdf.model.RDFNode;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/DateTimePropertyPanelFactory.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/DateTimePropertyPanelFactory.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/DateTimePropertyPanelFactory.java
index 42b14aa..e9dbda7 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/DateTimePropertyPanelFactory.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/DateTimePropertyPanelFactory.java
@@ -17,7 +17,7 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.annotation;
+package io.github.taverna_extras.component.ui.annotation;
 
 import static org.apache.jena.datatypes.xsd.XSDDatatype.XSDdateTime;
 import static org.apache.jena.rdf.model.ResourceFactory.createTypedLiteral;
@@ -32,7 +32,7 @@ import javax.swing.JSpinner;
 import javax.swing.SpinnerDateModel;
 import javax.swing.text.DefaultCaret;
 
-import org.apache.taverna.component.api.profile.SemanticAnnotationProfile;
+import io.github.taverna_extras.component.api.profile.SemanticAnnotationProfile;
 
 import org.apache.jena.datatypes.xsd.XSDDateTime;
 import org.apache.jena.ontology.OntProperty;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/FallbackPropertyPanelFactory.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/FallbackPropertyPanelFactory.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/FallbackPropertyPanelFactory.java
index 3075ae6..efc3b42 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/FallbackPropertyPanelFactory.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/FallbackPropertyPanelFactory.java
@@ -17,12 +17,12 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.annotation;
+package io.github.taverna_extras.component.ui.annotation;
 
 import javax.swing.JComponent;
 import javax.swing.JLabel;
 
-import org.apache.taverna.component.api.profile.SemanticAnnotationProfile;
+import io.github.taverna_extras.component.api.profile.SemanticAnnotationProfile;
 
 import org.apache.jena.rdf.model.RDFNode;
 import org.apache.jena.rdf.model.Statement;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/GreyBorder.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/GreyBorder.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/GreyBorder.java
index e3f7445..d5e4fbe 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/GreyBorder.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/GreyBorder.java
@@ -17,7 +17,7 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.annotation;
+package io.github.taverna_extras.component.ui.annotation;
 
 import java.awt.Color;
 import java.awt.Component;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/ObjectPropertyWithIndividualsPanelFactory.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/ObjectPropertyWithIndividualsPanelFactory.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/ObjectPropertyWithIndividualsPanelFactory.java
index e26405c..fefe5c0 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/ObjectPropertyWithIndividualsPanelFactory.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/ObjectPropertyWithIndividualsPanelFactory.java
@@ -17,7 +17,7 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.annotation;
+package io.github.taverna_extras.component.ui.annotation;
 
 import static java.awt.FlowLayout.RIGHT;
 import static java.awt.GridBagConstraints.EAST;
@@ -28,7 +28,7 @@ import static javax.swing.JOptionPane.OK_OPTION;
 import static javax.swing.JOptionPane.QUESTION_MESSAGE;
 import static javax.swing.JOptionPane.showConfirmDialog;
 import static javax.swing.JOptionPane.showInputDialog;
-import static org.apache.taverna.component.ui.annotation.SemanticAnnotationUtils.getDisplayName;
+import static io.github.taverna_extras.component.ui.annotation.SemanticAnnotationUtils.getDisplayName;
 
 import java.awt.Component;
 import java.awt.FlowLayout;
@@ -46,8 +46,8 @@ import javax.swing.JList;
 import javax.swing.JPanel;
 import javax.swing.ListCellRenderer;
 
-import org.apache.taverna.component.api.profile.SemanticAnnotationProfile;
-import org.apache.taverna.component.ui.localworld.LocalWorld;
+import io.github.taverna_extras.component.api.profile.SemanticAnnotationProfile;
+import io.github.taverna_extras.component.ui.localworld.LocalWorld;
 
 import org.apache.jena.ontology.Individual;
 import org.apache.jena.ontology.OntClass;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/PropertyPanelFactorySPI.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/PropertyPanelFactorySPI.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/PropertyPanelFactorySPI.java
index 426ae81..2b8dd7d 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/PropertyPanelFactorySPI.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/PropertyPanelFactorySPI.java
@@ -17,16 +17,16 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.annotation;
+package io.github.taverna_extras.component.ui.annotation;
 
 import static java.awt.Color.WHITE;
-import static org.apache.taverna.component.ui.annotation.SemanticAnnotationUtils.getObjectName;
+import static io.github.taverna_extras.component.ui.annotation.SemanticAnnotationUtils.getObjectName;
 
 import javax.swing.JComponent;
 import javax.swing.JTextArea;
 import javax.swing.border.EmptyBorder;
 
-import org.apache.taverna.component.api.profile.SemanticAnnotationProfile;
+import io.github.taverna_extras.component.api.profile.SemanticAnnotationProfile;
 
 import org.apache.jena.rdf.model.RDFNode;
 import org.apache.jena.rdf.model.Statement;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/SemanticAnnotationContextualView.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/SemanticAnnotationContextualView.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/SemanticAnnotationContextualView.java
index f183ae8..4aa2b4e 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/SemanticAnnotationContextualView.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/SemanticAnnotationContextualView.java
@@ -17,7 +17,7 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.annotation;
+package io.github.taverna_extras.component.ui.annotation;
 
 import static java.lang.String.format;
 import static org.apache.log4j.Logger.getLogger;
@@ -26,13 +26,13 @@ import java.util.ArrayList;
 import java.util.List;
 
 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 io.github.taverna_extras.component.api.ComponentException;
+import io.github.taverna_extras.component.api.ComponentFactory;
+import io.github.taverna_extras.component.api.Family;
+import io.github.taverna_extras.component.api.Registry;
+import io.github.taverna_extras.component.api.Version;
+import io.github.taverna_extras.component.api.profile.Profile;
+import io.github.taverna_extras.component.api.profile.SemanticAnnotationProfile;
 
 import org.apache.taverna.scufl2.api.common.AbstractNamed;
 import org.apache.taverna.scufl2.api.container.WorkflowBundle;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/SemanticAnnotationContextualViewFactory.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/SemanticAnnotationContextualViewFactory.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/SemanticAnnotationContextualViewFactory.java
index e27a218..8ec838f 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/SemanticAnnotationContextualViewFactory.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/SemanticAnnotationContextualViewFactory.java
@@ -17,13 +17,13 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.annotation;
+package io.github.taverna_extras.component.ui.annotation;
 
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.taverna.component.api.ComponentFactory;
-import org.apache.taverna.component.api.Version;
+import io.github.taverna_extras.component.api.ComponentFactory;
+import io.github.taverna_extras.component.api.Version;
 
 import org.apache.taverna.scufl2.api.activity.Activity;
 import org.apache.taverna.scufl2.api.common.AbstractNamed;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/SemanticAnnotationPanel.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/SemanticAnnotationPanel.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/SemanticAnnotationPanel.java
index 3f3a1ee..536a87d 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/SemanticAnnotationPanel.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/SemanticAnnotationPanel.java
@@ -17,7 +17,7 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.annotation;
+package io.github.taverna_extras.component.ui.annotation;
 
 import static java.awt.BorderLayout.CENTER;
 import static java.awt.BorderLayout.NORTH;
@@ -35,8 +35,8 @@ 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 org.apache.taverna.component.ui.annotation.SemanticAnnotationUtils.getDisplayName;
-import static org.apache.taverna.component.ui.annotation.SemanticAnnotationUtils.getObjectName;
+import static io.github.taverna_extras.component.ui.annotation.SemanticAnnotationUtils.getDisplayName;
+import static io.github.taverna_extras.component.ui.annotation.SemanticAnnotationUtils.getObjectName;
 
 import java.awt.BorderLayout;
 import java.awt.Component;
@@ -58,7 +58,7 @@ import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
 import javax.swing.border.EmptyBorder;
 
-import org.apache.taverna.component.api.profile.SemanticAnnotationProfile;
+import io.github.taverna_extras.component.api.profile.SemanticAnnotationProfile;
 
 import org.apache.jena.ontology.OntProperty;
 import org.apache.jena.rdf.model.RDFNode;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/SemanticAnnotationUtils.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/SemanticAnnotationUtils.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/SemanticAnnotationUtils.java
index 4a209e7..68050c0 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/SemanticAnnotationUtils.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/SemanticAnnotationUtils.java
@@ -17,7 +17,7 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.annotation;
+package io.github.taverna_extras.component.ui.annotation;
 
 import static org.apache.jena.rdf.model.ModelFactory.createDefaultModel;
 import static org.apache.log4j.Logger.getLogger;
@@ -31,9 +31,9 @@ import java.util.HashSet;
 import java.util.Set;
 
 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 io.github.taverna_extras.component.api.ComponentException;
+import io.github.taverna_extras.component.api.profile.Profile;
+import io.github.taverna_extras.component.api.profile.SemanticAnnotationProfile;
 
 import org.apache.taverna.scufl2.api.annotation.Annotation;
 import org.apache.taverna.scufl2.api.common.AbstractNamed;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/TurtleContextualView.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/TurtleContextualView.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/TurtleContextualView.java
index 15fc0f3..8489fe6 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/TurtleContextualView.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/TurtleContextualView.java
@@ -17,11 +17,11 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.annotation;
+package io.github.taverna_extras.component.ui.annotation;
 
 import static java.awt.BorderLayout.CENTER;
-import static org.apache.taverna.component.ui.annotation.SemanticAnnotationUtils.findSemanticAnnotation;
-import static org.apache.taverna.component.ui.annotation.SemanticAnnotationUtils.getStrippedAnnotationContent;
+import static io.github.taverna_extras.component.ui.annotation.SemanticAnnotationUtils.findSemanticAnnotation;
+import static io.github.taverna_extras.component.ui.annotation.SemanticAnnotationUtils.getStrippedAnnotationContent;
 import static org.slf4j.LoggerFactory.getLogger;
 
 import java.awt.BorderLayout;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/TurtleInputPanel.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/TurtleInputPanel.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/TurtleInputPanel.java
index 22e0a8c..7356cc9 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/TurtleInputPanel.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/TurtleInputPanel.java
@@ -17,13 +17,13 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.annotation;
+package io.github.taverna_extras.component.ui.annotation;
 
 import static org.apache.jena.rdf.model.ModelFactory.createOntologyModel;
 import static java.awt.BorderLayout.CENTER;
 import static java.awt.BorderLayout.EAST;
 import static java.awt.BorderLayout.SOUTH;
-import static org.apache.taverna.component.ui.annotation.SemanticAnnotationUtils.populateModelFromString;
+import static io.github.taverna_extras.component.ui.annotation.SemanticAnnotationUtils.populateModelFromString;
 
 import java.awt.BorderLayout;
 import java.awt.event.ActionEvent;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/UnrecognizedStatementPanel.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/UnrecognizedStatementPanel.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/UnrecognizedStatementPanel.java
index 2ad4ed8..67d806d 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/UnrecognizedStatementPanel.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/UnrecognizedStatementPanel.java
@@ -17,7 +17,7 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.annotation;
+package io.github.taverna_extras.component.ui.annotation;
 
 import static java.lang.String.format;
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/UnresolveablePredicatePanel.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/UnresolveablePredicatePanel.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/UnresolveablePredicatePanel.java
index 48c9b7c..a7e2c89 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/UnresolveablePredicatePanel.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/annotation/UnresolveablePredicatePanel.java
@@ -17,7 +17,7 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.annotation;
+package io.github.taverna_extras.component.ui.annotation;
 
 import static java.lang.String.format;
 
@@ -26,7 +26,7 @@ import java.awt.BorderLayout;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 
-import org.apache.taverna.component.api.profile.SemanticAnnotationProfile;
+import io.github.taverna_extras.component.api.profile.SemanticAnnotationProfile;
 
 /**
  * @author alanrw

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/config/ComponentConfigurationPanel.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/config/ComponentConfigurationPanel.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/config/ComponentConfigurationPanel.java
index ab9e988..712b861 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/config/ComponentConfigurationPanel.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/config/ComponentConfigurationPanel.java
@@ -17,15 +17,15 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.config;
+package io.github.taverna_extras.component.ui.config;
 
 import static java.awt.event.ItemEvent.SELECTED;
 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 static org.apache.taverna.component.ui.util.Utils.SHORT_STRING;
+import static io.github.taverna_extras.component.api.config.ComponentPropertyNames.COMPONENT_NAME;
+import static io.github.taverna_extras.component.api.config.ComponentPropertyNames.COMPONENT_VERSION;
+import static io.github.taverna_extras.component.api.config.ComponentPropertyNames.FAMILY_NAME;
+import static io.github.taverna_extras.component.api.config.ComponentPropertyNames.REGISTRY_BASE;
+import static io.github.taverna_extras.component.ui.util.Utils.SHORT_STRING;
 
 import java.awt.GridBagConstraints;
 import java.awt.GridLayout;
@@ -40,11 +40,11 @@ import javax.swing.JComboBox;
 import javax.swing.JLabel;
 
 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.ui.panel.ComponentListCellRenderer;
+import io.github.taverna_extras.component.api.Component;
+import io.github.taverna_extras.component.api.ComponentException;
+import io.github.taverna_extras.component.api.ComponentFactory;
+import io.github.taverna_extras.component.api.Version;
+import io.github.taverna_extras.component.ui.panel.ComponentListCellRenderer;
 
 import org.apache.taverna.scufl2.api.activity.Activity;
 import org.apache.taverna.services.ServiceRegistry;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/config/ComponentConfigureAction.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/config/ComponentConfigureAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/config/ComponentConfigureAction.java
index ec93191..81c9d2f 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/config/ComponentConfigureAction.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/config/ComponentConfigureAction.java
@@ -17,12 +17,12 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.config;
+package io.github.taverna_extras.component.ui.config;
 
 import java.awt.Frame;
 import java.awt.event.ActionEvent;
 
-import org.apache.taverna.component.api.ComponentFactory;
+import io.github.taverna_extras.component.api.ComponentFactory;
 
 import org.apache.taverna.scufl2.api.activity.Activity;
 import org.apache.taverna.servicedescriptions.ServiceDescriptionRegistry;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/file/ComponentDataflowHealthCheckExplainer.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/file/ComponentDataflowHealthCheckExplainer.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/file/ComponentDataflowHealthCheckExplainer.java
index 5fcdcb1..7a2442f 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/file/ComponentDataflowHealthCheckExplainer.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/file/ComponentDataflowHealthCheckExplainer.java
@@ -17,11 +17,11 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.file;
+package io.github.taverna_extras.component.ui.file;
 
 import static java.util.Collections.sort;
-import static org.apache.taverna.component.ui.annotation.SemanticAnnotationUtils.getDisplayName;
-import static org.apache.taverna.component.ui.util.ComponentHealthCheck.FAILS_PROFILE;
+import static io.github.taverna_extras.component.ui.annotation.SemanticAnnotationUtils.getDisplayName;
+import static io.github.taverna_extras.component.ui.util.ComponentHealthCheck.FAILS_PROFILE;
 
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -31,8 +31,8 @@ import java.util.Set;
 import javax.swing.JComponent;
 import javax.swing.JTextArea;
 
-import org.apache.taverna.component.api.profile.SemanticAnnotationProfile;
-import org.apache.taverna.component.ui.util.ComponentHealthCheck;
+import io.github.taverna_extras.component.api.profile.SemanticAnnotationProfile;
+import io.github.taverna_extras.component.ui.util.ComponentHealthCheck;
 import org.apache.taverna.visit.VisitKind;
 import org.apache.taverna.visit.VisitReport;
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/file/ComponentDataflowHealthChecker.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/file/ComponentDataflowHealthChecker.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/file/ComponentDataflowHealthChecker.java
index 6904c36..7ce0c1b 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/file/ComponentDataflowHealthChecker.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/file/ComponentDataflowHealthChecker.java
@@ -17,22 +17,22 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.file;
+package io.github.taverna_extras.component.ui.file;
 
 import static org.apache.log4j.Logger.getLogger;
-import static org.apache.taverna.component.ui.annotation.SemanticAnnotationUtils.checkComponent;
-import static org.apache.taverna.component.ui.util.ComponentHealthCheck.FAILS_PROFILE;
+import static io.github.taverna_extras.component.ui.annotation.SemanticAnnotationUtils.checkComponent;
+import static io.github.taverna_extras.component.ui.util.ComponentHealthCheck.FAILS_PROFILE;
 
 import java.util.List;
 import java.util.Set;
 
 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 org.apache.taverna.component.ui.util.ComponentHealthCheck;
+import io.github.taverna_extras.component.api.ComponentException;
+import io.github.taverna_extras.component.api.ComponentFactory;
+import io.github.taverna_extras.component.api.Family;
+import io.github.taverna_extras.component.api.Version;
+import io.github.taverna_extras.component.api.profile.SemanticAnnotationProfile;
+import io.github.taverna_extras.component.ui.util.ComponentHealthCheck;
 
 import org.apache.taverna.scufl2.api.container.WorkflowBundle;
 import org.apache.taverna.visit.VisitReport;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/file/ComponentOpener.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/file/ComponentOpener.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/file/ComponentOpener.java
index c8f07df..f2e16e6 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/file/ComponentOpener.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/file/ComponentOpener.java
@@ -17,7 +17,7 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.file;
+package io.github.taverna_extras.component.ui.file;
 
 import static org.apache.log4j.Logger.getLogger;
 
@@ -26,10 +26,10 @@ import java.util.Date;
 import java.util.List;
 
 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 io.github.taverna_extras.component.api.ComponentException;
+import io.github.taverna_extras.component.api.ComponentFactory;
+import io.github.taverna_extras.component.api.Version;
+import io.github.taverna_extras.component.api.Version.ID;
 
 import org.apache.taverna.scufl2.api.container.WorkflowBundle;
 import org.apache.taverna.workbench.file.AbstractDataflowPersistenceHandler;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/file/ComponentSaver.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/file/ComponentSaver.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/file/ComponentSaver.java
index f2819f5..19b52d9 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/file/ComponentSaver.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/file/ComponentSaver.java
@@ -17,13 +17,13 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.file;
+package io.github.taverna_extras.component.ui.file;
 
 import static javax.swing.JOptionPane.OK_CANCEL_OPTION;
 import static javax.swing.JOptionPane.OK_OPTION;
 import static javax.swing.JOptionPane.showConfirmDialog;
 import static org.apache.log4j.Logger.getLogger;
-import static org.apache.taverna.component.ui.annotation.SemanticAnnotationUtils.checkComponent;
+import static io.github.taverna_extras.component.ui.annotation.SemanticAnnotationUtils.checkComponent;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -33,14 +33,14 @@ import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
 
 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 org.apache.taverna.component.ui.serviceprovider.ComponentServiceProvider;
+import io.github.taverna_extras.component.api.Component;
+import io.github.taverna_extras.component.api.ComponentException;
+import io.github.taverna_extras.component.api.ComponentFactory;
+import io.github.taverna_extras.component.api.Family;
+import io.github.taverna_extras.component.api.Registry;
+import io.github.taverna_extras.component.api.Version;
+import io.github.taverna_extras.component.api.profile.SemanticAnnotationProfile;
+import io.github.taverna_extras.component.ui.serviceprovider.ComponentServiceProvider;
 
 import org.apache.taverna.scufl2.api.container.WorkflowBundle;
 import org.apache.taverna.scufl2.validation.ValidationReport;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/file/FileManagerObserver.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/file/FileManagerObserver.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/file/FileManagerObserver.java
index 2eb3ba2..8ee99b9 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/file/FileManagerObserver.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/file/FileManagerObserver.java
@@ -17,7 +17,7 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.file;
+package io.github.taverna_extras.component.ui.file;
 
 import static java.awt.Color.WHITE;
 import static java.awt.Font.BOLD;
@@ -31,8 +31,8 @@ import java.awt.Insets;
 import javax.swing.border.Border;
 
 import org.apache.batik.swing.JSVGCanvas;
-import org.apache.taverna.component.api.Version;
-import org.apache.taverna.component.ui.util.Utils;
+import io.github.taverna_extras.component.api.Version;
+import io.github.taverna_extras.component.ui.util.Utils;
 import org.apache.taverna.lang.observer.Observable;
 import org.apache.taverna.lang.observer.Observer;
 
@@ -71,9 +71,9 @@ public class FileManagerObserver implements StartupSPI {
 	@Override
 	public boolean startup() {
 		colours.setPreferredColour(
-				"org.apache.taverna.component.registry.Component", COLOR);
+				"io.github.taverna_extras.component.registry.Component", COLOR);
 		colours.setPreferredColour(
-				"org.apache.taverna.component.ComponentActivity", COLOR);
+				"io.github.taverna_extras.component.ComponentActivity", COLOR);
 		fileManager.addObserver(new Observer<FileManagerEvent>() {
 			@Override
 			public void notify(Observable<FileManagerEvent> observable,

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/localworld/LocalWorld.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/localworld/LocalWorld.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/localworld/LocalWorld.java
index 8851644..a35ab61 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/localworld/LocalWorld.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/localworld/LocalWorld.java
@@ -17,12 +17,12 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.localworld;
+package io.github.taverna_extras.component.ui.localworld;
 
 import static org.apache.jena.rdf.model.ModelFactory.createOntologyModel;
 import static org.apache.log4j.Logger.getLogger;
-import static org.apache.taverna.component.ui.annotation.SemanticAnnotationUtils.createTurtle;
-import static org.apache.taverna.component.ui.annotation.SemanticAnnotationUtils.populateModelFromString;
+import static io.github.taverna_extras.component.ui.annotation.SemanticAnnotationUtils.createTurtle;
+import static io.github.taverna_extras.component.ui.annotation.SemanticAnnotationUtils.populateModelFromString;
 
 import java.io.File;
 import java.io.FileInputStream;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/AbstractContextComponentMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/AbstractContextComponentMenuAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/AbstractContextComponentMenuAction.java
index 91d4930..0911a66 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/AbstractContextComponentMenuAction.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/AbstractContextComponentMenuAction.java
@@ -17,11 +17,11 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.menu;
+package io.github.taverna_extras.component.ui.menu;
 
 import java.net.URI;
 
-import org.apache.taverna.component.api.config.ComponentConfig;
+import io.github.taverna_extras.component.api.config.ComponentConfig;
 
 import org.apache.taverna.scufl2.api.activity.Activity;
 import org.apache.taverna.scufl2.api.core.Processor;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ComponentConfigureMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ComponentConfigureMenuAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ComponentConfigureMenuAction.java
index 27ddcfa..0feb63e 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ComponentConfigureMenuAction.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ComponentConfigureMenuAction.java
@@ -17,15 +17,15 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.menu;
+package io.github.taverna_extras.component.ui.menu;
 
 import static javax.swing.Action.NAME;
-import static org.apache.taverna.component.ui.ComponentConstants.ACTIVITY_URI;
+import static io.github.taverna_extras.component.ui.ComponentConstants.ACTIVITY_URI;
 
 import javax.swing.Action;
 
-import org.apache.taverna.component.api.ComponentFactory;
-import org.apache.taverna.component.ui.config.ComponentConfigureAction;
+import io.github.taverna_extras.component.api.ComponentFactory;
+import io.github.taverna_extras.component.ui.config.ComponentConfigureAction;
 import org.apache.taverna.servicedescriptions.ServiceDescriptionRegistry;
 import org.apache.taverna.services.ServiceRegistry;
 import org.apache.taverna.workbench.activityicons.ActivityIconManager;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ComponentMenu.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ComponentMenu.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ComponentMenu.java
index c499ccf..99cec65 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ComponentMenu.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ComponentMenu.java
@@ -17,7 +17,7 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.menu;
+package io.github.taverna_extras.component.ui.menu;
 
 import java.net.URI;
 import org.apache.taverna.ui.menu.AbstractMenu;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ComponentSection.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ComponentSection.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ComponentSection.java
index 851de06..337ee73 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ComponentSection.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ComponentSection.java
@@ -17,7 +17,7 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.menu;
+package io.github.taverna_extras.component.ui.menu;
 
 import java.net.URI;
 import org.apache.taverna.ui.menu.AbstractMenuSection;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/NestedWorkflowCreationDialog.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/NestedWorkflowCreationDialog.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/NestedWorkflowCreationDialog.java
index cff2964..3a467fd 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/NestedWorkflowCreationDialog.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/NestedWorkflowCreationDialog.java
@@ -17,7 +17,7 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.menu;
+package io.github.taverna_extras.component.ui.menu;
 
 import static java.awt.BorderLayout.CENTER;
 import static java.awt.BorderLayout.NORTH;
@@ -26,7 +26,7 @@ import static java.util.Collections.sort;
 import static javax.swing.JOptionPane.WARNING_MESSAGE;
 import static javax.swing.JOptionPane.showMessageDialog;
 import static org.apache.log4j.Logger.getLogger;
-import static org.apache.taverna.component.ui.util.Utils.uniqueName;
+import static io.github.taverna_extras.component.ui.util.Utils.uniqueName;
 import static org.apache.taverna.scufl2.api.common.Scufl2Tools.NESTED_WORKFLOW;
 
 import java.awt.BorderLayout;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/NestedWorkflowCreatorMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/NestedWorkflowCreatorMenuAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/NestedWorkflowCreatorMenuAction.java
index 6a503df..0cdb2ba 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/NestedWorkflowCreatorMenuAction.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/NestedWorkflowCreatorMenuAction.java
@@ -17,7 +17,7 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.menu;
+package io.github.taverna_extras.component.ui.menu;
 
 import java.awt.Dialog;
 import java.awt.event.ActionEvent;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/OpenComponentFromComponentActivityAction.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/OpenComponentFromComponentActivityAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/OpenComponentFromComponentActivityAction.java
index 481f2a0..2bce63a 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/OpenComponentFromComponentActivityAction.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/OpenComponentFromComponentActivityAction.java
@@ -17,7 +17,7 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.menu;
+package io.github.taverna_extras.component.ui.menu;
 
 import static org.apache.log4j.Logger.getLogger;
 
@@ -25,11 +25,11 @@ import java.awt.event.ActionEvent;
 import java.net.MalformedURLException;
 
 import org.apache.log4j.Logger;
-import org.apache.taverna.component.api.ComponentFactory;
-import org.apache.taverna.component.api.Version;
-import org.apache.taverna.component.ui.ComponentAction;
-import org.apache.taverna.component.ui.ComponentActivityConfigurationBean;
-import org.apache.taverna.component.ui.serviceprovider.ComponentServiceIcon;
+import io.github.taverna_extras.component.api.ComponentFactory;
+import io.github.taverna_extras.component.api.Version;
+import io.github.taverna_extras.component.ui.ComponentAction;
+import io.github.taverna_extras.component.ui.ComponentActivityConfigurationBean;
+import io.github.taverna_extras.component.ui.serviceprovider.ComponentServiceIcon;
 
 import org.apache.taverna.scufl2.api.activity.Activity;
 import org.apache.taverna.scufl2.api.container.WorkflowBundle;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/OpenComponentFromComponentActivityMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/OpenComponentFromComponentActivityMenuAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/OpenComponentFromComponentActivityMenuAction.java
index eb63f96..6f28816 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/OpenComponentFromComponentActivityMenuAction.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/OpenComponentFromComponentActivityMenuAction.java
@@ -17,14 +17,14 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.menu;
+package io.github.taverna_extras.component.ui.menu;
 
 import java.net.URI;
 
 import javax.swing.Action;
 
-import org.apache.taverna.component.api.ComponentFactory;
-import org.apache.taverna.component.ui.serviceprovider.ComponentServiceIcon;
+import io.github.taverna_extras.component.api.ComponentFactory;
+import io.github.taverna_extras.component.ui.serviceprovider.ComponentServiceIcon;
 
 import org.apache.taverna.scufl2.api.activity.Activity;
 import org.apache.taverna.scufl2.api.core.Processor;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ReplaceByComponentAction.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ReplaceByComponentAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ReplaceByComponentAction.java
index 06e04ce..ebb51a8 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ReplaceByComponentAction.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ReplaceByComponentAction.java
@@ -17,7 +17,7 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.menu;
+package io.github.taverna_extras.component.ui.menu;
 
 import static java.awt.BorderLayout.CENTER;
 import static java.awt.BorderLayout.SOUTH;
@@ -26,9 +26,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 org.apache.taverna.component.api.config.ComponentPropertyNames.COMPONENT_NAME;
-import static org.apache.taverna.component.ui.ComponentActivityConfigurationBean.ignorableNames;
-import static org.apache.taverna.component.ui.util.Utils.uniqueName;
+import static io.github.taverna_extras.component.api.config.ComponentPropertyNames.COMPONENT_NAME;
+import static io.github.taverna_extras.component.ui.ComponentActivityConfigurationBean.ignorableNames;
+import static io.github.taverna_extras.component.ui.util.Utils.uniqueName;
 import static org.apache.taverna.scufl2.api.common.Scufl2Tools.NESTED_WORKFLOW;
 
 import java.awt.BorderLayout;
@@ -43,16 +43,16 @@ import javax.swing.JCheckBox;
 import javax.swing.JPanel;
 import javax.swing.JSeparator;
 
-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 org.apache.taverna.component.ui.ComponentActivityConfigurationBean;
-import org.apache.taverna.component.ui.panel.ComponentChooserPanel;
-import org.apache.taverna.component.ui.preference.ComponentPreference;
-import org.apache.taverna.component.ui.serviceprovider.ComponentServiceIcon;
-import org.apache.taverna.component.ui.util.Utils;
+import io.github.taverna_extras.component.api.Component;
+import io.github.taverna_extras.component.api.ComponentFactory;
+import io.github.taverna_extras.component.api.Family;
+import io.github.taverna_extras.component.api.Registry;
+import io.github.taverna_extras.component.api.Version;
+import io.github.taverna_extras.component.ui.ComponentActivityConfigurationBean;
+import io.github.taverna_extras.component.ui.panel.ComponentChooserPanel;
+import io.github.taverna_extras.component.ui.preference.ComponentPreference;
+import io.github.taverna_extras.component.ui.serviceprovider.ComponentServiceIcon;
+import io.github.taverna_extras.component.ui.util.Utils;
 
 import org.apache.taverna.scufl2.api.activity.Activity;
 import org.apache.taverna.scufl2.api.common.Scufl2Tools;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ReplaceByComponentMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ReplaceByComponentMenuAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ReplaceByComponentMenuAction.java
index 674867e..470ad40 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ReplaceByComponentMenuAction.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ReplaceByComponentMenuAction.java
@@ -17,15 +17,15 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.menu;
+package io.github.taverna_extras.component.ui.menu;
 
 import java.net.URI;
 
 import javax.swing.Action;
 
-import org.apache.taverna.component.api.ComponentFactory;
-import org.apache.taverna.component.ui.preference.ComponentPreference;
-import org.apache.taverna.component.ui.serviceprovider.ComponentServiceIcon;
+import io.github.taverna_extras.component.api.ComponentFactory;
+import io.github.taverna_extras.component.ui.preference.ComponentPreference;
+import io.github.taverna_extras.component.ui.serviceprovider.ComponentServiceIcon;
 
 import org.apache.taverna.scufl2.api.core.Processor;
 import org.apache.taverna.ui.menu.AbstractContextualMenuAction;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/AbstractComponentMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/AbstractComponentMenuAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/AbstractComponentMenuAction.java
index 8239e46..671e190 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/AbstractComponentMenuAction.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/AbstractComponentMenuAction.java
@@ -17,9 +17,9 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.menu.component;
+package io.github.taverna_extras.component.ui.menu.component;
 
-import static org.apache.taverna.component.ui.menu.component.ComponentMenuSection.COMPONENT_SECTION;
+import static io.github.taverna_extras.component.ui.menu.component.ComponentMenuSection.COMPONENT_SECTION;
 
 import java.net.URI;
 import org.apache.taverna.ui.menu.AbstractMenuAction;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCloseAction.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCloseAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCloseAction.java
index 2f3c220..da22a60 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCloseAction.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCloseAction.java
@@ -17,7 +17,7 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.menu.component;
+package io.github.taverna_extras.component.ui.menu.component;
 
 import static org.apache.log4j.Logger.getLogger;
 
@@ -27,8 +27,8 @@ import javax.swing.AbstractAction;
 import javax.swing.Action;
 
 import org.apache.log4j.Logger;
-import org.apache.taverna.component.ui.serviceprovider.ComponentServiceIcon;
-import org.apache.taverna.component.ui.util.Utils;
+import io.github.taverna_extras.component.ui.serviceprovider.ComponentServiceIcon;
+import io.github.taverna_extras.component.ui.util.Utils;
 import org.apache.taverna.lang.observer.Observable;
 import org.apache.taverna.lang.observer.Observer;
 import org.apache.taverna.workbench.file.FileManager;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCloseMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCloseMenuAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCloseMenuAction.java
index 7b99200..6c40a5f 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCloseMenuAction.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCloseMenuAction.java
@@ -17,14 +17,14 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.menu.component;
+package io.github.taverna_extras.component.ui.menu.component;
 
 import java.net.URI;
 
 import javax.swing.Action;
 
-import org.apache.taverna.component.ui.serviceprovider.ComponentServiceIcon;
-import org.apache.taverna.component.ui.util.Utils;
+import io.github.taverna_extras.component.ui.serviceprovider.ComponentServiceIcon;
+import io.github.taverna_extras.component.ui.util.Utils;
 import org.apache.taverna.workbench.file.FileManager;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCopyAction.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCopyAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCopyAction.java
index 370064c..676a6c9 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCopyAction.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCopyAction.java
@@ -17,7 +17,7 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.menu.component;
+package io.github.taverna_extras.component.ui.menu.component;
 
 import static java.awt.GridBagConstraints.BOTH;
 import static java.awt.GridBagConstraints.WEST;
@@ -38,19 +38,19 @@ import javax.swing.JPanel;
 import javax.swing.border.TitledBorder;
 
 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;
-import org.apache.taverna.component.ui.panel.ComponentChoiceMessage;
-import org.apache.taverna.component.ui.panel.ComponentChooserPanel;
-import org.apache.taverna.component.ui.panel.ProfileChoiceMessage;
-import org.apache.taverna.component.ui.panel.RegistryAndFamilyChooserPanel;
-import org.apache.taverna.component.ui.preference.ComponentPreference;
-import org.apache.taverna.component.ui.serviceprovider.ComponentServiceIcon;
-import org.apache.taverna.component.ui.serviceprovider.ComponentServiceProviderConfig;
-import org.apache.taverna.component.ui.util.Utils;
+import io.github.taverna_extras.component.api.Component;
+import io.github.taverna_extras.component.api.ComponentException;
+import io.github.taverna_extras.component.api.Family;
+import io.github.taverna_extras.component.api.Version;
+import io.github.taverna_extras.component.api.profile.Profile;
+import io.github.taverna_extras.component.ui.panel.ComponentChoiceMessage;
+import io.github.taverna_extras.component.ui.panel.ComponentChooserPanel;
+import io.github.taverna_extras.component.ui.panel.ProfileChoiceMessage;
+import io.github.taverna_extras.component.ui.panel.RegistryAndFamilyChooserPanel;
+import io.github.taverna_extras.component.ui.preference.ComponentPreference;
+import io.github.taverna_extras.component.ui.serviceprovider.ComponentServiceIcon;
+import io.github.taverna_extras.component.ui.serviceprovider.ComponentServiceProviderConfig;
+import io.github.taverna_extras.component.ui.util.Utils;
 import org.apache.taverna.lang.observer.Observable;
 import org.apache.taverna.lang.observer.Observer;
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCopyMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCopyMenuAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCopyMenuAction.java
index 1fb5d49..3c6db63 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCopyMenuAction.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCopyMenuAction.java
@@ -17,15 +17,15 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.menu.component;
+package io.github.taverna_extras.component.ui.menu.component;
 
 import java.net.URI;
 
 import javax.swing.Action;
 
-import org.apache.taverna.component.ui.preference.ComponentPreference;
-import org.apache.taverna.component.ui.serviceprovider.ComponentServiceIcon;
-import org.apache.taverna.component.ui.util.Utils;
+import io.github.taverna_extras.component.ui.preference.ComponentPreference;
+import io.github.taverna_extras.component.ui.serviceprovider.ComponentServiceIcon;
+import io.github.taverna_extras.component.ui.util.Utils;
 
 /**
  * @author alanrw

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCreatorSupport.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCreatorSupport.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCreatorSupport.java
index 55b66c2..ffe26d8 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCreatorSupport.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCreatorSupport.java
@@ -17,7 +17,7 @@
 * under the License.
 */
 
-package org.apache.taverna.component.ui.menu.component;
+package io.github.taverna_extras.component.ui.menu.component;
 
 import static javax.swing.JOptionPane.ERROR_MESSAGE;
 import static javax.swing.JOptionPane.OK_CANCEL_OPTION;
@@ -33,15 +33,15 @@ 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.apache.taverna.component.ui.ComponentActivityConfigurationBean;
-import org.apache.taverna.component.ui.panel.RegistryAndFamilyChooserComponentEntryPanel;
-import org.apache.taverna.component.ui.preference.ComponentPreference;
-import org.apache.taverna.component.ui.serviceprovider.ComponentServiceProviderConfig;
-import org.apache.taverna.component.ui.util.Utils;
+import io.github.taverna_extras.component.api.Component;
+import io.github.taverna_extras.component.api.ComponentException;
+import io.github.taverna_extras.component.api.ComponentFactory;
+import io.github.taverna_extras.component.api.Version;
+import io.github.taverna_extras.component.ui.ComponentActivityConfigurationBean;
+import io.github.taverna_extras.component.ui.panel.RegistryAndFamilyChooserComponentEntryPanel;
+import io.github.taverna_extras.component.ui.preference.ComponentPreference;
+import io.github.taverna_extras.component.ui.serviceprovider.ComponentServiceProviderConfig;
+import io.github.taverna_extras.component.ui.util.Utils;
 
 import org.apache.taverna.scufl2.api.activity.Activity;
 import org.apache.taverna.scufl2.api.container.WorkflowBundle;