Repository: incubator-taverna-engine Updated Branches: refs/heads/master 96f7beee3 -> 634203a57
org.apache.taverna imports Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/commit/80c15eec Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/tree/80c15eec Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/diff/80c15eec Branch: refs/heads/master Commit: 80c15eec35fcdee0696b95fa411d26ef6cfdf5b6 Parents: 61132c2 Author: Stian Soiland-Reyes <[email protected]> Authored: Sun Oct 18 18:39:34 2015 +0100 Committer: Stian Soiland-Reyes <[email protected]> Committed: Sun Oct 18 18:39:34 2015 +0100 ---------------------------------------------------------------------- pom.xml | 2 +- .../__classPrefix__ConfigurationPanel.java | 2 +- .../config/__classPrefix__ConfigureAction.java | 2 +- .../__classPrefix__ConfigureMenuAction.java | 2 +- ...classPrefix__ActivityContextViewFactory.java | 2 +- .../ui/view/__classPrefix__ContextualView.java | 2 +- .../impl/CredentialManagerImpl.java | 2 +- .../impl/DefaultMasterPasswordProvider.java | 2 +- .../impl/DistinguishedNameParserImpl.java | 2 +- .../DistinguishedNameParser.java | 2 +- .../database/DatabaseConfiguration.java | 2 +- .../impl/DatabaseConfigurationImpl.java | 4 ++-- .../database/impl/DatabaseManagerImpl.java | 2 +- .../uk/org/taverna/platform/ActivityIT.java | 6 +++--- .../uk/org/taverna/platform/PlatformIT.java | 4 ++-- .../java/uk/org/taverna/platform/RunIT.java | 12 +++++------ .../uk/org/taverna/platform/ActivityIT.java | 6 +++--- .../org/taverna/platform/CommandLineToolIT.java | 4 ++-- .../uk/org/taverna/platform/ExecutionIT.java | 22 ++++++++++---------- .../org/taverna/platform/LocalExecutionIT.java | 12 +++++------ .../uk/org/taverna/platform/PlatformIT.java | 10 ++++----- .../java/uk/org/taverna/platform/RunIT.java | 14 ++++++------- .../uk/org/taverna/platform/RunParallelIT.java | 10 ++++----- .../uk/org/taverna/platform/RunWorkflowsIT.java | 12 +++++------ .../services/impl/ServiceRegistryImpl.java | 6 +++--- 25 files changed, 73 insertions(+), 73 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/80c15eec/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 2d5b109..3bada79 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ <name>Apache Taverna Engine and Platform</name> <properties> <taverna.language.version>0.15.0-incubating</taverna.language.version> - <taverna.osgi.version>0.2.0-incubating-SNAPSHOT</taverna.osgi.version> + <taverna.osgi.version>0.2.1-incubating-SNAPSHOT</taverna.osgi.version> </properties> <modules> <!-- Avoid spaghetti dependencies http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/80c15eec/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/config/__classPrefix__ConfigurationPanel.java ---------------------------------------------------------------------- diff --git a/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/config/__classPrefix__ConfigurationPanel.java b/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/config/__classPrefix__ConfigurationPanel.java index 8f81c8d..175d60b 100644 --- a/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/config/__classPrefix__ConfigurationPanel.java +++ b/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/config/__classPrefix__ConfigurationPanel.java @@ -12,7 +12,7 @@ import javax.swing.JTextField; import net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ActivityConfigurationPanel; -import uk.org.taverna.commons.services.ServiceRegistry; +import org.apache.taverna.services.ServiceRegistry; import org.apache.taverna.scufl2.api.activity.Activity; @SuppressWarnings("serial") http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/80c15eec/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/config/__classPrefix__ConfigureAction.java ---------------------------------------------------------------------- diff --git a/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/config/__classPrefix__ConfigureAction.java b/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/config/__classPrefix__ConfigureAction.java index 0a68bcd..6187143 100644 --- a/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/config/__classPrefix__ConfigureAction.java +++ b/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/config/__classPrefix__ConfigureAction.java @@ -5,7 +5,7 @@ package ${package}.ui.config; import java.awt.event.ActionEvent; -import uk.org.taverna.commons.services.ServiceRegistry; +import org.apache.taverna.services.ServiceRegistry; import org.apache.taverna.scufl2.api.activity.Activity; import net.sf.taverna.t2.servicedescriptions.ServiceDescriptionRegistry; http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/80c15eec/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/menu/__classPrefix__ConfigureMenuAction.java ---------------------------------------------------------------------- diff --git a/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/menu/__classPrefix__ConfigureMenuAction.java b/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/menu/__classPrefix__ConfigureMenuAction.java index a257a4e..057670c 100644 --- a/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/menu/__classPrefix__ConfigureMenuAction.java +++ b/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/menu/__classPrefix__ConfigureMenuAction.java @@ -7,7 +7,7 @@ import java.net.URI; import javax.swing.Action; -import uk.org.taverna.commons.services.ServiceRegistry; +import org.apache.taverna.services.ServiceRegistry; import net.sf.taverna.t2.servicedescriptions.ServiceDescriptionRegistry; import net.sf.taverna.t2.ui.menu.ContextualMenuComponent; http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/80c15eec/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/view/__classPrefix__ActivityContextViewFactory.java ---------------------------------------------------------------------- diff --git a/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/view/__classPrefix__ActivityContextViewFactory.java b/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/view/__classPrefix__ActivityContextViewFactory.java index b4563bd..8fb5611 100644 --- a/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/view/__classPrefix__ActivityContextViewFactory.java +++ b/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/view/__classPrefix__ActivityContextViewFactory.java @@ -7,7 +7,7 @@ import java.net.URI; import java.util.Arrays; import java.util.List; -import uk.org.taverna.commons.services.ServiceRegistry; +import org.apache.taverna.services.ServiceRegistry; import org.apache.taverna.scufl2.api.activity.Activity; import net.sf.taverna.t2.servicedescriptions.ServiceDescriptionRegistry; http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/80c15eec/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/view/__classPrefix__ContextualView.java ---------------------------------------------------------------------- diff --git a/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/view/__classPrefix__ContextualView.java b/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/view/__classPrefix__ContextualView.java index d970dc7..ea1edc7 100644 --- a/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/view/__classPrefix__ContextualView.java +++ b/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/java/ui/view/__classPrefix__ContextualView.java @@ -12,7 +12,7 @@ import javax.swing.JPanel; import com.fasterxml.jackson.databind.JsonNode; -import uk.org.taverna.commons.services.ServiceRegistry; +import org.apache.taverna.services.ServiceRegistry; import net.sf.taverna.t2.servicedescriptions.ServiceDescriptionRegistry; import net.sf.taverna.t2.workbench.activityicons.ActivityIconManager; http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/80c15eec/taverna-credential-manager-impl/src/main/java/org/apache/taverna/security/credentialmanager/impl/CredentialManagerImpl.java ---------------------------------------------------------------------- diff --git a/taverna-credential-manager-impl/src/main/java/org/apache/taverna/security/credentialmanager/impl/CredentialManagerImpl.java b/taverna-credential-manager-impl/src/main/java/org/apache/taverna/security/credentialmanager/impl/CredentialManagerImpl.java index e9a4052..dd94bd4 100644 --- a/taverna-credential-manager-impl/src/main/java/org/apache/taverna/security/credentialmanager/impl/CredentialManagerImpl.java +++ b/taverna-credential-manager-impl/src/main/java/org/apache/taverna/security/credentialmanager/impl/CredentialManagerImpl.java @@ -83,7 +83,7 @@ import org.apache.taverna.security.credentialmanager.UsernamePassword; import org.apache.commons.io.FileUtils; import org.apache.log4j.Logger; import org.bouncycastle.jce.provider.BouncyCastleProvider; -import uk.org.taverna.configuration.app.ApplicationConfiguration; +import org.apache.taverna.configuration.app.ApplicationConfiguration; /** * Provides an implementation of {@link #CredentialManagerService}. http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/80c15eec/taverna-credential-manager-impl/src/main/java/org/apache/taverna/security/credentialmanager/impl/DefaultMasterPasswordProvider.java ---------------------------------------------------------------------- diff --git a/taverna-credential-manager-impl/src/main/java/org/apache/taverna/security/credentialmanager/impl/DefaultMasterPasswordProvider.java b/taverna-credential-manager-impl/src/main/java/org/apache/taverna/security/credentialmanager/impl/DefaultMasterPasswordProvider.java index 3f7cc59..98edfcc 100644 --- a/taverna-credential-manager-impl/src/main/java/org/apache/taverna/security/credentialmanager/impl/DefaultMasterPasswordProvider.java +++ b/taverna-credential-manager-impl/src/main/java/org/apache/taverna/security/credentialmanager/impl/DefaultMasterPasswordProvider.java @@ -24,7 +24,7 @@ import static org.apache.taverna.security.credentialmanager.CredentialManager.US import java.io.File; import org.apache.taverna.security.credentialmanager.MasterPasswordProvider; -import uk.org.taverna.configuration.app.ApplicationConfiguration; +import org.apache.taverna.configuration.app.ApplicationConfiguration; //import org.apache.log4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/80c15eec/taverna-credential-manager-impl/src/main/java/org/apache/taverna/security/credentialmanager/impl/DistinguishedNameParserImpl.java ---------------------------------------------------------------------- diff --git a/taverna-credential-manager-impl/src/main/java/org/apache/taverna/security/credentialmanager/impl/DistinguishedNameParserImpl.java b/taverna-credential-manager-impl/src/main/java/org/apache/taverna/security/credentialmanager/impl/DistinguishedNameParserImpl.java index a993720..3ce0538 100644 --- a/taverna-credential-manager-impl/src/main/java/org/apache/taverna/security/credentialmanager/impl/DistinguishedNameParserImpl.java +++ b/taverna-credential-manager-impl/src/main/java/org/apache/taverna/security/credentialmanager/impl/DistinguishedNameParserImpl.java @@ -56,7 +56,7 @@ import org.apache.taverna.security.credentialmanager.DistinguishedNameParser; import org.apache.log4j.Logger; -import uk.org.taverna.configuration.app.ApplicationConfiguration; +import org.apache.taverna.configuration.app.ApplicationConfiguration; /** * Utility methods for Credential Manager and security-related stuff. http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/80c15eec/taverna-credential-manager/src/main/java/org/apache/taverna/security/credentialmanager/DistinguishedNameParser.java ---------------------------------------------------------------------- diff --git a/taverna-credential-manager/src/main/java/org/apache/taverna/security/credentialmanager/DistinguishedNameParser.java b/taverna-credential-manager/src/main/java/org/apache/taverna/security/credentialmanager/DistinguishedNameParser.java index 5017b12..704fbde 100644 --- a/taverna-credential-manager/src/main/java/org/apache/taverna/security/credentialmanager/DistinguishedNameParser.java +++ b/taverna-credential-manager/src/main/java/org/apache/taverna/security/credentialmanager/DistinguishedNameParser.java @@ -24,7 +24,7 @@ import java.net.URI; import java.net.URISyntaxException; import java.security.cert.Certificate; import java.security.cert.X509Certificate; -import uk.org.taverna.configuration.app.ApplicationConfiguration; +import org.apache.taverna.configuration.app.ApplicationConfiguration; /** * Methods for parsing Distinguished Names and various associated utility methods. http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/80c15eec/taverna-database-configuration-api/src/main/java/org/apache/taverna/configuration/database/DatabaseConfiguration.java ---------------------------------------------------------------------- diff --git a/taverna-database-configuration-api/src/main/java/org/apache/taverna/configuration/database/DatabaseConfiguration.java b/taverna-database-configuration-api/src/main/java/org/apache/taverna/configuration/database/DatabaseConfiguration.java index 48e70e0..165b907 100644 --- a/taverna-database-configuration-api/src/main/java/org/apache/taverna/configuration/database/DatabaseConfiguration.java +++ b/taverna-database-configuration-api/src/main/java/org/apache/taverna/configuration/database/DatabaseConfiguration.java @@ -21,7 +21,7 @@ package org.apache.taverna.configuration.database; import java.util.Map; -import uk.org.taverna.configuration.Configurable; +import org.apache.taverna.configuration.Configurable; /** * http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/80c15eec/taverna-database-configuration-impl/src/main/java/org/apache/taverna/configuration/database/impl/DatabaseConfigurationImpl.java ---------------------------------------------------------------------- diff --git a/taverna-database-configuration-impl/src/main/java/org/apache/taverna/configuration/database/impl/DatabaseConfigurationImpl.java b/taverna-database-configuration-impl/src/main/java/org/apache/taverna/configuration/database/impl/DatabaseConfigurationImpl.java index e401e75..f0c2618 100644 --- a/taverna-database-configuration-impl/src/main/java/org/apache/taverna/configuration/database/impl/DatabaseConfigurationImpl.java +++ b/taverna-database-configuration-impl/src/main/java/org/apache/taverna/configuration/database/impl/DatabaseConfigurationImpl.java @@ -23,8 +23,8 @@ import java.util.HashMap; import java.util.Map; import org.apache.taverna.configuration.database.DatabaseConfiguration; -import uk.org.taverna.configuration.AbstractConfigurable; -import uk.org.taverna.configuration.ConfigurationManager; +import org.apache.taverna.configuration.AbstractConfigurable; +import org.apache.taverna.configuration.ConfigurationManager; /** * Configuration for the reference service and provenance. http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/80c15eec/taverna-database-configuration-impl/src/main/java/org/apache/taverna/configuration/database/impl/DatabaseManagerImpl.java ---------------------------------------------------------------------- diff --git a/taverna-database-configuration-impl/src/main/java/org/apache/taverna/configuration/database/impl/DatabaseManagerImpl.java b/taverna-database-configuration-impl/src/main/java/org/apache/taverna/configuration/database/impl/DatabaseManagerImpl.java index 67e34be..be7f12e 100644 --- a/taverna-database-configuration-impl/src/main/java/org/apache/taverna/configuration/database/impl/DatabaseManagerImpl.java +++ b/taverna-database-configuration-impl/src/main/java/org/apache/taverna/configuration/database/impl/DatabaseManagerImpl.java @@ -31,7 +31,7 @@ import org.apache.log4j.Logger; import org.apache.taverna.configuration.database.DatabaseConfiguration; import org.apache.taverna.configuration.database.DatabaseManager; -import uk.org.taverna.configuration.app.ApplicationConfiguration; +import org.apache.taverna.configuration.app.ApplicationConfiguration; /** * A set of utility methods related to basic data management. http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/80c15eec/taverna-integration-tests/src/test/java/uk/org/taverna/platform/ActivityIT.java ---------------------------------------------------------------------- diff --git a/taverna-integration-tests/src/test/java/uk/org/taverna/platform/ActivityIT.java b/taverna-integration-tests/src/test/java/uk/org/taverna/platform/ActivityIT.java index 5574ee0..65f0986 100644 --- a/taverna-integration-tests/src/test/java/uk/org/taverna/platform/ActivityIT.java +++ b/taverna-integration-tests/src/test/java/uk/org/taverna/platform/ActivityIT.java @@ -29,9 +29,9 @@ import org.junit.Ignore; import org.junit.Test; import org.osgi.framework.BundleContext; -import uk.org.taverna.osgi.starter.TavernaStarter; -import uk.org.taverna.platform.execution.api.ExecutionEnvironment; -import uk.org.taverna.platform.run.api.RunService; +import org.apache.taverna.osgi.starter.TavernaStarter; +import org.apache.taverna.platform.execution.api.ExecutionEnvironment; +import org.apache.taverna.platform.run.api.RunService; public class ActivityIT extends PlatformIT { http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/80c15eec/taverna-integration-tests/src/test/java/uk/org/taverna/platform/PlatformIT.java ---------------------------------------------------------------------- diff --git a/taverna-integration-tests/src/test/java/uk/org/taverna/platform/PlatformIT.java b/taverna-integration-tests/src/test/java/uk/org/taverna/platform/PlatformIT.java index 7af6202..2a5b6a0 100644 --- a/taverna-integration-tests/src/test/java/uk/org/taverna/platform/PlatformIT.java +++ b/taverna-integration-tests/src/test/java/uk/org/taverna/platform/PlatformIT.java @@ -35,8 +35,8 @@ import org.junit.Ignore; import org.apache.taverna.databundle.DataBundles; import org.apache.taverna.databundle.ErrorDocument; -import uk.org.taverna.platform.report.State; -import uk.org.taverna.platform.report.WorkflowReport; +import org.apache.taverna.platform.report.State; +import org.apache.taverna.platform.report.WorkflowReport; import org.apache.taverna.scufl2.api.container.WorkflowBundle; import org.apache.taverna.scufl2.api.io.WorkflowBundleIO; http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/80c15eec/taverna-integration-tests/src/test/java/uk/org/taverna/platform/RunIT.java ---------------------------------------------------------------------- diff --git a/taverna-integration-tests/src/test/java/uk/org/taverna/platform/RunIT.java b/taverna-integration-tests/src/test/java/uk/org/taverna/platform/RunIT.java index be24d24..ff1c61b 100644 --- a/taverna-integration-tests/src/test/java/uk/org/taverna/platform/RunIT.java +++ b/taverna-integration-tests/src/test/java/uk/org/taverna/platform/RunIT.java @@ -47,12 +47,12 @@ import org.osgi.framework.BundleContext; import org.apache.taverna.robundle.Bundle; import org.apache.taverna.databundle.DataBundles; -import uk.org.taverna.osgi.starter.TavernaStarter; -import uk.org.taverna.platform.execution.api.ExecutionEnvironment; -import uk.org.taverna.platform.report.State; -import uk.org.taverna.platform.report.WorkflowReport; -import uk.org.taverna.platform.run.api.RunProfile; -import uk.org.taverna.platform.run.api.RunService; +import org.apache.taverna.osgi.starter.TavernaStarter; +import org.apache.taverna.platform.execution.api.ExecutionEnvironment; +import org.apache.taverna.platform.report.State; +import org.apache.taverna.platform.report.WorkflowReport; +import org.apache.taverna.platform.run.api.RunProfile; +import org.apache.taverna.platform.run.api.RunService; import org.apache.taverna.scufl2.api.container.WorkflowBundle; import org.apache.taverna.scufl2.api.io.WorkflowBundleIO; http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/80c15eec/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/ActivityIT.java ---------------------------------------------------------------------- diff --git a/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/ActivityIT.java b/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/ActivityIT.java index 5d578dc..895633b 100644 --- a/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/ActivityIT.java +++ b/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/ActivityIT.java @@ -27,9 +27,9 @@ import net.sf.taverna.t2.workflowmodel.processor.activity.Activity; import org.osgi.framework.ServiceReference; -import uk.org.taverna.platform.capability.activity.ActivityConfigurationException; -import uk.org.taverna.platform.capability.activity.ActivityNotFoundException; -import uk.org.taverna.platform.capability.activity.ActivityService; +import org.apache.taverna.platform.capability.activity.ActivityConfigurationException; +import org.apache.taverna.platform.capability.activity.ActivityNotFoundException; +import org.apache.taverna.platform.capability.activity.ActivityService; import org.apache.taverna.scufl2.api.configurations.ConfigurationDefinition; public class ActivityIT extends PlatformIT { http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/80c15eec/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/CommandLineToolIT.java ---------------------------------------------------------------------- diff --git a/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/CommandLineToolIT.java b/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/CommandLineToolIT.java index 58b9fe8..d0d79d3 100644 --- a/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/CommandLineToolIT.java +++ b/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/CommandLineToolIT.java @@ -24,8 +24,8 @@ import net.sf.taverna.t2.commandline.CommandLineTool; import org.osgi.framework.ServiceReference; -import uk.org.taverna.commandline.args.CommandLineArguments; -import uk.org.taverna.platform.run.api.RunService; +import org.apache.taverna.commandline.args.CommandLineArguments; +import org.apache.taverna.platform.run.api.RunService; import org.apache.taverna.scufl2.api.io.WorkflowBundleIO; import org.apache.taverna.scufl2.api.io.WorkflowBundleReader; http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/80c15eec/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/ExecutionIT.java ---------------------------------------------------------------------- diff --git a/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/ExecutionIT.java b/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/ExecutionIT.java index 8e4ad1b..3736c5e 100644 --- a/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/ExecutionIT.java +++ b/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/ExecutionIT.java @@ -28,17 +28,17 @@ import java.util.Set; import org.osgi.framework.ServiceReference; -import uk.org.taverna.platform.capability.activity.ActivityConfigurationException; -import uk.org.taverna.platform.capability.activity.ActivityNotFoundException; -import uk.org.taverna.platform.data.api.Data; -import uk.org.taverna.platform.capability.dispatch.DispatchLayerConfigurationException; -import uk.org.taverna.platform.capability.dispatch.DispatchLayerNotFoundException; -import uk.org.taverna.platform.execution.api.AbstractExecutionEnvironment; -import uk.org.taverna.platform.execution.api.AbstractExecutionService; -import uk.org.taverna.platform.execution.api.Execution; -import uk.org.taverna.platform.execution.api.ExecutionEnvironment; -import uk.org.taverna.platform.execution.api.ExecutionEnvironmentService; -import uk.org.taverna.platform.execution.api.InvalidWorkflowException; +import org.apache.taverna.platform.capability.activity.ActivityConfigurationException; +import org.apache.taverna.platform.capability.activity.ActivityNotFoundException; +import org.apache.taverna.platform.data.api.Data; +import org.apache.taverna.platform.capability.dispatch.DispatchLayerConfigurationException; +import org.apache.taverna.platform.capability.dispatch.DispatchLayerNotFoundException; +import org.apache.taverna.platform.execution.api.AbstractExecutionEnvironment; +import org.apache.taverna.platform.execution.api.AbstractExecutionService; +import org.apache.taverna.platform.execution.api.Execution; +import org.apache.taverna.platform.execution.api.ExecutionEnvironment; +import org.apache.taverna.platform.execution.api.ExecutionEnvironmentService; +import org.apache.taverna.platform.execution.api.InvalidWorkflowException; import org.apache.taverna.scufl2.api.configurations.ConfigurationDefinition; import org.apache.taverna.scufl2.api.container.WorkflowBundle; import org.apache.taverna.scufl2.api.core.Workflow; http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/80c15eec/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/LocalExecutionIT.java ---------------------------------------------------------------------- diff --git a/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/LocalExecutionIT.java b/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/LocalExecutionIT.java index 3c2c5a7..fefa498 100644 --- a/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/LocalExecutionIT.java +++ b/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/LocalExecutionIT.java @@ -27,12 +27,12 @@ import java.util.Set; import org.osgi.framework.ServiceReference; -import uk.org.taverna.platform.data.api.Data; -import uk.org.taverna.platform.data.api.DataService; -import uk.org.taverna.platform.execution.api.ExecutionEnvironment; -import uk.org.taverna.platform.execution.api.ExecutionService; -import uk.org.taverna.platform.report.State; -import uk.org.taverna.platform.report.WorkflowReport; +import org.apache.taverna.platform.data.api.Data; +import org.apache.taverna.platform.data.api.DataService; +import org.apache.taverna.platform.execution.api.ExecutionEnvironment; +import org.apache.taverna.platform.execution.api.ExecutionService; +import org.apache.taverna.platform.report.State; +import org.apache.taverna.platform.report.WorkflowReport; import org.apache.taverna.scufl2.api.container.WorkflowBundle; import org.apache.taverna.scufl2.api.core.Workflow; import org.apache.taverna.scufl2.api.profiles.Profile; http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/80c15eec/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/PlatformIT.java ---------------------------------------------------------------------- diff --git a/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/PlatformIT.java b/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/PlatformIT.java index 517c21f..5191f33 100644 --- a/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/PlatformIT.java +++ b/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/PlatformIT.java @@ -42,11 +42,11 @@ import org.springframework.osgi.test.AbstractConfigurableBundleCreatorTests; import org.springframework.osgi.test.platform.OsgiPlatform; import org.springframework.osgi.test.platform.Platforms; -import uk.org.taverna.configuration.app.ApplicationConfiguration; -import uk.org.taverna.configuration.database.DatabaseConfiguration; -import uk.org.taverna.platform.data.api.Data; -import uk.org.taverna.platform.report.State; -import uk.org.taverna.platform.report.WorkflowReport; +import org.apache.taverna.configuration.app.ApplicationConfiguration; +import org.apache.taverna.configuration.database.DatabaseConfiguration; +import org.apache.taverna.platform.data.api.Data; +import org.apache.taverna.platform.report.State; +import org.apache.taverna.platform.report.WorkflowReport; import org.apache.taverna.scufl2.api.container.WorkflowBundle; import org.apache.taverna.scufl2.api.io.WorkflowBundleReader; import org.apache.taverna.scufl2.translator.t2flow.T2FlowReader; http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/80c15eec/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/RunIT.java ---------------------------------------------------------------------- diff --git a/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/RunIT.java b/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/RunIT.java index c1931af..e1f2edd 100644 --- a/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/RunIT.java +++ b/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/RunIT.java @@ -34,13 +34,13 @@ import net.sf.taverna.t2.security.credentialmanager.UsernamePassword; import org.osgi.framework.ServiceReference; -import uk.org.taverna.platform.data.api.Data; -import uk.org.taverna.platform.data.api.DataService; -import uk.org.taverna.platform.execution.api.ExecutionEnvironment; -import uk.org.taverna.platform.report.State; -import uk.org.taverna.platform.report.WorkflowReport; -import uk.org.taverna.platform.run.api.RunProfile; -import uk.org.taverna.platform.run.api.RunService; +import org.apache.taverna.platform.data.api.Data; +import org.apache.taverna.platform.data.api.DataService; +import org.apache.taverna.platform.execution.api.ExecutionEnvironment; +import org.apache.taverna.platform.report.State; +import org.apache.taverna.platform.report.WorkflowReport; +import org.apache.taverna.platform.run.api.RunProfile; +import org.apache.taverna.platform.run.api.RunService; import org.apache.taverna.scufl2.api.container.WorkflowBundle; public class RunIT extends PlatformIT { http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/80c15eec/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/RunParallelIT.java ---------------------------------------------------------------------- diff --git a/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/RunParallelIT.java b/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/RunParallelIT.java index b450c94..f38ad26 100644 --- a/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/RunParallelIT.java +++ b/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/RunParallelIT.java @@ -28,11 +28,11 @@ import net.sf.taverna.t2.security.credentialmanager.UsernamePassword; import org.osgi.framework.ServiceReference; -import uk.org.taverna.platform.execution.api.ExecutionEnvironment; -import uk.org.taverna.platform.report.State; -import uk.org.taverna.platform.report.WorkflowReport; -import uk.org.taverna.platform.run.api.RunProfile; -import uk.org.taverna.platform.run.api.RunService; +import org.apache.taverna.platform.execution.api.ExecutionEnvironment; +import org.apache.taverna.platform.report.State; +import org.apache.taverna.platform.report.WorkflowReport; +import org.apache.taverna.platform.run.api.RunProfile; +import org.apache.taverna.platform.run.api.RunService; import org.apache.taverna.scufl2.api.container.WorkflowBundle; public class RunParallelIT extends PlatformIT { http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/80c15eec/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/RunWorkflowsIT.java ---------------------------------------------------------------------- diff --git a/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/RunWorkflowsIT.java b/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/RunWorkflowsIT.java index dee97f0..7eef935 100644 --- a/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/RunWorkflowsIT.java +++ b/taverna-platform-integration-tests/src/test/java/uk/org/taverna/platform/RunWorkflowsIT.java @@ -26,12 +26,12 @@ import java.util.Set; import org.osgi.framework.ServiceReference; -import uk.org.taverna.platform.data.api.Data; -import uk.org.taverna.platform.execution.api.ExecutionEnvironment; -import uk.org.taverna.platform.report.State; -import uk.org.taverna.platform.report.WorkflowReport; -import uk.org.taverna.platform.run.api.RunProfile; -import uk.org.taverna.platform.run.api.RunService; +import org.apache.taverna.platform.data.api.Data; +import org.apache.taverna.platform.execution.api.ExecutionEnvironment; +import org.apache.taverna.platform.report.State; +import org.apache.taverna.platform.report.WorkflowReport; +import org.apache.taverna.platform.run.api.RunProfile; +import org.apache.taverna.platform.run.api.RunService; import org.apache.taverna.scufl2.api.container.WorkflowBundle; public class RunWorkflowsIT extends PlatformIT { http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/80c15eec/taverna-services-impl/src/main/java/org/apache/taverna/commons/services/impl/ServiceRegistryImpl.java ---------------------------------------------------------------------- diff --git a/taverna-services-impl/src/main/java/org/apache/taverna/commons/services/impl/ServiceRegistryImpl.java b/taverna-services-impl/src/main/java/org/apache/taverna/commons/services/impl/ServiceRegistryImpl.java index 1aaf1de..d1c52fe 100644 --- a/taverna-services-impl/src/main/java/org/apache/taverna/commons/services/impl/ServiceRegistryImpl.java +++ b/taverna-services-impl/src/main/java/org/apache/taverna/commons/services/impl/ServiceRegistryImpl.java @@ -22,9 +22,9 @@ package org.apache.taverna.commons.services.impl; import java.net.URI; import java.util.Set; -import org.apache.taverna.commons.services.ActivityTypeNotFoundException; -import org.apache.taverna.commons.services.InvalidConfigurationException; -import org.apache.taverna.commons.services.ServiceRegistry; +import org.apache.taverna.services.ActivityTypeNotFoundException; +import org.apache.taverna.services.InvalidConfigurationException; +import org.apache.taverna.services.ServiceRegistry; import org.apache.taverna.platform.capability.api.ActivityConfigurationException; import org.apache.taverna.platform.capability.api.ActivityNotFoundException; import org.apache.taverna.platform.capability.api.ActivityService;
