Repository: incubator-taverna-common-activities Updated Branches: refs/heads/master e4e20d789 -> 6367e738b
import org.apache.taverna.configuration* Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/commit/6367e738 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/6367e738 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/6367e738 Branch: refs/heads/master Commit: 6367e738b3662df0ed75097ada4c4c62ce0f6562 Parents: e4e20d7 Author: Stian Soiland-Reyes <[email protected]> Authored: Sun Oct 18 19:25:45 2015 +0100 Committer: Stian Soiland-Reyes <[email protected]> Committed: Sun Oct 18 23:23:18 2015 +0100 ---------------------------------------------------------------------- pom.xml | 2 +- .../org/apache/taverna/activities/beanshell/BeanshellActivity.java | 2 +- .../taverna/activities/beanshell/BeanshellActivityFactory.java | 2 +- .../dependencyactivity/AbstractAsynchronousDependencyActivity.java | 2 +- .../externaltool/manager/impl/InvocationGroupManagerImpl.java | 2 +- .../apache/taverna/activities/interaction/InteractionUtils.java | 2 +- .../activities/interaction/preference/InteractionPreference.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/6367e738/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 96afede..791bb90 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ <name>Apache Taverna Common Activities</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> <taverna.engine.version>3.1.0-incubating-SNAPSHOT</taverna.engine.version> </properties> <modules> http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/6367e738/taverna-beanshell-activity/src/main/java/org/apache/taverna/activities/beanshell/BeanshellActivity.java ---------------------------------------------------------------------- diff --git a/taverna-beanshell-activity/src/main/java/org/apache/taverna/activities/beanshell/BeanshellActivity.java b/taverna-beanshell-activity/src/main/java/org/apache/taverna/activities/beanshell/BeanshellActivity.java index c6aad7a..579512a 100644 --- a/taverna-beanshell-activity/src/main/java/org/apache/taverna/activities/beanshell/BeanshellActivity.java +++ b/taverna-beanshell-activity/src/main/java/org/apache/taverna/activities/beanshell/BeanshellActivity.java @@ -34,7 +34,7 @@ import org.apache.taverna.workflowmodel.processor.activity.AsynchronousActivityC import org.apache.log4j.Logger; -import uk.org.taverna.configuration.app.ApplicationConfiguration; +import org.apache.taverna.configuration.app.ApplicationConfiguration; import bsh.EvalError; import bsh.Interpreter; import bsh.TargetError; http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/6367e738/taverna-beanshell-activity/src/main/java/org/apache/taverna/activities/beanshell/BeanshellActivityFactory.java ---------------------------------------------------------------------- diff --git a/taverna-beanshell-activity/src/main/java/org/apache/taverna/activities/beanshell/BeanshellActivityFactory.java b/taverna-beanshell-activity/src/main/java/org/apache/taverna/activities/beanshell/BeanshellActivityFactory.java index 8cbb068..414f227 100644 --- a/taverna-beanshell-activity/src/main/java/org/apache/taverna/activities/beanshell/BeanshellActivityFactory.java +++ b/taverna-beanshell-activity/src/main/java/org/apache/taverna/activities/beanshell/BeanshellActivityFactory.java @@ -27,7 +27,7 @@ import java.util.Set; import org.apache.taverna.workflowmodel.processor.activity.ActivityFactory; import org.apache.taverna.workflowmodel.processor.activity.ActivityInputPort; import org.apache.taverna.workflowmodel.processor.activity.ActivityOutputPort; -import uk.org.taverna.configuration.app.ApplicationConfiguration; +import org.apache.taverna.configuration.app.ApplicationConfiguration; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/6367e738/taverna-beanshell-activity/src/main/java/org/apache/taverna/activities/dependencyactivity/AbstractAsynchronousDependencyActivity.java ---------------------------------------------------------------------- diff --git a/taverna-beanshell-activity/src/main/java/org/apache/taverna/activities/dependencyactivity/AbstractAsynchronousDependencyActivity.java b/taverna-beanshell-activity/src/main/java/org/apache/taverna/activities/dependencyactivity/AbstractAsynchronousDependencyActivity.java index 30665c5..e61687d 100644 --- a/taverna-beanshell-activity/src/main/java/org/apache/taverna/activities/dependencyactivity/AbstractAsynchronousDependencyActivity.java +++ b/taverna-beanshell-activity/src/main/java/org/apache/taverna/activities/dependencyactivity/AbstractAsynchronousDependencyActivity.java @@ -36,7 +36,7 @@ import org.apache.taverna.workflowmodel.processor.activity.NestedDataflow; import org.apache.log4j.Logger; -import uk.org.taverna.configuration.app.ApplicationConfiguration; +import org.apache.taverna.configuration.app.ApplicationConfiguration; import com.fasterxml.jackson.databind.JsonNode; http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/6367e738/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/manager/impl/InvocationGroupManagerImpl.java ---------------------------------------------------------------------- diff --git a/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/manager/impl/InvocationGroupManagerImpl.java b/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/manager/impl/InvocationGroupManagerImpl.java index 068be5d..31cda2b 100644 --- a/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/manager/impl/InvocationGroupManagerImpl.java +++ b/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/manager/impl/InvocationGroupManagerImpl.java @@ -55,7 +55,7 @@ import org.jdom.input.SAXBuilder; import org.jdom.output.Format; import org.jdom.output.XMLOutputter; -import uk.org.taverna.configuration.app.ApplicationConfiguration; +import org.apache.taverna.configuration.app.ApplicationConfiguration; /** http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/6367e738/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/InteractionUtils.java ---------------------------------------------------------------------- diff --git a/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/InteractionUtils.java b/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/InteractionUtils.java index 7165e76..24df89d 100644 --- a/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/InteractionUtils.java +++ b/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/InteractionUtils.java @@ -38,7 +38,7 @@ import org.apache.commons.io.IOUtils; import com.fasterxml.jackson.databind.ObjectMapper; -import uk.org.taverna.configuration.app.ApplicationConfiguration; +import org.apache.taverna.configuration.app.ApplicationConfiguration; /** * @author alanrw http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/6367e738/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/preference/InteractionPreference.java ---------------------------------------------------------------------- diff --git a/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/preference/InteractionPreference.java b/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/preference/InteractionPreference.java index 6b47368..e904a47 100644 --- a/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/preference/InteractionPreference.java +++ b/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/preference/InteractionPreference.java @@ -31,7 +31,7 @@ import java.util.Properties; import org.apache.log4j.Logger; -import uk.org.taverna.configuration.app.ApplicationConfiguration; +import org.apache.taverna.configuration.app.ApplicationConfiguration; /** * @author alanrw
