Repository: incubator-taverna-engine Updated Branches: refs/heads/master 5f1ddb715 -> 49cd7deee
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/49cd7dee Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/tree/49cd7dee Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/diff/49cd7dee Branch: refs/heads/master Commit: 49cd7deee3b5e34a02a4d463c0500af4a1097f86 Parents: 5f1ddb7 Author: Dmitry Repchevsky <[email protected]> Authored: Thu Mar 26 15:46:14 2015 +0100 Committer: Dmitry Repchevsky <[email protected]> Committed: Thu Mar 26 15:46:14 2015 +0100 ---------------------------------------------------------------------- taverna-provenanceconnector/pom.xml | 8 +++--- .../lineageservice/EventProcessor.java | 28 ++++++++++---------- .../provenance/lineageservice/Provenance.java | 2 +- .../lineageservice/ProvenanceAnalysis.java | 4 +-- .../lineageservice/utils/ProvenanceUtils.java | 12 ++++----- 5 files changed, 27 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/49cd7dee/taverna-provenanceconnector/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-provenanceconnector/pom.xml b/taverna-provenanceconnector/pom.xml index 7c29589..98c1a0e 100644 --- a/taverna-provenanceconnector/pom.xml +++ b/taverna-provenanceconnector/pom.xml @@ -2,14 +2,14 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.taverna.engine</groupId> - <artifactId>taverna-engine</artifactId> - <version>3.1.0-incubating-SNAPSHOT</version> + <groupId>org.apache.taverna.engine</groupId> + <artifactId>taverna-engine</artifactId> + <version>3.1.0-incubating-SNAPSHOT</version> </parent> <artifactId>taverna-provenanceconnector</artifactId> <packaging>bundle</packaging> <name>Apache Taverna Provenance Connector</name> - <description>Database storage and analysis of provenance info (LEGACY)</description> + <description>Database storage and analysis of provenance info (LEGACY)</description> <build> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/49cd7dee/taverna-provenanceconnector/src/main/java/net/sf/taverna/t2/provenance/lineageservice/EventProcessor.java ---------------------------------------------------------------------- diff --git a/taverna-provenanceconnector/src/main/java/net/sf/taverna/t2/provenance/lineageservice/EventProcessor.java b/taverna-provenanceconnector/src/main/java/net/sf/taverna/t2/provenance/lineageservice/EventProcessor.java index aa0c07d..3e2b5f4 100644 --- a/taverna-provenanceconnector/src/main/java/net/sf/taverna/t2/provenance/lineageservice/EventProcessor.java +++ b/taverna-provenanceconnector/src/main/java/net/sf/taverna/t2/provenance/lineageservice/EventProcessor.java @@ -72,20 +72,20 @@ import net.sf.taverna.t2.provenance.lineageservice.utils.ProcessorEnactment; import net.sf.taverna.t2.provenance.lineageservice.utils.ProvenanceProcessor; import net.sf.taverna.t2.provenance.lineageservice.utils.ProvenanceUtils; import net.sf.taverna.t2.provenance.vocabulary.SharedVocabulary; -import net.sf.taverna.t2.reference.T2Reference; -import net.sf.taverna.t2.workflowmodel.Dataflow; -import net.sf.taverna.t2.workflowmodel.DataflowInputPort; -import net.sf.taverna.t2.workflowmodel.DataflowOutputPort; -import net.sf.taverna.t2.workflowmodel.Datalink; -import net.sf.taverna.t2.workflowmodel.InputPort; -import net.sf.taverna.t2.workflowmodel.MergeInputPort; -import net.sf.taverna.t2.workflowmodel.MergeOutputPort; -import net.sf.taverna.t2.workflowmodel.OutputPort; -import net.sf.taverna.t2.workflowmodel.Processor; -import net.sf.taverna.t2.workflowmodel.ProcessorInputPort; -import net.sf.taverna.t2.workflowmodel.ProcessorOutputPort; -import net.sf.taverna.t2.workflowmodel.processor.activity.Activity; -import net.sf.taverna.t2.workflowmodel.processor.activity.NestedDataflow; +import org.apache.taverna.reference.T2Reference; +import org.apache.taverna.workflowmodel.Dataflow; +import org.apache.taverna.workflowmodel.DataflowInputPort; +import org.apache.taverna.workflowmodel.DataflowOutputPort; +import org.apache.taverna.workflowmodel.Datalink; +import org.apache.taverna.workflowmodel.InputPort; +import org.apache.taverna.workflowmodel.MergeInputPort; +import org.apache.taverna.workflowmodel.MergeOutputPort; +import org.apache.taverna.workflowmodel.OutputPort; +import org.apache.taverna.workflowmodel.Processor; +import org.apache.taverna.workflowmodel.ProcessorInputPort; +import org.apache.taverna.workflowmodel.ProcessorOutputPort; +import org.apache.taverna.workflowmodel.processor.activity.Activity; +import org.apache.taverna.workflowmodel.processor.activity.NestedDataflow; http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/49cd7dee/taverna-provenanceconnector/src/main/java/net/sf/taverna/t2/provenance/lineageservice/Provenance.java ---------------------------------------------------------------------- diff --git a/taverna-provenanceconnector/src/main/java/net/sf/taverna/t2/provenance/lineageservice/Provenance.java b/taverna-provenanceconnector/src/main/java/net/sf/taverna/t2/provenance/lineageservice/Provenance.java index 621e351..a7f16b8 100644 --- a/taverna-provenanceconnector/src/main/java/net/sf/taverna/t2/provenance/lineageservice/Provenance.java +++ b/taverna-provenanceconnector/src/main/java/net/sf/taverna/t2/provenance/lineageservice/Provenance.java @@ -32,7 +32,7 @@ import net.sf.taverna.t2.provenance.connector.AbstractProvenanceConnector; import net.sf.taverna.t2.provenance.item.ProvenanceItem; import net.sf.taverna.t2.provenance.item.WorkflowProvenanceItem; import net.sf.taverna.t2.provenance.vocabulary.SharedVocabulary; -import net.sf.taverna.t2.workflowmodel.Dataflow; +import org.apache.taverna.workflowmodel.Dataflow; import org.apache.log4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/49cd7dee/taverna-provenanceconnector/src/main/java/net/sf/taverna/t2/provenance/lineageservice/ProvenanceAnalysis.java ---------------------------------------------------------------------- diff --git a/taverna-provenanceconnector/src/main/java/net/sf/taverna/t2/provenance/lineageservice/ProvenanceAnalysis.java b/taverna-provenanceconnector/src/main/java/net/sf/taverna/t2/provenance/lineageservice/ProvenanceAnalysis.java index 990ca30..4bfc521 100644 --- a/taverna-provenanceconnector/src/main/java/net/sf/taverna/t2/provenance/lineageservice/ProvenanceAnalysis.java +++ b/taverna-provenanceconnector/src/main/java/net/sf/taverna/t2/provenance/lineageservice/ProvenanceAnalysis.java @@ -27,7 +27,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import net.sf.taverna.t2.invocation.InvocationContext; +import org.apache.taverna.invocation.InvocationContext; import net.sf.taverna.t2.provenance.api.NativeAnswer; import net.sf.taverna.t2.provenance.api.QueryAnswer; import net.sf.taverna.t2.provenance.lineageservice.utils.DataLink; @@ -37,7 +37,7 @@ import net.sf.taverna.t2.provenance.lineageservice.utils.ProvenanceProcessor; import net.sf.taverna.t2.provenance.lineageservice.utils.QueryPort; import net.sf.taverna.t2.provenance.lineageservice.utils.WorkflowRun; import net.sf.taverna.t2.provenance.opm.OPMManager; -import net.sf.taverna.t2.reference.T2Reference; +import org.apache.taverna.reference.T2Reference; import org.apache.log4j.Logger; import org.tupeloproject.kernel.OperatorException; http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/49cd7dee/taverna-provenanceconnector/src/main/java/net/sf/taverna/t2/provenance/lineageservice/utils/ProvenanceUtils.java ---------------------------------------------------------------------- diff --git a/taverna-provenanceconnector/src/main/java/net/sf/taverna/t2/provenance/lineageservice/utils/ProvenanceUtils.java b/taverna-provenanceconnector/src/main/java/net/sf/taverna/t2/provenance/lineageservice/utils/ProvenanceUtils.java index a36308a..ddeffd8 100644 --- a/taverna-provenanceconnector/src/main/java/net/sf/taverna/t2/provenance/lineageservice/utils/ProvenanceUtils.java +++ b/taverna-provenanceconnector/src/main/java/net/sf/taverna/t2/provenance/lineageservice/utils/ProvenanceUtils.java @@ -6,12 +6,12 @@ import java.util.Set; import java.util.regex.Pattern; import net.sf.taverna.t2.provenance.item.DataProvenanceItem; -import net.sf.taverna.t2.reference.ErrorDocument; -import net.sf.taverna.t2.reference.ExternalReferenceSPI; -import net.sf.taverna.t2.reference.IdentifiedList; -import net.sf.taverna.t2.reference.ReferenceService; -import net.sf.taverna.t2.reference.ReferenceSet; -import net.sf.taverna.t2.reference.T2Reference; +import org.apache.taverna.reference.ErrorDocument; +import org.apache.taverna.reference.ExternalReferenceSPI; +import org.apache.taverna.reference.IdentifiedList; +import org.apache.taverna.reference.ReferenceService; +import org.apache.taverna.reference.ReferenceSet; +import org.apache.taverna.reference.T2Reference; import org.jdom.Element; import org.tupeloproject.kernel.NotFoundException;
