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:51 UTC
[04/27] incubator-taverna-plugin-component git commit: package name
-> io.github.taverna_extras.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/preference/LocalRegistryPanel.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/preference/LocalRegistryPanel.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/preference/LocalRegistryPanel.java
index 3cb5b37..b9ba05e 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/preference/LocalRegistryPanel.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/preference/LocalRegistryPanel.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.taverna.component.ui.preference;
+package io.github.taverna_extras.component.ui.preference;
import static java.awt.GridBagConstraints.HORIZONTAL;
import static java.awt.GridBagConstraints.NONE;
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/preference/RegistryTableModel.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/preference/RegistryTableModel.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/preference/RegistryTableModel.java
index 10e7a34..c3b5f04 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/preference/RegistryTableModel.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/preference/RegistryTableModel.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.taverna.component.ui.preference;
+package io.github.taverna_extras.component.ui.preference;
import static java.lang.String.format;
@@ -27,7 +27,7 @@ import java.util.TreeMap;
import javax.swing.table.DefaultTableModel;
-import org.apache.taverna.component.api.Registry;
+import io.github.taverna_extras.component.api.Registry;
/**
* @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/preference/RemoteRegistryPanel.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/preference/RemoteRegistryPanel.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/preference/RemoteRegistryPanel.java
index 7f9e692..1f98933 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/preference/RemoteRegistryPanel.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/preference/RemoteRegistryPanel.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.taverna.component.ui.preference;
+package io.github.taverna_extras.component.ui.preference;
import static java.awt.GridBagConstraints.HORIZONTAL;
import static java.awt.GridBagConstraints.NONE;
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/serviceprovider/ComponentServiceDesc.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/serviceprovider/ComponentServiceDesc.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/serviceprovider/ComponentServiceDesc.java
index f7991c4..03b2eda 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/serviceprovider/ComponentServiceDesc.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/serviceprovider/ComponentServiceDesc.java
@@ -17,15 +17,15 @@
* under the License.
*/
-package org.apache.taverna.component.ui.serviceprovider;
+package io.github.taverna_extras.component.ui.serviceprovider;
import static java.util.Arrays.asList;
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.URI;
import java.net.URL;
@@ -35,11 +35,11 @@ import java.util.List;
import javax.swing.Icon;
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 org.apache.taverna.component.ui.preference.ComponentPreference;
+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 io.github.taverna_extras.component.ui.preference.ComponentPreference;
import org.apache.taverna.scufl2.api.activity.Activity;
import org.apache.taverna.scufl2.api.configurations.Configuration;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/serviceprovider/ComponentServiceIcon.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/serviceprovider/ComponentServiceIcon.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/serviceprovider/ComponentServiceIcon.java
index dcd999a..16e0d5f 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/serviceprovider/ComponentServiceIcon.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/serviceprovider/ComponentServiceIcon.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.taverna.component.ui.serviceprovider;
+package io.github.taverna_extras.component.ui.serviceprovider;
-import static org.apache.taverna.component.ui.serviceprovider.Service.COMPONENT_ACTIVITY_URI;
+import static io.github.taverna_extras.component.ui.serviceprovider.Service.COMPONENT_ACTIVITY_URI;
import java.net.URI;
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/serviceprovider/ComponentServiceProvider.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/serviceprovider/ComponentServiceProvider.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/serviceprovider/ComponentServiceProvider.java
index c0d0d7c..d5350d0 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/serviceprovider/ComponentServiceProvider.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/serviceprovider/ComponentServiceProvider.java
@@ -17,16 +17,16 @@
* under the License.
*/
-package org.apache.taverna.component.ui.serviceprovider;
+package io.github.taverna_extras.component.ui.serviceprovider;
import static java.util.Arrays.asList;
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.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.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.URI;
@@ -38,15 +38,15 @@ import java.util.SortedMap;
import javax.swing.Icon;
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.ui.panel.RegistryAndFamilyChooserPanel;
-import org.apache.taverna.component.ui.preference.ComponentPreference;
-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.Family;
+import io.github.taverna_extras.component.api.Registry;
+import io.github.taverna_extras.component.api.Version;
+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.util.Utils;
import org.apache.taverna.scufl2.api.common.Visitor;
import org.apache.taverna.scufl2.api.configurations.Configuration;
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/serviceprovider/ComponentServiceProviderConfig.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/serviceprovider/ComponentServiceProviderConfig.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/serviceprovider/ComponentServiceProviderConfig.java
index e7c050f..72b7458 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/serviceprovider/ComponentServiceProviderConfig.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/serviceprovider/ComponentServiceProviderConfig.java
@@ -17,16 +17,16 @@
* under the License.
*/
-package org.apache.taverna.component.ui.serviceprovider;
+package io.github.taverna_extras.component.ui.serviceprovider;
-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.serviceprovider.ComponentServiceProvider.providerId;
+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.serviceprovider.ComponentServiceProvider.providerId;
import java.net.URL;
-import org.apache.taverna.component.api.Family;
-import org.apache.taverna.component.api.Version;
+import io.github.taverna_extras.component.api.Family;
+import io.github.taverna_extras.component.api.Version;
import org.apache.taverna.scufl2.api.configurations.Configuration;
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/serviceprovider/Service.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/serviceprovider/Service.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/serviceprovider/Service.java
index 6aafa69..32c606e 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/serviceprovider/Service.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/serviceprovider/Service.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.taverna.component.ui.serviceprovider;
+package io.github.taverna_extras.component.ui.serviceprovider;
import java.net.URI;
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/util/ComponentFileType.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/util/ComponentFileType.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/util/ComponentFileType.java
index 1f6b08d..ba4801e 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/util/ComponentFileType.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/util/ComponentFileType.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.taverna.component.ui.util;
+package io.github.taverna_extras.component.ui.util;
import org.apache.taverna.workbench.file.FileType;
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/util/ComponentHealthCheck.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/util/ComponentHealthCheck.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/util/ComponentHealthCheck.java
index 2a9573d..a3585f4 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/util/ComponentHealthCheck.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/util/ComponentHealthCheck.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.taverna.component.ui.util;
+package io.github.taverna_extras.component.ui.util;
import static org.apache.log4j.Logger.getLogger;
@@ -25,10 +25,10 @@ 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.Version;
-import org.apache.taverna.component.ui.ComponentActivityConfigurationBean;
+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 org.apache.taverna.scufl2.api.activity.Activity;
import org.apache.taverna.scufl2.api.common.Visitor;
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/util/Utils.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/util/Utils.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/util/Utils.java
index 4a568e2..e81cbf6 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/util/Utils.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/util/Utils.java
@@ -17,18 +17,18 @@
* under the License.
*/
-package org.apache.taverna.component.ui.util;
+package io.github.taverna_extras.component.ui.util;
-import static org.apache.taverna.component.ui.ComponentConstants.ACTIVITY_URI;
+import static io.github.taverna_extras.component.ui.ComponentConstants.ACTIVITY_URI;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.taverna.component.api.ComponentFactory;
-import org.apache.taverna.component.api.Version;
-import org.apache.taverna.component.ui.preference.ComponentPreference;
-import org.apache.taverna.component.ui.serviceprovider.ComponentServiceIcon;
-import org.apache.taverna.component.ui.serviceprovider.ComponentServiceProvider;
+import io.github.taverna_extras.component.api.ComponentFactory;
+import io.github.taverna_extras.component.api.Version;
+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.ComponentServiceProvider;
import org.apache.taverna.scufl2.api.activity.Activity;
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/view/ComponentActivityContextViewFactory.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentActivityContextViewFactory.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentActivityContextViewFactory.java
index b457807..c27278f 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentActivityContextViewFactory.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentActivityContextViewFactory.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.taverna.component.ui.view;
+package io.github.taverna_extras.component.ui.view;
-import static org.apache.taverna.component.api.config.ComponentConfig.URI;
+import static io.github.taverna_extras.component.api.config.ComponentConfig.URI;
import java.awt.Frame;
import java.net.MalformedURLException;
@@ -28,8 +28,8 @@ import java.util.List;
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.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/view/ComponentActivitySemanticAnnotationContextViewFactory.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentActivitySemanticAnnotationContextViewFactory.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentActivitySemanticAnnotationContextViewFactory.java
index 10359ed..fcb6e4a 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentActivitySemanticAnnotationContextViewFactory.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentActivitySemanticAnnotationContextViewFactory.java
@@ -17,21 +17,21 @@
* under the License.
*/
-package org.apache.taverna.component.ui.view;
+package io.github.taverna_extras.component.ui.view;
import static org.apache.log4j.Logger.getLogger;
-import static org.apache.taverna.component.api.config.ComponentConfig.URI;
+import static io.github.taverna_extras.component.api.config.ComponentConfig.URI;
import java.net.MalformedURLException;
import java.util.Arrays;
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.profile.Profile;
-import org.apache.taverna.component.ui.ComponentActivityConfigurationBean;
-import org.apache.taverna.component.ui.annotation.AbstractSemanticAnnotationContextualView;
+import io.github.taverna_extras.component.api.ComponentException;
+import io.github.taverna_extras.component.api.ComponentFactory;
+import io.github.taverna_extras.component.api.profile.Profile;
+import io.github.taverna_extras.component.ui.ComponentActivityConfigurationBean;
+import io.github.taverna_extras.component.ui.annotation.AbstractSemanticAnnotationContextualView;
import org.apache.taverna.scufl2.api.activity.Activity;
import org.apache.taverna.scufl2.api.core.Workflow;
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/view/ComponentActivitySemanticAnnotationPanel.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentActivitySemanticAnnotationPanel.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentActivitySemanticAnnotationPanel.java
index bfb7f37..d3580a8 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentActivitySemanticAnnotationPanel.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentActivitySemanticAnnotationPanel.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.taverna.component.ui.view;
+package io.github.taverna_extras.component.ui.view;
import static java.awt.Color.GRAY;
import static java.awt.Color.WHITE;
@@ -26,8 +26,8 @@ import static java.awt.GridBagConstraints.EAST;
import static java.awt.GridBagConstraints.HORIZONTAL;
import static java.awt.GridBagConstraints.SOUTHEAST;
import static java.lang.String.format;
-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.Component;
import java.awt.Graphics;
@@ -42,7 +42,7 @@ import javax.swing.JTextArea;
import javax.swing.border.AbstractBorder;
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.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/view/ComponentContextViewFactory.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentContextViewFactory.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentContextViewFactory.java
index d8bbc58..938a32e 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentContextViewFactory.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentContextViewFactory.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.taverna.component.ui.view;
+package io.github.taverna_extras.component.ui.view;
-import static org.apache.taverna.component.api.config.ComponentConfig.URI;
+import static io.github.taverna_extras.component.api.config.ComponentConfig.URI;
import java.util.Arrays;
import java.util.List;
-import org.apache.taverna.component.api.Version;
+import io.github.taverna_extras.component.api.Version;
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/view/ComponentContextualView.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentContextualView.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentContextualView.java
index 980e37c..c763d06 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentContextualView.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ComponentContextualView.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.taverna.component.ui.view;
+package io.github.taverna_extras.component.ui.view;
import static java.lang.String.format;
@@ -26,7 +26,7 @@ import java.awt.Color;
import javax.swing.JComponent;
import javax.swing.JEditorPane;
-import org.apache.taverna.component.api.Version;
+import io.github.taverna_extras.component.api.Version;
import org.apache.taverna.lang.ui.HtmlUtils;
import org.apache.taverna.workbench.configuration.colour.ColourManager;
import org.apache.taverna.workbench.ui.views.contextualviews.ContextualView;
@@ -58,7 +58,7 @@ public class ComponentContextualView extends ContextualView {
public String getBackgroundColour() {
Color colour = colourManager.getPreferredColour(
- "org.apache.taverna.component.registry.Component");
+ "io.github.taverna_extras.component.registry.Component");
return format("#%1$2x%2$2x%3$2x", colour.getRed(), colour.getGreen(),
colour.getBlue());
}
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/view/ViewUtil.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ViewUtil.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ViewUtil.java
index bcdbacc..5764f6c 100644
--- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ViewUtil.java
+++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/view/ViewUtil.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.taverna.component.ui.view;
+package io.github.taverna_extras.component.ui.view;
import static java.lang.String.format;
import static org.apache.log4j.Logger.getLogger;
@@ -27,11 +27,11 @@ import java.net.URL;
import java.util.Set;
import org.apache.log4j.Logger;
-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.Version;
-import org.apache.taverna.component.ui.ComponentActivityConfigurationBean;
+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.Version;
+import io.github.taverna_extras.component.ui.ComponentActivityConfigurationBean;
import org.apache.taverna.scufl2.api.configurations.Configuration;
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/resources/META-INF/services/net.sf.taverna.t2.workbench.report.explainer.VisitExplainer
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.report.explainer.VisitExplainer b/taverna-component-activity-ui/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.report.explainer.VisitExplainer
index 829fdbc..fa575d0 100644
--- a/taverna-component-activity-ui/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.report.explainer.VisitExplainer
+++ b/taverna-component-activity-ui/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.report.explainer.VisitExplainer
@@ -1 +1 @@
-org.apache.taverna.component.ui.file.ComponentDataflowHealthCheckExplainer
+io.github.taverna_extras.component.ui.file.ComponentDataflowHealthCheckExplainer
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/resources/META-INF/services/org.apache.taverna.component.ui.annotation.PropertyPanelFactorySPI
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/resources/META-INF/services/org.apache.taverna.component.ui.annotation.PropertyPanelFactorySPI b/taverna-component-activity-ui/src/main/resources/META-INF/services/org.apache.taverna.component.ui.annotation.PropertyPanelFactorySPI
index c025707..f26b07e 100644
--- a/taverna-component-activity-ui/src/main/resources/META-INF/services/org.apache.taverna.component.ui.annotation.PropertyPanelFactorySPI
+++ b/taverna-component-activity-ui/src/main/resources/META-INF/services/org.apache.taverna.component.ui.annotation.PropertyPanelFactorySPI
@@ -1,5 +1,5 @@
-org.apache.taverna.component.ui.annotation.AnnotationPropertyPanelFactory
-org.apache.taverna.component.ui.annotation.DatatypePropertyPanelFactory
-org.apache.taverna.component.ui.annotation.ObjectPropertyWithIndividualsPanelFactory
-org.apache.taverna.component.ui.annotation.DateTimePropertyPanelFactory
-org.apache.taverna.component.ui.annotation.FallbackPropertyPanelFactory
\ No newline at end of file
+io.github.taverna_extras.component.ui.annotation.AnnotationPropertyPanelFactory
+io.github.taverna_extras.component.ui.annotation.DatatypePropertyPanelFactory
+io.github.taverna_extras.component.ui.annotation.ObjectPropertyWithIndividualsPanelFactory
+io.github.taverna_extras.component.ui.annotation.DateTimePropertyPanelFactory
+io.github.taverna_extras.component.ui.annotation.FallbackPropertyPanelFactory
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity-ui/src/main/resources/META-INF/spring/component-activity-context.xml
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/src/main/resources/META-INF/spring/component-activity-context.xml b/taverna-component-activity-ui/src/main/resources/META-INF/spring/component-activity-context.xml
index d6d425d..8112bf5 100644
--- a/taverna-component-activity-ui/src/main/resources/META-INF/spring/component-activity-context.xml
+++ b/taverna-component-activity-ui/src/main/resources/META-INF/spring/component-activity-context.xml
@@ -46,16 +46,16 @@
http://www.springframework.org/schema/util http://www.springframework.org/schema/beans/spring-util.xsd">
<context:annotation-config />
- <bean id="prefs" class="org.apache.taverna.component.ui.preference.ComponentPreference">
+ <bean id="prefs" class="io.github.taverna_extras.component.ui.preference.ComponentPreference">
<constructor-arg name="cm" ref="configManager" />
<constructor-arg name="factory" ref="componentFactory" />
</bean>
- <bean id="preferencePanel" class="org.apache.taverna.component.ui.preference.ComponentPreferencePanel">
+ <bean id="preferencePanel" class="io.github.taverna_extras.component.ui.preference.ComponentPreferencePanel">
<constructor-arg name="componentFactory" ref="componentFactory" />
<constructor-arg name="preferences" ref="prefs" />
</bean>
<bean id="componentSupport"
- class="org.apache.taverna.component.ui.menu.component.ComponentCreatorSupport">
+ class="io.github.taverna_extras.component.ui.menu.component.ComponentCreatorSupport">
<property name="componentFactory" ref="componentFactory" />
<property name="preferences" ref="prefs" />
<property name="fileManager" ref="fileManager" />
@@ -63,9 +63,9 @@
<property name="fileType" ref="fileType" />
<property name="selectionManager" ref="selectionManager" />
</bean>
- <bean id="fileType" class="org.apache.taverna.component.ui.util.ComponentFileType" />
- <bean id="icon" class="org.apache.taverna.component.ui.serviceprovider.ComponentServiceIcon" />
- <bean id="utils" class="org.apache.taverna.component.ui.util.Utils">
+ <bean id="fileType" class="io.github.taverna_extras.component.ui.util.ComponentFileType" />
+ <bean id="icon" class="io.github.taverna_extras.component.ui.serviceprovider.ComponentServiceIcon" />
+ <bean id="utils" class="io.github.taverna_extras.component.ui.util.Utils">
<property name="componentFactory" ref="componentFactory" />
<property name="fileManager" ref="fileManager" />
<property name="icon" ref="icon" />
@@ -79,7 +79,7 @@
<entry key="name" value="componentServiceProvider" />
</osgi:service-properties>
<bean
- class="org.apache.taverna.component.ui.serviceprovider.ComponentServiceProvider">
+ class="io.github.taverna_extras.component.ui.serviceprovider.ComponentServiceProvider">
<constructor-arg ref="componentFactory" index="0" />
<constructor-arg ref="prefs" index="1" />
<constructor-arg ref="icon" index="2" />
@@ -92,7 +92,7 @@
<!-- === Startup === -->
<osgi:service interface="net.sf.taverna.t2.workbench.StartupSPI">
- <bean class="org.apache.taverna.component.ui.file.FileManagerObserver">
+ <bean class="io.github.taverna_extras.component.ui.file.FileManagerObserver">
<property name="colourManager" ref="colourManager" />
<property name="fileManager" ref="fileManager" />
<property name="graphView" ref="graphView" />
@@ -102,13 +102,13 @@
<!-- === Dataflow persistence handlers === -->
<osgi:service interface="net.sf.taverna.t2.workbench.file.DataflowPersistenceHandler">
- <bean class="org.apache.taverna.component.ui.file.ComponentOpener">
+ <bean class="io.github.taverna_extras.component.ui.file.ComponentOpener">
<property name="componentFactory" ref="componentFactory" />
<property name="fileType" ref="fileType" />
</bean>
</osgi:service>
<osgi:service interface="net.sf.taverna.t2.workbench.file.DataflowPersistenceHandler">
- <bean class="org.apache.taverna.component.ui.file.ComponentSaver">
+ <bean class="io.github.taverna_extras.component.ui.file.ComponentSaver">
<property name="componentFactory" ref="componentFactory" />
<property name="fileType" ref="fileType" />
</bean>
@@ -116,7 +116,7 @@
<!-- === Health checkers === -->
<osgi:service interface="net.sf.taverna.t2.workflowmodel.health.HealthChecker">
- <bean class="org.apache.taverna.component.ui.file.ComponentDataflowHealthChecker">
+ <bean class="io.github.taverna_extras.component.ui.file.ComponentDataflowHealthChecker">
<property name="componentFactory" ref="componentFactory" />
<property name="fileManager" ref="fileManager" />
</bean>
@@ -128,7 +128,7 @@
<entry key="name" value="componentConfigurationUI" />
</osgi:service-properties>
<bean
- class="org.apache.taverna.component.ui.preference.ComponentPreferenceUIFactory">
+ class="io.github.taverna_extras.component.ui.preference.ComponentPreferenceUIFactory">
<property name="configPanel" ref="preferencePanel" />
<property name="preferences" ref="prefs" />
</bean>
@@ -141,7 +141,7 @@
<entry key="name" value="componentActivityContextView" />
</osgi:service-properties>
<bean
- class="org.apache.taverna.component.ui.view.ComponentActivityContextViewFactory">
+ class="io.github.taverna_extras.component.ui.view.ComponentActivityContextViewFactory">
<property name="colourManager" ref="colourManager" />
<property name="componentFactory" ref="componentFactory" />
<property name="editManager" ref="editManager" />
@@ -157,7 +157,7 @@
<osgi:service-properties>
<entry key="name" value="componentContextView" />
</osgi:service-properties>
- <bean class="org.apache.taverna.component.ui.view.ComponentContextViewFactory">
+ <bean class="io.github.taverna_extras.component.ui.view.ComponentContextViewFactory">
<property name="fileManager" ref="fileManager" />
</bean>
</osgi:service>
@@ -167,7 +167,7 @@
<entry key="name" value="componentActivitySemanticAnnotationContextView" />
</osgi:service-properties>
<bean
- class="org.apache.taverna.component.ui.view.ComponentActivitySemanticAnnotationContextViewFactory">
+ class="io.github.taverna_extras.component.ui.view.ComponentActivitySemanticAnnotationContextViewFactory">
<property name="componentFactory" ref="componentFactory" />
<property name="fileManager" ref="fileManager" />
</bean>
@@ -178,7 +178,7 @@
<entry key="name" value="semanticAnnotationContextView" />
</osgi:service-properties>
<bean
- class="org.apache.taverna.component.ui.annotation.SemanticAnnotationContextualViewFactory">
+ class="io.github.taverna_extras.component.ui.annotation.SemanticAnnotationContextualViewFactory">
<property name="componentFactory" ref="componentFactory" />
<property name="fileManager" ref="fileManager" />
</bean>
@@ -190,7 +190,7 @@
<entry key="name" value="componentConfigureAction" />
</osgi:service-properties>
<bean id="componentConfigureMenuAction"
- class="org.apache.taverna.component.ui.menu.ComponentConfigureMenuAction">
+ class="io.github.taverna_extras.component.ui.menu.ComponentConfigureMenuAction">
<property name="activityIconManager" ref="iconManager" />
<property name="componentFactory" ref="componentFactory" />
<property name="editManager" ref="editManager" />
@@ -200,7 +200,7 @@
</bean>
</osgi:service>
<bean id="componentServiceCreatorMenuAction"
- class="org.apache.taverna.component.ui.menu.component.ComponentServiceCreatorMenuAction">
+ class="io.github.taverna_extras.component.ui.menu.component.ComponentServiceCreatorMenuAction">
<description>Don't publish this bean yet.</description>
<property name="icon" ref="icon" />
<property name="selectionManager" ref="selectionManager" />
@@ -211,7 +211,7 @@
<entry key="name" value="nestedWorkflowCreatorAction" />
</osgi:service-properties>
<bean
- class="org.apache.taverna.component.ui.menu.NestedWorkflowCreatorMenuAction">
+ class="io.github.taverna_extras.component.ui.menu.NestedWorkflowCreatorMenuAction">
<property name="editManager" ref="editManager" />
<property name="graphView" ref="graphView" />
<property name="selectionManager" ref="selectionManager" />
@@ -222,7 +222,7 @@
<entry key="name" value="componentReplaceAction" />
</osgi:service-properties>
<bean
- class="org.apache.taverna.component.ui.menu.ReplaceByComponentMenuAction">
+ class="io.github.taverna_extras.component.ui.menu.ReplaceByComponentMenuAction">
<property name="componentFactory" ref="componentFactory" />
<property name="editManager" ref="editManager" />
<property name="icon" ref="icon" />
@@ -235,7 +235,7 @@
<entry key="name" value="componentOpenAction" />
</osgi:service-properties>
<bean
- class="org.apache.taverna.component.ui.menu.OpenComponentFromComponentActivityMenuAction">
+ class="io.github.taverna_extras.component.ui.menu.OpenComponentFromComponentActivityMenuAction">
<property name="componentFactory" ref="componentFactory" />
<property name="fileManager" ref="fileManager" />
<property name="graphView" ref="graphView" />
@@ -245,19 +245,19 @@
</bean>
</osgi:service>
<osgi:service interface="net.sf.taverna.t2.ui.menu.MenuComponent">
- <bean class="org.apache.taverna.component.ui.menu.ComponentMenu" />
+ <bean class="io.github.taverna_extras.component.ui.menu.ComponentMenu" />
</osgi:service>
<osgi:service interface="net.sf.taverna.t2.ui.menu.MenuComponent">
<bean
- class="org.apache.taverna.component.ui.menu.registry.ComponentRegistryMenuSection" />
+ class="io.github.taverna_extras.component.ui.menu.registry.ComponentRegistryMenuSection" />
</osgi:service>
<osgi:service interface="net.sf.taverna.t2.ui.menu.MenuComponent">
<osgi:service-properties>
<entry key="name" value="componentRegistryManageAction" />
</osgi:service-properties>
<bean
- class="org.apache.taverna.component.ui.menu.registry.ComponentRegistryManageMenuAction">
+ class="io.github.taverna_extras.component.ui.menu.registry.ComponentRegistryManageMenuAction">
<property name="configurationFrame"><!-- FIXME --></property>
<property name="icon" ref="icon" />
</bean>
@@ -265,14 +265,14 @@
<osgi:service interface="net.sf.taverna.t2.ui.menu.MenuComponent">
<bean
- class="org.apache.taverna.component.ui.menu.profile.ComponentProfileMenuSection" />
+ class="io.github.taverna_extras.component.ui.menu.profile.ComponentProfileMenuSection" />
</osgi:service>
<osgi:service interface="net.sf.taverna.t2.ui.menu.MenuComponent">
<osgi:service-properties>
<entry key="name" value="componentProfileImportAction" />
</osgi:service-properties>
<bean
- class="org.apache.taverna.component.ui.menu.profile.ComponentProfileImportMenuAction">
+ class="io.github.taverna_extras.component.ui.menu.profile.ComponentProfileImportMenuAction">
<property name="componentFactory" ref="componentFactory" />
<property name="icon" ref="icon" />
<property name="preferences" ref="prefs" />
@@ -283,27 +283,27 @@
<entry key="name" value="componentProfileCopyAction" />
</osgi:service-properties>
<bean
- class="org.apache.taverna.component.ui.menu.profile.ComponentProfileCopyMenuAction">
+ class="io.github.taverna_extras.component.ui.menu.profile.ComponentProfileCopyMenuAction">
<property name="preferences" ref="prefs" />
<property name="icon" ref="icon" />
</bean>
</osgi:service>
<bean id="componentProfileDeleteMenuAction"
- class="org.apache.taverna.component.ui.menu.profile.ComponentProfileDeleteMenuAction">
+ class="io.github.taverna_extras.component.ui.menu.profile.ComponentProfileDeleteMenuAction">
<property name="icon" ref="icon" />
<property name="preferences" ref="prefs" />
</bean>
<osgi:service interface="net.sf.taverna.t2.ui.menu.MenuComponent">
<bean
- class="org.apache.taverna.component.ui.menu.family.ComponentFamilyMenuSection" />
+ class="io.github.taverna_extras.component.ui.menu.family.ComponentFamilyMenuSection" />
</osgi:service>
<osgi:service interface="net.sf.taverna.t2.ui.menu.MenuComponent">
<osgi:service-properties>
<entry key="name" value="componentFamilyCreateAction" />
</osgi:service-properties>
<bean
- class="org.apache.taverna.component.ui.menu.family.ComponentFamilyCreateMenuAction">
+ class="io.github.taverna_extras.component.ui.menu.family.ComponentFamilyCreateMenuAction">
<property name="preferences" ref="prefs" />
<property name="icon" ref="icon" />
</bean>
@@ -313,7 +313,7 @@
<entry key="name" value="componentFamilyDeleteAction" />
</osgi:service-properties>
<bean
- class="org.apache.taverna.component.ui.menu.family.ComponentFamilyDeleteMenuAction">
+ class="io.github.taverna_extras.component.ui.menu.family.ComponentFamilyDeleteMenuAction">
<property name="fileManager" ref="fileManager" />
<property name="icon" ref="icon" />
<property name="preferences" ref="prefs" />
@@ -323,14 +323,14 @@
<osgi:service interface="net.sf.taverna.t2.ui.menu.MenuComponent">
<bean
- class="org.apache.taverna.component.ui.menu.component.ComponentMenuSection" />
+ class="io.github.taverna_extras.component.ui.menu.component.ComponentMenuSection" />
</osgi:service>
<osgi:service interface="net.sf.taverna.t2.ui.menu.MenuComponent">
<osgi:service-properties>
<entry key="name" value="componentCreateAction" />
</osgi:service-properties>
<bean
- class="org.apache.taverna.component.ui.menu.component.ComponentWorkflowCreatorMenuAction">
+ class="io.github.taverna_extras.component.ui.menu.component.ComponentWorkflowCreatorMenuAction">
<property name="fileManager" ref="fileManager" />
<property name="graphView" ref="graphView" />
<property name="icon" ref="icon" />
@@ -343,7 +343,7 @@
<entry key="name" value="componentOpenAction" />
</osgi:service-properties>
<bean
- class="org.apache.taverna.component.ui.menu.component.FileOpenFromComponentMenuAction">
+ class="io.github.taverna_extras.component.ui.menu.component.FileOpenFromComponentMenuAction">
<property name="fileManager" ref="fileManager" />
<property name="fileType" ref="fileType" />
<property name="graphView" ref="graphView" />
@@ -356,7 +356,7 @@
<entry key="name" value="componentCopyAction" />
</osgi:service-properties>
<bean
- class="org.apache.taverna.component.ui.menu.component.ComponentCopyMenuAction">
+ class="io.github.taverna_extras.component.ui.menu.component.ComponentCopyMenuAction">
<property name="icon" ref="icon" />
<property name="preferences" ref="prefs" />
<property name="utils" ref="utils" />
@@ -367,7 +367,7 @@
<entry key="name" value="componentDeleteAction" />
</osgi:service-properties>
<bean
- class="org.apache.taverna.component.ui.menu.component.ComponentDeleteMenuAction">
+ class="io.github.taverna_extras.component.ui.menu.component.ComponentDeleteMenuAction">
<property name="fileManager" ref="fileManager" />
<property name="icon" ref="icon" />
<property name="preferences" ref="prefs" />
@@ -379,7 +379,7 @@
<entry key="name" value="componentMergeAction" />
</osgi:service-properties>
<bean
- class="org.apache.taverna.component.ui.menu.component.ComponentMergeMenuAction">
+ class="io.github.taverna_extras.component.ui.menu.component.ComponentMergeMenuAction">
<property name="icon" ref="icon" />
<property name="preferences" ref="prefs" />
</bean>
@@ -389,7 +389,7 @@
<entry key="name" value="componentCloseAction" />
</osgi:service-properties>
<bean
- class="org.apache.taverna.component.ui.menu.component.ComponentCloseMenuAction">
+ class="io.github.taverna_extras.component.ui.menu.component.ComponentCloseMenuAction">
<property name="closeWorkflowAction"><!-- FIXME net.sf.taverna.t2.workbench.file.impl.actions.CloseWorkflowAction --></property>
<property name="fileManager" ref="fileManager" />
<property name="icon" ref="icon" />
@@ -401,7 +401,7 @@
<entry key="name" value="componentSaveAction" />
</osgi:service-properties>
<bean
- class="org.apache.taverna.component.ui.menu.component.ComponentSaveMenuAction">
+ class="io.github.taverna_extras.component.ui.menu.component.ComponentSaveMenuAction">
<property name="saveWorkflowAction"><!-- FIXME net.sf.taverna.t2.workbench.file.impl.actions.SaveWorkflowAction --></property>
<property name="fileManager" ref="fileManager" />
<property name="icon" ref="icon" />
@@ -409,7 +409,7 @@
</bean>
</osgi:service>
<bean id="componentSearchMenuAction"
- class="org.apache.taverna.component.ui.menu.component.ComponentSearchMenuAction">
+ class="io.github.taverna_extras.component.ui.menu.component.ComponentSearchMenuAction">
<description>Don't publish this bean yet.</description>
<property name="componentFactory" ref="componentFactory" />
<property name="editManager" ref="editManager" />
@@ -425,7 +425,7 @@
<entry key="name" value="annotateSemanticsAction" />
</osgi:service-properties>
<bean
- class="org.apache.taverna.component.ui.annotation.AnnotateSemanticsMenuAction">
+ class="io.github.taverna_extras.component.ui.annotation.AnnotateSemanticsMenuAction">
<property name="componentFactory" ref="componentFactory" />
<property name="fileManager" ref="fileManager" />
</bean>
@@ -433,16 +433,16 @@
<!--
<bean id="ComponentLocalHealthChecker"
- class="org.apache.taverna.component.ComponentActivityLocalChecker" />
+ class="io.github.taverna_extras.component.ComponentActivityLocalChecker" />
<bean id="ComponentUpgradeHealthChecker"
- class="org.apache.taverna.component.ComponentActivityUpgradeChecker">
+ class="io.github.taverna_extras.component.ComponentActivityUpgradeChecker">
<property name="componentUtil" ref="componentUtil" />
</bean>
- <bean id="baseProfileLocator" class="org.apache.taverna.component.profile.BaseProfileLocator">
+ <bean id="baseProfileLocator" class="io.github.taverna_extras.component.profile.BaseProfileLocator">
<property name="appConfig" ref="app-config" />
</bean>
- <bean id="componentActivityFactory" class="org.apache.taverna.component.ComponentActivityFactory">
+ <bean id="componentActivityFactory" class="io.github.taverna_extras.component.ComponentActivityFactory">
<property name="componentUtil" ref="componentUtil" />
<property name="dataflowCache" ref="cache" />
<property name="edits" ref="edits" />
@@ -450,32 +450,32 @@
</bean>
<bean id="networkRegistry"
- class="org.apache.taverna.component.registry.standard.NewComponentRegistryFactory">
+ class="io.github.taverna_extras.component.registry.standard.NewComponentRegistryFactory">
<property name="credentialManager" ref="credentialManager" />
<property name="componentUtil" ref="componentUtil" />
<property name="systemUtils" ref="systemUtil" />
<property name="annotationUtils" ref="annotationUtil" />
</bean>
<bean id="fileRegistry"
- class="org.apache.taverna.component.registry.local.LocalComponentRegistryFactory">
+ class="io.github.taverna_extras.component.registry.local.LocalComponentRegistryFactory">
<property name="componentUtil" ref="componentUtil" />
<property name="systemUtils" ref="systemUtil" />
</bean>
- <bean id="componentUtil" class="org.apache.taverna.component.registry.ComponentUtil">
+ <bean id="componentUtil" class="io.github.taverna_extras.component.registry.ComponentUtil">
<property name="networkLocator" ref="networkRegistry" />
<property name="fileLocator" ref="fileRegistry" />
<property name="baseLocator" ref="baseProfileLocator" />
</bean>
- <bean id="cache" class="org.apache.taverna.component.registry.ComponentImplementationCache">
+ <bean id="cache" class="io.github.taverna_extras.component.registry.ComponentImplementationCache">
<property name="componentUtil" ref="componentUtil" />
</bean>
- <bean id="systemUtil" class="org.apache.taverna.component.utils.SystemUtils">
+ <bean id="systemUtil" class="io.github.taverna_extras.component.utils.SystemUtils">
<property name="appConfig" ref="app-config" />
<property name="workflowBundler" ref="workflowBundleIO" />
<property name="compilers" ref="compilers" />
</bean>
- <bean id="annotationUtil" class="org.apache.taverna.component.utils.AnnotationUtils" />
+ <bean id="annotationUtil" class="io.github.taverna_extras.component.utils.AnnotationUtils" />
<osgi:service ref="ComponentLocalHealthChecker"
interface="net.sf.taverna.t2.workflowmodel.health.HealthChecker" />
@@ -484,7 +484,7 @@
<osgi:service ref="componentActivityFactory"
interface="net.sf.taverna.t2.workflowmodel.processor.activity.ActivityFactory" />
<osgi:service ref="componentUtil"
- interface="org.apache.taverna.component.api.ComponentFactory" />
+ interface="io.github.taverna_extras.component.api.ComponentFactory" />
<osgi:reference id="app-config"
interface="uk.org.taverna.configuration.app.ApplicationConfiguration" />
@@ -497,7 +497,7 @@
<osgi:reference id="iconManager" interface="net.sf.taverna.t2.workbench.activityicons.ActivityIconManager" />
<osgi:reference id="colourManager" interface="net.sf.taverna.t2.workbench.configuration.colour.ColourManager" />
- <osgi:reference id="componentFactory" interface="org.apache.taverna.component.api.ComponentFactory" />
+ <osgi:reference id="componentFactory" interface="io.github.taverna_extras.component.api.ComponentFactory" />
<osgi:reference id="configManager" interface="uk.org.taverna.configuration.ConfigurationManager" />
<osgi:reference id="editManager" interface="net.sf.taverna.t2.workbench.edits.EditManager" />
<osgi:reference id="fileManager" interface="net.sf.taverna.t2.workbench.file.FileManager" />
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivity.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivity.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivity.java
index d73e082..9619297 100644
--- a/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivity.java
+++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivity.java
@@ -1,4 +1,4 @@
-package org.apache.taverna.component.activity;
+package io.github.taverna_extras.component.activity;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -24,12 +24,12 @@ import java.net.MalformedURLException;
import java.util.Map;
import org.apache.log4j.Logger;
-import org.apache.taverna.component.api.ComponentException;
-import org.apache.taverna.component.api.profile.ExceptionHandling;
-import org.apache.taverna.component.registry.ComponentImplementationCache;
-import org.apache.taverna.component.registry.ComponentUtil;
-import org.apache.taverna.component.utils.AnnotationUtils;
-import org.apache.taverna.component.utils.SystemUtils;
+import io.github.taverna_extras.component.api.ComponentException;
+import io.github.taverna_extras.component.api.profile.ExceptionHandling;
+import io.github.taverna_extras.component.registry.ComponentImplementationCache;
+import io.github.taverna_extras.component.registry.ComponentUtil;
+import io.github.taverna_extras.component.utils.AnnotationUtils;
+import io.github.taverna_extras.component.utils.SystemUtils;
import com.fasterxml.jackson.databind.JsonNode;
import org.apache.taverna.activities.dataflow.DataflowActivity;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityConfigurationBean.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityConfigurationBean.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityConfigurationBean.java
index c882e41..6819b3f 100644
--- a/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityConfigurationBean.java
+++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityConfigurationBean.java
@@ -1,4 +1,4 @@
-package org.apache.taverna.component.activity;
+package io.github.taverna_extras.component.activity;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,10 +19,10 @@ package org.apache.taverna.component.activity;
*/
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 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 java.io.Serializable;
import java.net.MalformedURLException;
@@ -36,11 +36,11 @@ import java.util.List;
//import net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityPortsDefinitionBean;
import org.apache.log4j.Logger;
-import org.apache.taverna.component.api.Version;
-import org.apache.taverna.component.api.profile.ExceptionHandling;
-import org.apache.taverna.component.registry.ComponentImplementationCache;
-import org.apache.taverna.component.registry.ComponentUtil;
-import org.apache.taverna.component.registry.ComponentVersionIdentification;
+import io.github.taverna_extras.component.api.Version;
+import io.github.taverna_extras.component.api.profile.ExceptionHandling;
+import io.github.taverna_extras.component.registry.ComponentImplementationCache;
+import io.github.taverna_extras.component.registry.ComponentUtil;
+import io.github.taverna_extras.component.registry.ComponentVersionIdentification;
import org.apache.taverna.scufl2.api.container.WorkflowBundle;
import org.apache.taverna.scufl2.api.port.InputWorkflowPort;
@@ -74,7 +74,7 @@ public class ComponentActivityConfigurationBean extends
this.cache = cache;
try {
getPorts();
- } catch (org.apache.taverna.component.api.ComponentException e) {
+ } catch (io.github.taverna_extras.component.api.ComponentException e) {
logger.error("failed to get component realization", e);
}
}
@@ -125,7 +125,7 @@ public class ComponentActivityConfigurationBean extends
.getComponentProfile().getExceptionHandling();
if (eh != null)
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;
@@ -156,7 +156,7 @@ public class ComponentActivityConfigurationBean extends
/**
* @return the ports
*/
- public ActivityPortsDefinitionBean getPorts() throws org.apache.taverna.component.api.ComponentException{
+ public ActivityPortsDefinitionBean getPorts() throws io.github.taverna_extras.component.api.ComponentException{
if (ports == null)
ports = getPortsDefinition(cache.getImplementation(this));
return ports;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityFactory.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityFactory.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityFactory.java
index 0ba4aa9..c90ea1a 100644
--- a/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityFactory.java
+++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityFactory.java
@@ -1,4 +1,4 @@
-package org.apache.taverna.component.activity;
+package io.github.taverna_extras.component.activity;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -24,12 +24,12 @@ import java.net.URI;
import java.util.HashSet;
import java.util.Set;
-import org.apache.taverna.component.api.ComponentException;
-import org.apache.taverna.component.api.Version.ID;
-import org.apache.taverna.component.registry.ComponentImplementationCache;
-import org.apache.taverna.component.registry.ComponentUtil;
-import org.apache.taverna.component.utils.AnnotationUtils;
-import org.apache.taverna.component.utils.SystemUtils;
+import io.github.taverna_extras.component.api.ComponentException;
+import io.github.taverna_extras.component.api.Version.ID;
+import io.github.taverna_extras.component.registry.ComponentImplementationCache;
+import io.github.taverna_extras.component.registry.ComponentUtil;
+import io.github.taverna_extras.component.utils.AnnotationUtils;
+import io.github.taverna_extras.component.utils.SystemUtils;
import org.springframework.beans.factory.annotation.Required;
import com.fasterxml.jackson.databind.JsonNode;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityLocalChecker.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityLocalChecker.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityLocalChecker.java
index 720c3c9..d874241 100644
--- a/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityLocalChecker.java
+++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityLocalChecker.java
@@ -1,4 +1,4 @@
-package org.apache.taverna.component.activity;
+package io.github.taverna_extras.component.activity;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,7 +18,7 @@ package org.apache.taverna.component.activity;
* under the License.
*/
-import static org.apache.taverna.component.activity.ComponentHealthCheck.NON_SHAREABLE;
+import static io.github.taverna_extras.component.activity.ComponentHealthCheck.NON_SHAREABLE;
import java.util.List;
import org.apache.taverna.visit.VisitKind;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityUpgradeChecker.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityUpgradeChecker.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityUpgradeChecker.java
index 31e2052..4d45b60 100644
--- a/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityUpgradeChecker.java
+++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentActivityUpgradeChecker.java
@@ -1,4 +1,4 @@
-package org.apache.taverna.component.activity;
+package io.github.taverna_extras.component.activity;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,13 +19,13 @@ package org.apache.taverna.component.activity;
*/
import static org.apache.log4j.Logger.getLogger;
-import static org.apache.taverna.component.activity.ComponentHealthCheck.OUT_OF_DATE;
+import static io.github.taverna_extras.component.activity.ComponentHealthCheck.OUT_OF_DATE;
import java.util.List;
import org.apache.log4j.Logger;
-import org.apache.taverna.component.api.ComponentException;
-import org.apache.taverna.component.registry.ComponentUtil;
+import io.github.taverna_extras.component.api.ComponentException;
+import io.github.taverna_extras.component.registry.ComponentUtil;
import org.apache.taverna.visit.VisitKind;
import org.apache.taverna.visit.VisitReport;
import static org.apache.taverna.visit.VisitReport.Status.WARNING;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentExceptionFactory.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentExceptionFactory.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentExceptionFactory.java
index 5fb86bc..243fe84 100644
--- a/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentExceptionFactory.java
+++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentExceptionFactory.java
@@ -1,4 +1,4 @@
-package org.apache.taverna.component.activity;
+package io.github.taverna_extras.component.activity;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentHealthCheck.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentHealthCheck.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentHealthCheck.java
index c8d0b3d..0381de1 100644
--- a/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentHealthCheck.java
+++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentHealthCheck.java
@@ -1,4 +1,4 @@
-package org.apache.taverna.component.activity;
+package io.github.taverna_extras.component.activity;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentImplementationException.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentImplementationException.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentImplementationException.java
index 1a59c5a..7ef77f7 100644
--- a/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentImplementationException.java
+++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ComponentImplementationException.java
@@ -1,4 +1,4 @@
-package org.apache.taverna.component.activity;
+package io.github.taverna_extras.component.activity;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ProxyCallback.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ProxyCallback.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ProxyCallback.java
index c62ad63..3a04af3 100644
--- a/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ProxyCallback.java
+++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/ProxyCallback.java
@@ -1,4 +1,4 @@
-package org.apache.taverna.component.activity;
+package io.github.taverna_extras.component.activity;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -31,9 +31,9 @@ import java.util.Set;
import javax.xml.ws.Holder;
import org.apache.log4j.Logger;
-import org.apache.taverna.component.api.profile.ExceptionHandling;
-import org.apache.taverna.component.api.profile.ExceptionReplacement;
-import org.apache.taverna.component.api.profile.HandleException;
+import io.github.taverna_extras.component.api.profile.ExceptionHandling;
+import io.github.taverna_extras.component.api.profile.ExceptionReplacement;
+import io.github.taverna_extras.component.api.profile.HandleException;
import org.apache.taverna.invocation.InvocationContext;
import org.apache.taverna.reference.ErrorDocument;
import org.apache.taverna.reference.ErrorDocumentService;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/package-info.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/package-info.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/package-info.java
index 02e1b7d..086a49b 100644
--- a/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/package-info.java
+++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/activity/package-info.java
@@ -16,4 +16,4 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.taverna.component.activity;
\ No newline at end of file
+package io.github.taverna_extras.component.activity;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/ActivityProfileImpl.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/ActivityProfileImpl.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/ActivityProfileImpl.java
index 5e11ff0..a948cd4 100644
--- a/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/ActivityProfileImpl.java
+++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/ActivityProfileImpl.java
@@ -1,4 +1,4 @@
-package org.apache.taverna.component.profile;
+package io.github.taverna_extras.component.profile;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,11 +21,11 @@ package org.apache.taverna.component.profile;
import java.util.ArrayList;
import java.util.List;
-import org.apache.taverna.component.api.profile.ActivityProfile;
-import org.apache.taverna.component.api.profile.SemanticAnnotationProfile;
+import io.github.taverna_extras.component.api.profile.ActivityProfile;
+import io.github.taverna_extras.component.api.profile.SemanticAnnotationProfile;
-import org.apache.taverna.component.api.profile.doc.Activity;
-import org.apache.taverna.component.api.profile.doc.SemanticAnnotation;
+import io.github.taverna_extras.component.api.profile.doc.Activity;
+import io.github.taverna_extras.component.api.profile.doc.SemanticAnnotation;
/**
* Specifies the semantic annotations that an activity must have.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/BaseProfileLocator.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/BaseProfileLocator.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/BaseProfileLocator.java
index a45caf7..989f411 100644
--- a/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/BaseProfileLocator.java
+++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/BaseProfileLocator.java
@@ -1,4 +1,4 @@
-package org.apache.taverna.component.profile;
+package io.github.taverna_extras.component.profile;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -39,7 +39,7 @@ import org.apache.commons.httpclient.HttpMethod;
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.httpclient.params.HttpClientParams;
import org.apache.log4j.Logger;
-import org.apache.taverna.component.api.ComponentException;
+import io.github.taverna_extras.component.api.ComponentException;
import org.apache.taverna.configuration.app.ApplicationConfiguration;
public class BaseProfileLocator {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/ComponentProfileImpl.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/ComponentProfileImpl.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/ComponentProfileImpl.java
index 26e2a1d..6c7a5b0 100644
--- a/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/ComponentProfileImpl.java
+++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/ComponentProfileImpl.java
@@ -1,4 +1,4 @@
-package org.apache.taverna.component.profile;
+package io.github.taverna_extras.component.profile;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -50,18 +50,18 @@ import javax.xml.transform.stream.StreamSource;
import org.apache.commons.io.IOUtils;
import org.apache.log4j.Logger;
-import org.apache.taverna.component.api.ComponentException;
-import org.apache.taverna.component.api.Registry;
-import org.apache.taverna.component.api.profile.ActivityProfile;
-import org.apache.taverna.component.api.profile.ExceptionHandling;
-import org.apache.taverna.component.api.profile.PortProfile;
-import org.apache.taverna.component.api.profile.SemanticAnnotationProfile;
-
-import org.apache.taverna.component.api.profile.doc.Activity;
-import org.apache.taverna.component.api.profile.doc.Ontology;
-import org.apache.taverna.component.api.profile.doc.Port;
-import org.apache.taverna.component.api.profile.doc.Profile;
-import org.apache.taverna.component.api.profile.doc.SemanticAnnotation;
+import io.github.taverna_extras.component.api.ComponentException;
+import io.github.taverna_extras.component.api.Registry;
+import io.github.taverna_extras.component.api.profile.ActivityProfile;
+import io.github.taverna_extras.component.api.profile.ExceptionHandling;
+import io.github.taverna_extras.component.api.profile.PortProfile;
+import io.github.taverna_extras.component.api.profile.SemanticAnnotationProfile;
+
+import io.github.taverna_extras.component.api.profile.doc.Activity;
+import io.github.taverna_extras.component.api.profile.doc.Ontology;
+import io.github.taverna_extras.component.api.profile.doc.Port;
+import io.github.taverna_extras.component.api.profile.doc.Profile;
+import io.github.taverna_extras.component.api.profile.doc.SemanticAnnotation;
import org.apache.jena.ontology.OntClass;
import org.apache.jena.ontology.OntModel;
@@ -76,7 +76,7 @@ import org.apache.taverna.workflowmodel.health.RemoteHealthChecker;
* @author David Withers
*/
public class ComponentProfileImpl implements
- org.apache.taverna.component.api.profile.Profile {
+ io.github.taverna_extras.component.api.profile.Profile {
private static final Logger logger = getLogger(ComponentProfileImpl.class);
private static final Map<String, OntModel> ontologyModels = new HashMap<>();
private static final JAXBContext jaxbContext;
@@ -90,7 +90,7 @@ public class ComponentProfileImpl implements
"Failed to initialize profile deserialization engine", e);
}
}
- private org.apache.taverna.component.api.profile.Profile parent;
+ private io.github.taverna_extras.component.api.profile.Profile parent;
private Profile profileDoc;
private ExceptionHandling exceptionHandling;
private Registry parentRegistry = null;
@@ -289,7 +289,7 @@ public class ComponentProfileImpl implements
return o == null || o == this;
}
- private synchronized org.apache.taverna.component.api.profile.Profile parent()
+ private synchronized io.github.taverna_extras.component.api.profile.Profile parent()
throws ComponentException {
if (parent == null) {
try {
@@ -459,8 +459,8 @@ public class ComponentProfileImpl implements
}
@Override
- public List<org.apache.taverna.component.api.profile.ActivityProfile> getActivityProfiles() {
- List<org.apache.taverna.component.api.profile.ActivityProfile> activityProfiles = new ArrayList<>();
+ public List<io.github.taverna_extras.component.api.profile.ActivityProfile> getActivityProfiles() {
+ List<io.github.taverna_extras.component.api.profile.ActivityProfile> activityProfiles = new ArrayList<>();
try {
for (Activity activity : getProfileDocument().getComponent()
.getActivity())
@@ -590,7 +590,7 @@ public class ComponentProfileImpl implements
* @author Donal Fellows
*/
final class EmptyProfile implements
- org.apache.taverna.component.api.profile.Profile {
+ io.github.taverna_extras.component.api.profile.Profile {
@Override
public String getName() {
return "";
@@ -657,7 +657,7 @@ final class EmptyProfile implements
}
@Override
- public List<org.apache.taverna.component.api.profile.ActivityProfile> getActivityProfiles() {
+ public List<io.github.taverna_extras.component.api.profile.ActivityProfile> getActivityProfiles() {
return emptyList();
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/PortProfileImpl.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/PortProfileImpl.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/PortProfileImpl.java
index 8207a6f..53a1190 100644
--- a/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/PortProfileImpl.java
+++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/PortProfileImpl.java
@@ -1,4 +1,4 @@
-package org.apache.taverna.component.profile;
+package io.github.taverna_extras.component.profile;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,11 +21,11 @@ package org.apache.taverna.component.profile;
import java.util.ArrayList;
import java.util.List;
-import org.apache.taverna.component.api.profile.PortProfile;
-import org.apache.taverna.component.api.profile.SemanticAnnotationProfile;
+import io.github.taverna_extras.component.api.profile.PortProfile;
+import io.github.taverna_extras.component.api.profile.SemanticAnnotationProfile;
-import org.apache.taverna.component.api.profile.doc.Port;
-import org.apache.taverna.component.api.profile.doc.SemanticAnnotation;
+import io.github.taverna_extras.component.api.profile.doc.Port;
+import io.github.taverna_extras.component.api.profile.doc.SemanticAnnotation;
/**
* Specifies the semantic annotations that a port must have.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/SemanticAnnotationProfileImpl.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/SemanticAnnotationProfileImpl.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/SemanticAnnotationProfileImpl.java
index a5cb000..a3b5afa 100644
--- a/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/SemanticAnnotationProfileImpl.java
+++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/profile/SemanticAnnotationProfileImpl.java
@@ -1,4 +1,4 @@
-package org.apache.taverna.component.profile;
+package io.github.taverna_extras.component.profile;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -28,9 +28,9 @@ import java.util.ArrayList;
import java.util.List;
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.component.api.profile.doc.SemanticAnnotation;
+import io.github.taverna_extras.component.api.profile.doc.SemanticAnnotation;
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/src/main/java/org/apache/taverna/component/registry/ClientVersion.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/ClientVersion.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/ClientVersion.java
index 731f3ec..c9fda59 100644
--- a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/ClientVersion.java
+++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/ClientVersion.java
@@ -1,4 +1,4 @@
-package org.apache.taverna.component.registry;
+package io.github.taverna_extras.component.registry;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/Component.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/Component.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/Component.java
index 4c94287..afdf2b8 100644
--- a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/Component.java
+++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/Component.java
@@ -1,4 +1,4 @@
-package org.apache.taverna.component.registry;
+package io.github.taverna_extras.component.registry;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -27,8 +27,8 @@ import java.net.URL;
import java.util.SortedMap;
import java.util.TreeMap;
-import org.apache.taverna.component.api.ComponentException;
-import org.apache.taverna.component.api.Version;
+import io.github.taverna_extras.component.api.ComponentException;
+import io.github.taverna_extras.component.api.Version;
import org.apache.taverna.scufl2.api.container.WorkflowBundle;
@@ -39,7 +39,7 @@ import org.apache.taverna.scufl2.api.container.WorkflowBundle;
* @author David Withers
*/
public abstract class Component implements
- org.apache.taverna.component.api.Component {
+ io.github.taverna_extras.component.api.Component {
private String name;
private String description;
private URL url;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/ComponentFamily.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/ComponentFamily.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/ComponentFamily.java
index 87cd081..ce8a782 100644
--- a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/ComponentFamily.java
+++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/ComponentFamily.java
@@ -1,4 +1,4 @@
-package org.apache.taverna.component.registry;
+package io.github.taverna_extras.component.registry;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -23,11 +23,11 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.taverna.component.api.Component;
-import org.apache.taverna.component.api.ComponentException;
-import org.apache.taverna.component.api.Registry;
-import org.apache.taverna.component.api.Version;
-import org.apache.taverna.component.api.profile.Profile;
+import io.github.taverna_extras.component.api.Component;
+import io.github.taverna_extras.component.api.ComponentException;
+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 org.apache.taverna.scufl2.api.container.WorkflowBundle;
@@ -38,7 +38,7 @@ import org.apache.taverna.scufl2.api.container.WorkflowBundle;
* @author David Withers
*/
public abstract class ComponentFamily implements
- org.apache.taverna.component.api.Family {
+ io.github.taverna_extras.component.api.Family {
private Registry parentRegistry;
private String name;
private String description;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/ComponentImplementationCache.java
----------------------------------------------------------------------
diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/ComponentImplementationCache.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/ComponentImplementationCache.java
index c7b4602..91846a3 100644
--- a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/ComponentImplementationCache.java
+++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/ComponentImplementationCache.java
@@ -1,4 +1,4 @@
-package org.apache.taverna.component.registry;
+package io.github.taverna_extras.component.registry;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -25,8 +25,8 @@ import java.util.Map;
import java.util.WeakHashMap;
import org.apache.log4j.Logger;
-import org.apache.taverna.component.api.ComponentException;
-import org.apache.taverna.component.api.Version;
+import io.github.taverna_extras.component.api.ComponentException;
+import io.github.taverna_extras.component.api.Version;
import org.apache.taverna.scufl2.api.container.WorkflowBundle;