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/ComponentRegistry.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/ComponentRegistry.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/ComponentRegistry.java index f80ae90..325da27 100644 --- a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/ComponentRegistry.java +++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/ComponentRegistry.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 @@ -26,12 +26,12 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.taverna.component.api.ComponentException; -import org.apache.taverna.component.api.Family; -import org.apache.taverna.component.api.License; -import org.apache.taverna.component.api.SharingPolicy; -import org.apache.taverna.component.api.Version; -import org.apache.taverna.component.api.profile.Profile; +import io.github.taverna_extras.component.api.ComponentException; +import io.github.taverna_extras.component.api.Family; +import io.github.taverna_extras.component.api.License; +import io.github.taverna_extras.component.api.SharingPolicy; +import io.github.taverna_extras.component.api.Version; +import io.github.taverna_extras.component.api.profile.Profile; /** * A ComponentRegistry contains ComponentFamilies and ComponentProfiles. @@ -39,7 +39,7 @@ import org.apache.taverna.component.api.profile.Profile; * @author David Withers */ public abstract class ComponentRegistry implements - org.apache.taverna.component.api.Registry { + io.github.taverna_extras.component.api.Registry { protected Map<String, Family> familyCache = new HashMap<>(); protected List<Profile> profileCache = new ArrayList<>(); protected List<SharingPolicy> permissionCache = new ArrayList<>();
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/ComponentUtil.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/ComponentUtil.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/ComponentUtil.java index 3138e7d..cc31f05 100644 --- a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/ComponentUtil.java +++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/ComponentUtil.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 @@ -22,17 +22,17 @@ import java.net.URL; import java.util.HashMap; import java.util.Map; -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.Profile; -import org.apache.taverna.component.profile.BaseProfileLocator; -import org.apache.taverna.component.profile.ComponentProfileImpl; -import org.apache.taverna.component.registry.local.LocalComponentRegistryFactory; -import org.apache.taverna.component.registry.standard.NewComponentRegistryFactory; +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.Profile; +import io.github.taverna_extras.component.profile.BaseProfileLocator; +import io.github.taverna_extras.component.profile.ComponentProfileImpl; +import io.github.taverna_extras.component.registry.local.LocalComponentRegistryFactory; +import io.github.taverna_extras.component.registry.standard.NewComponentRegistryFactory; import org.springframework.beans.factory.annotation.Required; /** 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/ComponentVersion.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/ComponentVersion.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/ComponentVersion.java index 5950bf8..ab95218 100644 --- a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/ComponentVersion.java +++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/ComponentVersion.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 @@ -18,13 +18,13 @@ package org.apache.taverna.component.registry; * under the License. */ -import org.apache.taverna.component.api.Component; -import org.apache.taverna.component.api.ComponentException; +import io.github.taverna_extras.component.api.Component; +import io.github.taverna_extras.component.api.ComponentException; import org.apache.taverna.scufl2.api.container.WorkflowBundle; public abstract class ComponentVersion implements - org.apache.taverna.component.api.Version { + io.github.taverna_extras.component.api.Version { private Integer versionNumber; private String description; private Component component; 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/ComponentVersionIdentification.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/ComponentVersionIdentification.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/ComponentVersionIdentification.java index 77e366a..4cecab5 100644 --- a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/ComponentVersionIdentification.java +++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/ComponentVersionIdentification.java @@ -1,5 +1,5 @@ -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 @@ -21,17 +21,17 @@ package org.apache.taverna.component.registry; import java.net.URL; -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.Version.ID; +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.Version.ID; /** * @author alanrw * */ public class ComponentVersionIdentification implements - org.apache.taverna.component.api.Version.ID { + io.github.taverna_extras.component.api.Version.ID { private static final long serialVersionUID = 1768548650702925916L; private URL registryBase; private String familyName; @@ -48,7 +48,7 @@ public class ComponentVersionIdentification implements } public ComponentVersionIdentification(Registry registry, Family family, - org.apache.taverna.component.api.Component component, Integer version) { + io.github.taverna_extras.component.api.Component component, Integer version) { this(registry.getRegistryBase(), family.getName(), component.getName(), version); } @@ -206,7 +206,7 @@ public class ComponentVersionIdentification implements } @Override - public boolean mostlyEqualTo(org.apache.taverna.component.api.Component c) { + public boolean mostlyEqualTo(io.github.taverna_extras.component.api.Component c) { return mostlyEqualTo(new ComponentVersionIdentification(c.getRegistry(), c.getFamily(), c, 0)); } } 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/local/LocalComponent.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/local/LocalComponent.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/local/LocalComponent.java index c5274b7..697f57f 100644 --- a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/local/LocalComponent.java +++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/local/LocalComponent.java @@ -1,4 +1,4 @@ -package org.apache.taverna.component.registry.local; +package io.github.taverna_extras.component.registry.local; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -22,19 +22,19 @@ package org.apache.taverna.component.registry.local; import static org.apache.commons.io.FileUtils.readFileToString; import static org.apache.commons.io.FileUtils.writeStringToFile; import static org.apache.log4j.Logger.getLogger; -import static org.apache.taverna.component.registry.local.LocalComponentRegistry.ENC; +import static io.github.taverna_extras.component.registry.local.LocalComponentRegistry.ENC; import java.io.File; import java.io.IOException; import java.util.NoSuchElementException; import org.apache.log4j.Logger; -import org.apache.taverna.component.api.ComponentException; -import org.apache.taverna.component.api.Family; -import org.apache.taverna.component.api.Registry; -import org.apache.taverna.component.api.Version; -import org.apache.taverna.component.registry.Component; -import org.apache.taverna.component.utils.SystemUtils; +import io.github.taverna_extras.component.api.ComponentException; +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.registry.Component; +import io.github.taverna_extras.component.utils.SystemUtils; 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/src/main/java/org/apache/taverna/component/registry/local/LocalComponentFamily.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/local/LocalComponentFamily.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/local/LocalComponentFamily.java index 0e2802e..b9a692c 100644 --- a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/local/LocalComponentFamily.java +++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/local/LocalComponentFamily.java @@ -1,4 +1,4 @@ -package org.apache.taverna.component.registry.local; +package io.github.taverna_extras.component.registry.local; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -22,19 +22,19 @@ import static org.apache.commons.io.FileUtils.deleteDirectory; import static org.apache.commons.io.FileUtils.readFileToString; import static org.apache.commons.io.FileUtils.writeStringToFile; import static org.apache.log4j.Logger.getLogger; -import static org.apache.taverna.component.registry.local.LocalComponentRegistry.ENC; +import static io.github.taverna_extras.component.registry.local.LocalComponentRegistry.ENC; import java.io.File; import java.io.IOException; import org.apache.log4j.Logger; -import org.apache.taverna.component.api.Component; -import org.apache.taverna.component.api.ComponentException; -import org.apache.taverna.component.api.Version; -import org.apache.taverna.component.api.profile.Profile; -import org.apache.taverna.component.registry.ComponentFamily; -import org.apache.taverna.component.registry.ComponentUtil; -import org.apache.taverna.component.utils.SystemUtils; +import io.github.taverna_extras.component.api.Component; +import io.github.taverna_extras.component.api.ComponentException; +import io.github.taverna_extras.component.api.Version; +import io.github.taverna_extras.component.api.profile.Profile; +import io.github.taverna_extras.component.registry.ComponentFamily; +import io.github.taverna_extras.component.registry.ComponentUtil; +import io.github.taverna_extras.component.utils.SystemUtils; 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/src/main/java/org/apache/taverna/component/registry/local/LocalComponentRegistry.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/local/LocalComponentRegistry.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/local/LocalComponentRegistry.java index 1fe77e0..fd0285d 100644 --- a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/local/LocalComponentRegistry.java +++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/local/LocalComponentRegistry.java @@ -1,4 +1,4 @@ -package org.apache.taverna.component.registry.local; +package io.github.taverna_extras.component.registry.local; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -30,16 +30,16 @@ import java.net.URI; import java.util.Set; import org.apache.log4j.Logger; -import org.apache.taverna.component.api.ComponentException; -import org.apache.taverna.component.api.Family; -import org.apache.taverna.component.api.License; -import org.apache.taverna.component.api.SharingPolicy; -import org.apache.taverna.component.api.Version; -import org.apache.taverna.component.api.profile.Profile; -import org.apache.taverna.component.profile.ComponentProfileImpl; -import org.apache.taverna.component.registry.ComponentRegistry; -import org.apache.taverna.component.registry.ComponentUtil; -import org.apache.taverna.component.utils.SystemUtils; +import io.github.taverna_extras.component.api.ComponentException; +import io.github.taverna_extras.component.api.Family; +import io.github.taverna_extras.component.api.License; +import io.github.taverna_extras.component.api.SharingPolicy; +import io.github.taverna_extras.component.api.Version; +import io.github.taverna_extras.component.api.profile.Profile; +import io.github.taverna_extras.component.profile.ComponentProfileImpl; +import io.github.taverna_extras.component.registry.ComponentRegistry; +import io.github.taverna_extras.component.registry.ComponentUtil; +import io.github.taverna_extras.component.utils.SystemUtils; /** * A component registry implemented using the local file system. Note that the 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/local/LocalComponentRegistryFactory.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/local/LocalComponentRegistryFactory.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/local/LocalComponentRegistryFactory.java index 9da53c6..f2625d1 100644 --- a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/local/LocalComponentRegistryFactory.java +++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/local/LocalComponentRegistryFactory.java @@ -1,4 +1,4 @@ -package org.apache.taverna.component.registry.local; +package io.github.taverna_extras.component.registry.local; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -24,10 +24,10 @@ import java.net.URLDecoder; import java.util.HashMap; import java.util.Map; -import org.apache.taverna.component.api.ComponentException; -import org.apache.taverna.component.api.Registry; -import org.apache.taverna.component.registry.ComponentUtil; -import org.apache.taverna.component.utils.SystemUtils; +import io.github.taverna_extras.component.api.ComponentException; +import io.github.taverna_extras.component.api.Registry; +import io.github.taverna_extras.component.registry.ComponentUtil; +import io.github.taverna_extras.component.utils.SystemUtils; import org.springframework.beans.factory.annotation.Required; public class LocalComponentRegistryFactory { 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/local/LocalComponentVersion.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/local/LocalComponentVersion.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/local/LocalComponentVersion.java index a890285..976aa8b 100644 --- a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/local/LocalComponentVersion.java +++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/local/LocalComponentVersion.java @@ -1,4 +1,4 @@ -package org.apache.taverna.component.registry.local; +package io.github.taverna_extras.component.registry.local; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -21,16 +21,16 @@ package org.apache.taverna.component.registry.local; import static java.lang.Integer.parseInt; import static org.apache.commons.io.FileUtils.readFileToString; import static org.apache.log4j.Logger.getLogger; -import static org.apache.taverna.component.registry.local.LocalComponent.COMPONENT_FILENAME; +import static io.github.taverna_extras.component.registry.local.LocalComponent.COMPONENT_FILENAME; import java.io.File; import java.io.IOException; import java.net.URL; import org.apache.log4j.Logger; -import org.apache.taverna.component.api.ComponentException; -import org.apache.taverna.component.registry.ComponentVersion; -import org.apache.taverna.component.utils.SystemUtils; +import io.github.taverna_extras.component.api.ComponentException; +import io.github.taverna_extras.component.registry.ComponentVersion; +import io.github.taverna_extras.component.utils.SystemUtils; 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/src/main/java/org/apache/taverna/component/registry/standard/Client.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/Client.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/Client.java index 34d922c..87b99b1 100644 --- a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/Client.java +++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/Client.java @@ -1,4 +1,4 @@ -package org.apache.taverna.component.registry.standard; +package io.github.taverna_extras.component.registry.standard; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -31,7 +31,7 @@ import static java.net.URLEncoder.encode; import static javax.xml.bind.DatatypeConverter.printBase64Binary; import static org.apache.commons.io.IOUtils.copy; import static org.apache.log4j.Logger.getLogger; -import static org.apache.taverna.component.registry.ClientVersion.VERSION; +import static io.github.taverna_extras.component.registry.ClientVersion.VERSION; import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; @@ -58,9 +58,9 @@ import javax.xml.parsers.ParserConfigurationException; import org.apache.commons.io.IOUtils; import org.apache.log4j.Logger; -import org.apache.taverna.component.api.ComponentException; -import org.apache.taverna.component.registry.standard.Client.MyExperimentConnector.ServerResponse; -import org.apache.taverna.component.registry.standard.annotations.Unused; +import io.github.taverna_extras.component.api.ComponentException; +import io.github.taverna_extras.component.registry.standard.Client.MyExperimentConnector.ServerResponse; +import io.github.taverna_extras.component.registry.standard.annotations.Unused; import org.apache.taverna.security.credentialmanager.CMException; import org.apache.taverna.security.credentialmanager.CredentialManager; import org.apache.taverna.security.credentialmanager.UsernamePassword; 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/standard/NewComponent.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/NewComponent.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/NewComponent.java index 7a70bc7..44de963 100644 --- a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/NewComponent.java +++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/NewComponent.java @@ -1,4 +1,4 @@ -package org.apache.taverna.component.registry.standard; +package io.github.taverna_extras.component.registry.standard; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -19,26 +19,26 @@ package org.apache.taverna.component.registry.standard; */ import static java.lang.String.format; -import static org.apache.taverna.component.registry.standard.NewComponentRegistry.logger; -import static org.apache.taverna.component.registry.standard.Policy.getPolicy; -import static org.apache.taverna.component.utils.SystemUtils.getElementString; -import static org.apache.taverna.component.utils.SystemUtils.getValue; +import static io.github.taverna_extras.component.registry.standard.NewComponentRegistry.logger; +import static io.github.taverna_extras.component.registry.standard.Policy.getPolicy; +import static io.github.taverna_extras.component.utils.SystemUtils.getElementString; +import static io.github.taverna_extras.component.utils.SystemUtils.getValue; import java.lang.ref.SoftReference; import java.net.MalformedURLException; import java.net.URL; import java.util.IllegalFormatException; -import org.apache.taverna.component.api.ComponentException; -import org.apache.taverna.component.api.Family; -import org.apache.taverna.component.api.License; -import org.apache.taverna.component.api.Registry; -import org.apache.taverna.component.api.SharingPolicy; -import org.apache.taverna.component.registry.Component; -import org.apache.taverna.component.registry.ComponentVersion; -import org.apache.taverna.component.registry.api.ComponentType; -import org.apache.taverna.component.registry.api.Description; -import org.apache.taverna.component.utils.SystemUtils; +import io.github.taverna_extras.component.api.ComponentException; +import io.github.taverna_extras.component.api.Family; +import io.github.taverna_extras.component.api.License; +import io.github.taverna_extras.component.api.Registry; +import io.github.taverna_extras.component.api.SharingPolicy; +import io.github.taverna_extras.component.registry.Component; +import io.github.taverna_extras.component.registry.ComponentVersion; +import io.github.taverna_extras.component.registry.api.ComponentType; +import io.github.taverna_extras.component.registry.api.Description; +import io.github.taverna_extras.component.utils.SystemUtils; 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/src/main/java/org/apache/taverna/component/registry/standard/NewComponentFamily.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/NewComponentFamily.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/NewComponentFamily.java index 911f027..1c16b1e 100644 --- a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/NewComponentFamily.java +++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/NewComponentFamily.java @@ -1,4 +1,4 @@ -package org.apache.taverna.component.registry.standard; +package io.github.taverna_extras.component.registry.standard; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -18,18 +18,18 @@ package org.apache.taverna.component.registry.standard; * under the License. */ -import static org.apache.taverna.component.utils.SystemUtils.getElementString; +import static io.github.taverna_extras.component.utils.SystemUtils.getElementString; import java.util.List; -import org.apache.taverna.component.api.Component; -import org.apache.taverna.component.api.ComponentException; -import org.apache.taverna.component.api.Version; -import org.apache.taverna.component.api.profile.Profile; -import org.apache.taverna.component.registry.ComponentFamily; -import org.apache.taverna.component.registry.ComponentUtil; -import org.apache.taverna.component.registry.api.ComponentFamilyType; -import org.apache.taverna.component.registry.api.Description; +import io.github.taverna_extras.component.api.Component; +import io.github.taverna_extras.component.api.ComponentException; +import io.github.taverna_extras.component.api.Version; +import io.github.taverna_extras.component.api.profile.Profile; +import io.github.taverna_extras.component.registry.ComponentFamily; +import io.github.taverna_extras.component.registry.ComponentUtil; +import io.github.taverna_extras.component.registry.api.ComponentFamilyType; +import io.github.taverna_extras.component.registry.api.Description; 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/src/main/java/org/apache/taverna/component/registry/standard/NewComponentLicense.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/NewComponentLicense.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/NewComponentLicense.java index 7bee937..5e08b4b 100644 --- a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/NewComponentLicense.java +++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/NewComponentLicense.java @@ -1,4 +1,4 @@ -package org.apache.taverna.component.registry.standard; +package io.github.taverna_extras.component.registry.standard; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -18,8 +18,8 @@ package org.apache.taverna.component.registry.standard; * under the License. */ -import org.apache.taverna.component.api.License; -import org.apache.taverna.component.registry.api.LicenseType; +import io.github.taverna_extras.component.api.License; +import io.github.taverna_extras.component.registry.api.LicenseType; class NewComponentLicense implements License { private NewComponentRegistry registry; 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/standard/NewComponentProfile.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/NewComponentProfile.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/NewComponentProfile.java index fc1c051..372c853 100644 --- a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/NewComponentProfile.java +++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/NewComponentProfile.java @@ -1,4 +1,4 @@ -package org.apache.taverna.component.registry.standard; +package io.github.taverna_extras.component.registry.standard; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -18,16 +18,16 @@ package org.apache.taverna.component.registry.standard; * under the License. */ -import static org.apache.taverna.component.utils.SystemUtils.getElementString; +import static io.github.taverna_extras.component.utils.SystemUtils.getElementString; import java.net.MalformedURLException; import java.net.URL; -import org.apache.taverna.component.api.ComponentException; -import org.apache.taverna.component.profile.BaseProfileLocator; -import org.apache.taverna.component.profile.ComponentProfileImpl; -import org.apache.taverna.component.registry.api.ComponentProfileType; -import org.apache.taverna.component.registry.api.Description; +import io.github.taverna_extras.component.api.ComponentException; +import io.github.taverna_extras.component.profile.BaseProfileLocator; +import io.github.taverna_extras.component.profile.ComponentProfileImpl; +import io.github.taverna_extras.component.registry.api.ComponentProfileType; +import io.github.taverna_extras.component.registry.api.Description; /** * Profiles managed by the new-interface component registry. 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/standard/NewComponentRegistry.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/NewComponentRegistry.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/NewComponentRegistry.java index 29e3612..00a549e 100644 --- a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/NewComponentRegistry.java +++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/NewComponentRegistry.java @@ -1,4 +1,4 @@ -package org.apache.taverna.component.registry.standard; +package io.github.taverna_extras.component.registry.standard; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -18,8 +18,8 @@ package org.apache.taverna.component.registry.standard; * under the License. */ import static org.apache.log4j.Logger.getLogger; -import static org.apache.taverna.component.registry.standard.Policy.PRIVATE; -import static org.apache.taverna.component.utils.SystemUtils.getElementString; +import static io.github.taverna_extras.component.registry.standard.Policy.PRIVATE; +import static io.github.taverna_extras.component.utils.SystemUtils.getElementString; import java.net.URL; import java.nio.charset.Charset; @@ -33,32 +33,32 @@ import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; 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.License; -import org.apache.taverna.component.api.SharingPolicy; -import org.apache.taverna.component.api.Version; -import org.apache.taverna.component.api.Version.ID; -import org.apache.taverna.component.api.profile.Profile; -import org.apache.taverna.component.registry.ComponentRegistry; -import org.apache.taverna.component.registry.ComponentUtil; -import org.apache.taverna.component.registry.ComponentVersionIdentification; -import org.apache.taverna.component.registry.api.ComponentDescriptionList; -import org.apache.taverna.component.registry.api.ComponentFamilyList; -import org.apache.taverna.component.registry.api.ComponentFamilyType; -import org.apache.taverna.component.registry.api.ComponentProfileList; -import org.apache.taverna.component.registry.api.ComponentProfileType; -import org.apache.taverna.component.registry.api.ComponentType; -import org.apache.taverna.component.registry.api.Content; -import org.apache.taverna.component.registry.api.Description; -import org.apache.taverna.component.registry.api.LicenseList; -import org.apache.taverna.component.registry.api.LicenseType; -import org.apache.taverna.component.registry.api.ObjectFactory; -import org.apache.taverna.component.registry.api.Permissions; -import org.apache.taverna.component.registry.api.PolicyList; -import org.apache.taverna.component.utils.AnnotationUtils; -import org.apache.taverna.component.utils.SystemUtils; +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.License; +import io.github.taverna_extras.component.api.SharingPolicy; +import io.github.taverna_extras.component.api.Version; +import io.github.taverna_extras.component.api.Version.ID; +import io.github.taverna_extras.component.api.profile.Profile; +import io.github.taverna_extras.component.registry.ComponentRegistry; +import io.github.taverna_extras.component.registry.ComponentUtil; +import io.github.taverna_extras.component.registry.ComponentVersionIdentification; +import io.github.taverna_extras.component.registry.api.ComponentDescriptionList; +import io.github.taverna_extras.component.registry.api.ComponentFamilyList; +import io.github.taverna_extras.component.registry.api.ComponentFamilyType; +import io.github.taverna_extras.component.registry.api.ComponentProfileList; +import io.github.taverna_extras.component.registry.api.ComponentProfileType; +import io.github.taverna_extras.component.registry.api.ComponentType; +import io.github.taverna_extras.component.registry.api.Content; +import io.github.taverna_extras.component.registry.api.Description; +import io.github.taverna_extras.component.registry.api.LicenseList; +import io.github.taverna_extras.component.registry.api.LicenseType; +import io.github.taverna_extras.component.registry.api.ObjectFactory; +import io.github.taverna_extras.component.registry.api.Permissions; +import io.github.taverna_extras.component.registry.api.PolicyList; +import io.github.taverna_extras.component.utils.AnnotationUtils; +import io.github.taverna_extras.component.utils.SystemUtils; import org.apache.taverna.scufl2.api.container.WorkflowBundle; import org.apache.taverna.security.credentialmanager.CredentialManager; 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/standard/NewComponentRegistryFactory.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/NewComponentRegistryFactory.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/NewComponentRegistryFactory.java index 9e413ff..43dc37d 100644 --- a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/NewComponentRegistryFactory.java +++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/NewComponentRegistryFactory.java @@ -1,4 +1,4 @@ -package org.apache.taverna.component.registry.standard; +package io.github.taverna_extras.component.registry.standard; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -18,18 +18,18 @@ package org.apache.taverna.component.registry.standard; * under the License. */ -import static org.apache.taverna.component.registry.standard.NewComponentRegistry.jaxbContext; -import static org.apache.taverna.component.registry.standard.NewComponentRegistry.logger; +import static io.github.taverna_extras.component.registry.standard.NewComponentRegistry.jaxbContext; +import static io.github.taverna_extras.component.registry.standard.NewComponentRegistry.logger; import java.net.URL; import java.util.HashMap; import java.util.Map; -import org.apache.taverna.component.api.ComponentException; -import org.apache.taverna.component.registry.ComponentRegistry; -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.registry.ComponentRegistry; +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.apache.taverna.security.credentialmanager.CredentialManager; import org.springframework.beans.factory.annotation.Required; 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/standard/Policy.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/Policy.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/Policy.java index 74b9496..3b521af 100644 --- a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/Policy.java +++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/Policy.java @@ -1,12 +1,12 @@ -package org.apache.taverna.component.registry.standard; +package io.github.taverna_extras.component.registry.standard; import static java.lang.System.identityHashCode; -import static org.apache.taverna.component.registry.api.Privilege.DOWNLOAD; -import static org.apache.taverna.component.registry.api.Privilege.VIEW; +import static io.github.taverna_extras.component.registry.api.Privilege.DOWNLOAD; +import static io.github.taverna_extras.component.registry.api.Privilege.VIEW; -import org.apache.taverna.component.api.SharingPolicy; -import org.apache.taverna.component.registry.api.Permissions; -import org.apache.taverna.component.registry.api.Permissions.Permission; +import io.github.taverna_extras.component.api.SharingPolicy; +import io.github.taverna_extras.component.registry.api.Permissions; +import io.github.taverna_extras.component.registry.api.Permissions.Permission; abstract class Policy implements SharingPolicy { public static final SharingPolicy PUBLIC = new Public(); 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/standard/annotations/Unused.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/annotations/Unused.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/annotations/Unused.java index c6b680d..e6a709b 100644 --- a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/annotations/Unused.java +++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/annotations/Unused.java @@ -1,4 +1,4 @@ -package org.apache.taverna.component.registry.standard.annotations; +package io.github.taverna_extras.component.registry.standard.annotations; /* * 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/standard/annotations/package-info.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/annotations/package-info.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/annotations/package-info.java index 518d8a6..6a89454 100644 --- a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/annotations/package-info.java +++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/annotations/package-info.java @@ -21,4 +21,4 @@ * * @author Donal Fellows */ -package org.apache.taverna.component.registry.standard.annotations; \ No newline at end of file +package io.github.taverna_extras.component.registry.standard.annotations; \ 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/registry/standard/package-info.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/package-info.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/package-info.java index 6c15ce9..89df01a 100644 --- a/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/package-info.java +++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/registry/standard/package-info.java @@ -20,4 +20,4 @@ * This is the new interface to the myExperiment registry, a.k.a. μExperiment. * @author Donal Fellows */ -package org.apache.taverna.component.registry.standard; \ No newline at end of file +package io.github.taverna_extras.component.registry.standard; \ 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/utils/AnnotationUtils.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/utils/AnnotationUtils.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/utils/AnnotationUtils.java index 1440c32..a3ac463 100644 --- a/taverna-component-activity/src/main/java/org/apache/taverna/component/utils/AnnotationUtils.java +++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/utils/AnnotationUtils.java @@ -1,4 +1,4 @@ -package org.apache.taverna.component.utils; +package io.github.taverna_extras.component.utils; /* * 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/utils/SystemUtils.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/main/java/org/apache/taverna/component/utils/SystemUtils.java b/taverna-component-activity/src/main/java/org/apache/taverna/component/utils/SystemUtils.java index d7b622c..9a57122 100644 --- a/taverna-component-activity/src/main/java/org/apache/taverna/component/utils/SystemUtils.java +++ b/taverna-component-activity/src/main/java/org/apache/taverna/component/utils/SystemUtils.java @@ -1,4 +1,4 @@ -package org.apache.taverna.component.utils; +package io.github.taverna_extras.component.utils; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -26,8 +26,8 @@ import java.util.List; import javax.xml.bind.JAXBElement; -import org.apache.taverna.component.api.ComponentException; -import org.apache.taverna.component.registry.api.Description; +import io.github.taverna_extras.component.api.ComponentException; +import io.github.taverna_extras.component.registry.api.Description; import org.apache.taverna.configuration.app.ApplicationConfiguration; import org.apache.taverna.platform.execution.api.InvalidWorkflowException; import org.apache.taverna.platform.execution.api.WorkflowCompiler; http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity/src/main/resources/EmptyProfile.xml ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/main/resources/EmptyProfile.xml b/taverna-component-activity/src/main/resources/EmptyProfile.xml index d864b4f..1ee5dc0 100644 --- a/taverna-component-activity/src/main/resources/EmptyProfile.xml +++ b/taverna-component-activity/src/main/resources/EmptyProfile.xml @@ -21,7 +21,7 @@ xmlns="http://ns.taverna.org.uk/2012/component/profile"; xsi:schemaLocation="http://ns.taverna.org.uk/2012/component/profile ComponentProfile.xsd"> - <id>org.apache.taverna.component.profile.empty</id> + <id>io.github.taverna_extras.component.profile.empty</id> <name>Empty profile</name> <description>A basic empty profile that does not allow additional semantic annotation</description> <component> http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity/src/main/resources/META-INF/spring/component-activity-context.xml ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/main/resources/META-INF/spring/component-activity-context.xml b/taverna-component-activity/src/main/resources/META-INF/spring/component-activity-context.xml index 0ed5382..59cdc1e 100644 --- a/taverna-component-activity/src/main/resources/META-INF/spring/component-activity-context.xml +++ b/taverna-component-activity/src/main/resources/META-INF/spring/component-activity-context.xml @@ -25,16 +25,16 @@ http://www.springframework.org/schema/osgi/spring-osgi.xsd";> <bean id="ComponentLocalHealthChecker" - class="org.apache.taverna.component.activity.ComponentActivityLocalChecker" /> + class="io.github.taverna_extras.component.activity.ComponentActivityLocalChecker" /> <bean id="ComponentUpgradeHealthChecker" - class="org.apache.taverna.component.activity.ComponentActivityUpgradeChecker"> + class="io.github.taverna_extras.component.activity.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.activity.ComponentActivityFactory"> + <bean id="componentActivityFactory" class="io.github.taverna_extras.component.activity.ComponentActivityFactory"> <property name="componentUtil" ref="componentUtil" /> <property name="dataflowCache" ref="cache" /> <property name="edits" ref="edits" /> @@ -42,32 +42,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" /> @@ -76,7 +76,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" /> http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity/src/main/resources/NewMyExperimentSchema.xsd ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/main/resources/NewMyExperimentSchema.xsd b/taverna-component-activity/src/main/resources/NewMyExperimentSchema.xsd index 0f8e133..66e0173 100644 --- a/taverna-component-activity/src/main/resources/NewMyExperimentSchema.xsd +++ b/taverna-component-activity/src/main/resources/NewMyExperimentSchema.xsd @@ -25,7 +25,7 @@ <xs:annotation> <xs:appinfo> <jxb:schemaBindings> - <jxb:package name="org.apache.taverna.component.registry.api" /> + <jxb:package name="io.github.taverna_extras.component.registry.api" /> </jxb:schemaBindings> </xs:appinfo> </xs:annotation> http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity/src/test/java/org/apache/taverna/component/AnnotationTest.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/test/java/org/apache/taverna/component/AnnotationTest.java b/taverna-component-activity/src/test/java/org/apache/taverna/component/AnnotationTest.java index ffef8f3..6b885c3 100644 --- a/taverna-component-activity/src/test/java/org/apache/taverna/component/AnnotationTest.java +++ b/taverna-component-activity/src/test/java/org/apache/taverna/component/AnnotationTest.java @@ -1,4 +1,4 @@ -package org.apache.taverna.component; +package io.github.taverna_extras.component; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -22,7 +22,7 @@ import static org.junit.Assert.*; import java.io.IOException; -import org.apache.taverna.component.utils.AnnotationUtils; +import io.github.taverna_extras.component.utils.AnnotationUtils; import org.junit.Test; 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/src/test/java/org/apache/taverna/component/ComponentActivityTest.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/test/java/org/apache/taverna/component/ComponentActivityTest.java b/taverna-component-activity/src/test/java/org/apache/taverna/component/ComponentActivityTest.java index c320146..63ce804 100644 --- a/taverna-component-activity/src/test/java/org/apache/taverna/component/ComponentActivityTest.java +++ b/taverna-component-activity/src/test/java/org/apache/taverna/component/ComponentActivityTest.java @@ -1,4 +1,4 @@ -package org.apache.taverna.component; +package io.github.taverna_extras.component; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -18,9 +18,9 @@ package org.apache.taverna.component; * under the License. */ -import org.apache.taverna.component.activity.ComponentActivity; -import org.apache.taverna.component.activity.ComponentActivityConfigurationBean; -import org.apache.taverna.component.activity.ComponentActivityFactory; +import io.github.taverna_extras.component.activity.ComponentActivity; +import io.github.taverna_extras.component.activity.ComponentActivityConfigurationBean; +import io.github.taverna_extras.component.activity.ComponentActivityFactory; public class ComponentActivityTest { http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/ComponentFamilyTest.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/ComponentFamilyTest.java b/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/ComponentFamilyTest.java index 07cf491..29e4473 100644 --- a/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/ComponentFamilyTest.java +++ b/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/ComponentFamilyTest.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,9 +25,9 @@ import static org.junit.Assert.assertTrue; import java.net.URL; -import org.apache.taverna.component.api.Family; -import org.apache.taverna.component.api.Version; -import org.apache.taverna.component.api.profile.Profile; +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 org.junit.After; import org.junit.Before; import org.junit.Ignore; http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/ComponentRegistryTest.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/ComponentRegistryTest.java b/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/ComponentRegistryTest.java index 2112de5..f5328cc 100644 --- a/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/ComponentRegistryTest.java +++ b/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/ComponentRegistryTest.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,9 +27,9 @@ import static org.junit.Assert.assertTrue; import java.net.URL; import java.util.List; -import org.apache.taverna.component.api.ComponentException; -import org.apache.taverna.component.api.Family; -import org.apache.taverna.component.api.profile.Profile; +import io.github.taverna_extras.component.api.ComponentException; +import io.github.taverna_extras.component.api.Family; +import io.github.taverna_extras.component.api.profile.Profile; import org.junit.After; import org.junit.Before; import org.junit.Ignore; http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/ComponentTest.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/ComponentTest.java b/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/ComponentTest.java index 69e99b0..0ced0c8 100644 --- a/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/ComponentTest.java +++ b/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/ComponentTest.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 @@ -24,10 +24,10 @@ import static org.junit.Assert.assertNull; import java.net.URL; -import org.apache.taverna.component.api.Component; -import org.apache.taverna.component.api.Family; -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.Family; +import io.github.taverna_extras.component.api.Version; +import io.github.taverna_extras.component.api.profile.Profile; import org.junit.After; import org.junit.Before; import org.junit.Ignore; http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/ComponentVersionTest.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/ComponentVersionTest.java b/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/ComponentVersionTest.java index ae7b66f..48b320b 100644 --- a/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/ComponentVersionTest.java +++ b/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/ComponentVersionTest.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,9 +23,9 @@ import static org.junit.Assert.assertNotNull; import java.net.URL; -import org.apache.taverna.component.api.Family; -import org.apache.taverna.component.api.Version; -import org.apache.taverna.component.api.profile.Profile; +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 org.junit.After; import org.junit.Before; import org.junit.Ignore; http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/Harness.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/Harness.java b/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/Harness.java index a83af61..663704c 100644 --- a/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/Harness.java +++ b/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/Harness.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 @@ -20,8 +20,8 @@ package org.apache.taverna.component.registry; import java.net.URL; -import org.apache.taverna.component.api.Registry; -import org.apache.taverna.component.registry.ComponentUtil; +import io.github.taverna_extras.component.api.Registry; +import io.github.taverna_extras.component.registry.ComponentUtil; public class Harness { public static URL componentRegistryUrl; http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/local/LocalComponentFamilyTest.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/local/LocalComponentFamilyTest.java b/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/local/LocalComponentFamilyTest.java index 8d43753..b5791e8 100644 --- a/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/local/LocalComponentFamilyTest.java +++ b/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/local/LocalComponentFamilyTest.java @@ -1,4 +1,4 @@ -package org.apache.taverna.component.registry.local; +package io.github.taverna_extras.component.registry.local; /* * 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.registry.local; * under the License. */ -import org.apache.taverna.component.registry.ComponentFamilyTest; +import io.github.taverna_extras.component.registry.ComponentFamilyTest; import org.junit.AfterClass; import org.junit.BeforeClass; http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/local/LocalComponentRegistryTest.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/local/LocalComponentRegistryTest.java b/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/local/LocalComponentRegistryTest.java index 60acd13..2a57e1c 100644 --- a/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/local/LocalComponentRegistryTest.java +++ b/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/local/LocalComponentRegistryTest.java @@ -1,4 +1,4 @@ -package org.apache.taverna.component.registry.local; +package io.github.taverna_extras.component.registry.local; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -20,8 +20,8 @@ package org.apache.taverna.component.registry.local; import static org.junit.Assert.assertSame; -import org.apache.taverna.component.api.Registry; -import org.apache.taverna.component.registry.ComponentRegistryTest; +import io.github.taverna_extras.component.api.Registry; +import io.github.taverna_extras.component.registry.ComponentRegistryTest; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Ignore; http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/local/LocalComponentTest.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/local/LocalComponentTest.java b/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/local/LocalComponentTest.java index 353b81c..f82e591 100644 --- a/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/local/LocalComponentTest.java +++ b/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/local/LocalComponentTest.java @@ -1,4 +1,4 @@ -package org.apache.taverna.component.registry.local; +package io.github.taverna_extras.component.registry.local; /* * 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.registry.local; * under the License. */ -import org.apache.taverna.component.registry.ComponentTest; +import io.github.taverna_extras.component.registry.ComponentTest; import org.junit.AfterClass; import org.junit.BeforeClass; http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/local/LocalComponentVersionTest.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/local/LocalComponentVersionTest.java b/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/local/LocalComponentVersionTest.java index 4deb722..f08425e 100644 --- a/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/local/LocalComponentVersionTest.java +++ b/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/local/LocalComponentVersionTest.java @@ -1,4 +1,4 @@ -package org.apache.taverna.component.registry.local; +package io.github.taverna_extras.component.registry.local; /* * 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.registry.local; * under the License. */ -import org.apache.taverna.component.registry.ComponentVersionTest; +import io.github.taverna_extras.component.registry.ComponentVersionTest; import org.junit.AfterClass; import org.junit.BeforeClass; http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/local/RegistrySupport.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/local/RegistrySupport.java b/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/local/RegistrySupport.java index 6e1fcf4..cac3eff 100644 --- a/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/local/RegistrySupport.java +++ b/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/local/RegistrySupport.java @@ -1,4 +1,4 @@ -package org.apache.taverna.component.registry.local; +package io.github.taverna_extras.component.registry.local; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -20,12 +20,12 @@ package org.apache.taverna.component.registry.local; import static java.lang.System.getProperty; import static org.apache.commons.io.FileUtils.deleteDirectory; -import static org.apache.taverna.component.registry.Harness.componentRegistry; -import static org.apache.taverna.component.registry.Harness.componentRegistryUrl; +import static io.github.taverna_extras.component.registry.Harness.componentRegistry; +import static io.github.taverna_extras.component.registry.Harness.componentRegistryUrl; import java.io.File; -import org.apache.taverna.component.registry.local.LocalComponentRegistryFactory; +import io.github.taverna_extras.component.registry.local.LocalComponentRegistryFactory; class RegistrySupport { private static File testRegistry; http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/standard/NewComponentFamilyTest.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/standard/NewComponentFamilyTest.java b/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/standard/NewComponentFamilyTest.java index 40e118f..bb06af5 100644 --- a/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/standard/NewComponentFamilyTest.java +++ b/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/standard/NewComponentFamilyTest.java @@ -1,4 +1,4 @@ -package org.apache.taverna.component.registry.standard; +package io.github.taverna_extras.component.registry.standard; /* * 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.registry.standard; * under the License. */ -import org.apache.taverna.component.registry.ComponentFamilyTest; +import io.github.taverna_extras.component.registry.ComponentFamilyTest; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Ignore; http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/standard/NewComponentRegistryTest.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/standard/NewComponentRegistryTest.java b/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/standard/NewComponentRegistryTest.java index a0d6912..86417d5 100644 --- a/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/standard/NewComponentRegistryTest.java +++ b/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/standard/NewComponentRegistryTest.java @@ -1,4 +1,4 @@ -package org.apache.taverna.component.registry.standard; +package io.github.taverna_extras.component.registry.standard; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -23,11 +23,11 @@ import static org.junit.Assert.assertSame; import java.net.URL; -import org.apache.taverna.component.api.Version; -import org.apache.taverna.component.registry.ComponentRegistryTest; -import org.apache.taverna.component.registry.standard.NewComponent; -import org.apache.taverna.component.registry.standard.NewComponentRegistry; -import org.apache.taverna.component.registry.standard.Policy; +import io.github.taverna_extras.component.api.Version; +import io.github.taverna_extras.component.registry.ComponentRegistryTest; +import io.github.taverna_extras.component.registry.standard.NewComponent; +import io.github.taverna_extras.component.registry.standard.NewComponentRegistry; +import io.github.taverna_extras.component.registry.standard.Policy; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Ignore; http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/standard/NewComponentTest.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/standard/NewComponentTest.java b/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/standard/NewComponentTest.java index a8591e4..2281cb0 100644 --- a/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/standard/NewComponentTest.java +++ b/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/standard/NewComponentTest.java @@ -1,4 +1,4 @@ -package org.apache.taverna.component.registry.standard; +package io.github.taverna_extras.component.registry.standard; /* * 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.registry.standard; * under the License. */ -import org.apache.taverna.component.registry.ComponentTest; +import io.github.taverna_extras.component.registry.ComponentTest; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Ignore; http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/standard/NewComponentVersionTest.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/standard/NewComponentVersionTest.java b/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/standard/NewComponentVersionTest.java index 5048bba..cad04eb 100644 --- a/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/standard/NewComponentVersionTest.java +++ b/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/standard/NewComponentVersionTest.java @@ -1,4 +1,4 @@ -package org.apache.taverna.component.registry.standard; +package io.github.taverna_extras.component.registry.standard; /* * 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.registry.standard; * under the License. */ -import org.apache.taverna.component.registry.ComponentVersionTest; +import io.github.taverna_extras.component.registry.ComponentVersionTest; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Ignore; http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/standard/RegistrySupport.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/standard/RegistrySupport.java b/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/standard/RegistrySupport.java index fe88922..a1d0fef 100644 --- a/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/standard/RegistrySupport.java +++ b/taverna-component-activity/src/test/java/org/apache/taverna/component/registry/standard/RegistrySupport.java @@ -1,4 +1,4 @@ -package org.apache.taverna.component.registry.standard; +package io.github.taverna_extras.component.registry.standard; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -18,18 +18,18 @@ package org.apache.taverna.component.registry.standard; * under the License. */ -import static org.apache.taverna.component.registry.Harness.componentRegistry; -import static org.apache.taverna.component.registry.Harness.componentRegistryUrl; +import static io.github.taverna_extras.component.registry.Harness.componentRegistry; +import static io.github.taverna_extras.component.registry.Harness.componentRegistryUrl; import java.net.URL; -import org.apache.taverna.component.api.Component; -import org.apache.taverna.component.api.Family; -import org.apache.taverna.component.api.profile.Profile; -import org.apache.taverna.component.registry.standard.NewComponent; -import org.apache.taverna.component.registry.standard.NewComponentFamily; -import org.apache.taverna.component.registry.standard.NewComponentRegistry; -import org.apache.taverna.component.registry.standard.NewComponentRegistryFactory; +import io.github.taverna_extras.component.api.Component; +import io.github.taverna_extras.component.api.Family; +import io.github.taverna_extras.component.api.profile.Profile; +import io.github.taverna_extras.component.registry.standard.NewComponent; +import io.github.taverna_extras.component.registry.standard.NewComponentFamily; +import io.github.taverna_extras.component.registry.standard.NewComponentRegistry; +import io.github.taverna_extras.component.registry.standard.NewComponentRegistryFactory; class RegistrySupport { static final String DEPLOYMENT = "http://aeon.cs.man.ac.uk:3006";; http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-activity/src/test/resources/META-INF/services/net.sf.taverna.t2.security.credentialmanager.CredentialProviderSPI ---------------------------------------------------------------------- diff --git a/taverna-component-activity/src/test/resources/META-INF/services/net.sf.taverna.t2.security.credentialmanager.CredentialProviderSPI b/taverna-component-activity/src/test/resources/META-INF/services/net.sf.taverna.t2.security.credentialmanager.CredentialProviderSPI index a2a1b06..e98b9e3 100644 --- a/taverna-component-activity/src/test/resources/META-INF/services/net.sf.taverna.t2.security.credentialmanager.CredentialProviderSPI +++ b/taverna-component-activity/src/test/resources/META-INF/services/net.sf.taverna.t2.security.credentialmanager.CredentialProviderSPI @@ -1 +1 @@ -org.apache.taverna.component.registry.myexperiment.TestPasswordProvider +io.github.taverna_extras.component.registry.myexperiment.TestPasswordProvider http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-repository-api/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-component-repository-api/pom.xml b/taverna-component-repository-api/pom.xml index e5c6174..af1ac18 100644 --- a/taverna-component-repository-api/pom.xml +++ b/taverna-component-repository-api/pom.xml @@ -49,7 +49,7 @@ <extensions>true</extensions> <configuration> <instructions> - <Export-Package>org.apache.taverna.component.api,org.apache.taverna.component.api.profile,org.apache.taverna.component.api.profile.doc</Export-Package> + <Export-Package>io.github.taverna_extras.component.api,io.github.taverna_extras.component.api.profile,io.github.taverna_extras.component.api.profile.doc</Export-Package> </instructions> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/Component.java ---------------------------------------------------------------------- diff --git a/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/Component.java b/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/Component.java index 9d0ae3a..e014fb9 100644 --- a/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/Component.java +++ b/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/Component.java @@ -1,4 +1,4 @@ -package org.apache.taverna.component.api; +package io.github.taverna_extras.component.api; /* * 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-repository-api/src/main/java/org/apache/taverna/component/api/ComponentException.java ---------------------------------------------------------------------- diff --git a/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/ComponentException.java b/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/ComponentException.java index d440547..044903e 100644 --- a/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/ComponentException.java +++ b/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/ComponentException.java @@ -1,4 +1,4 @@ -package org.apache.taverna.component.api; +package io.github.taverna_extras.component.api; /* * 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-repository-api/src/main/java/org/apache/taverna/component/api/ComponentFactory.java ---------------------------------------------------------------------- diff --git a/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/ComponentFactory.java b/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/ComponentFactory.java index 34f54a4..5b69b61 100644 --- a/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/ComponentFactory.java +++ b/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/ComponentFactory.java @@ -1,4 +1,4 @@ -package org.apache.taverna.component.api; +package io.github.taverna_extras.component.api; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -20,7 +20,7 @@ package org.apache.taverna.component.api; import java.net.URL; -import org.apache.taverna.component.api.profile.Profile; +import io.github.taverna_extras.component.api.profile.Profile; public interface ComponentFactory { public Registry getRegistry(URL registryBase) throws ComponentException; http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/Family.java ---------------------------------------------------------------------- diff --git a/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/Family.java b/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/Family.java index c2be81b..ca4ec54 100644 --- a/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/Family.java +++ b/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/Family.java @@ -1,4 +1,4 @@ -package org.apache.taverna.component.api; +package io.github.taverna_extras.component.api; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -20,7 +20,7 @@ package org.apache.taverna.component.api; import java.util.List; -import org.apache.taverna.component.api.profile.Profile; +import io.github.taverna_extras.component.api.profile.Profile; import org.apache.taverna.scufl2.api.container.WorkflowBundle; public interface Family extends NamedItem { http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/License.java ---------------------------------------------------------------------- diff --git a/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/License.java b/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/License.java index 31c900f..2906288 100644 --- a/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/License.java +++ b/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/License.java @@ -1,4 +1,4 @@ -package org.apache.taverna.component.api; +package io.github.taverna_extras.component.api; /* * 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-repository-api/src/main/java/org/apache/taverna/component/api/NamedItem.java ---------------------------------------------------------------------- diff --git a/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/NamedItem.java b/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/NamedItem.java index b82d36f..775e515 100644 --- a/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/NamedItem.java +++ b/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/NamedItem.java @@ -1,4 +1,4 @@ -package org.apache.taverna.component.api; +package io.github.taverna_extras.component.api; /* * 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-repository-api/src/main/java/org/apache/taverna/component/api/Registry.java ---------------------------------------------------------------------- diff --git a/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/Registry.java b/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/Registry.java index 26a85c1..e6d1e23 100644 --- a/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/Registry.java +++ b/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/Registry.java @@ -1,4 +1,4 @@ -package org.apache.taverna.component.api; +package io.github.taverna_extras.component.api; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -23,7 +23,7 @@ import java.net.URL; import java.util.List; import java.util.Set; -import org.apache.taverna.component.api.profile.Profile; +import io.github.taverna_extras.component.api.profile.Profile; public interface Registry { http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/66649799/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/SharingPolicy.java ---------------------------------------------------------------------- diff --git a/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/SharingPolicy.java b/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/SharingPolicy.java index 357db62..9965339 100644 --- a/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/SharingPolicy.java +++ b/taverna-component-repository-api/src/main/java/org/apache/taverna/component/api/SharingPolicy.java @@ -1,4 +1,4 @@ -package org.apache.taverna.component.api; +package io.github.taverna_extras.component.api; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file
