You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2015/06/11 17:24:27 UTC

[07/11] incubator-taverna-language git commit: roevo serialization with jena

roevo serialization with jena

Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/518d7ce5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/518d7ce5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/518d7ce5

Branch: refs/heads/wfdesc-jena
Commit: 518d7ce525dade5b68c8025d9c62de7128279532
Parents: 3c77538
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Feb 26 21:40:01 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Jun 5 22:52:22 2015 +0100

----------------------------------------------------------------------
 taverna-scufl2-wfdesc/pom.xml                   |  6 ----
 .../taverna/scufl2/wfdesc/ROEvoSerializer.java  | 35 +++++---------------
 2 files changed, 8 insertions(+), 33 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/518d7ce5/taverna-scufl2-wfdesc/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-scufl2-wfdesc/pom.xml b/taverna-scufl2-wfdesc/pom.xml
index 228f917..6eb231a 100755
--- a/taverna-scufl2-wfdesc/pom.xml
+++ b/taverna-scufl2-wfdesc/pom.xml
@@ -173,12 +173,6 @@
         	<version>${jena.version}</version>
         </dependency>
         <dependency>
-        	<groupId>org.apache.jena</groupId>
-        	<artifactId>jena-arq</artifactId>
-        	<version>${jena.version}</version>
-        </dependency>
-
-        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.4</version>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/518d7ce5/taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/ROEvoSerializer.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/ROEvoSerializer.java b/taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/ROEvoSerializer.java
index f0ee289..4d09d4d 100644
--- a/taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/ROEvoSerializer.java
+++ b/taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/ROEvoSerializer.java
@@ -29,22 +29,11 @@ import org.apache.taverna.scufl2.api.annotation.Revision;
 import org.apache.taverna.scufl2.api.core.Workflow;
 import org.apache.taverna.scufl2.api.io.WriterException;
 import org.apache.taverna.scufl2.wfdesc.ontologies.Prov_o;
-import org.openrdf.OpenRDFException;
-import org.openrdf.model.URI;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.repository.Repository;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.rio.helpers.OrganizedRDFWriter;
-import org.openrdf.sail.memory.MemoryStore;
 
 import com.hp.hpl.jena.ontology.Individual;
 import com.hp.hpl.jena.ontology.OntClass;
 import com.hp.hpl.jena.ontology.OntModel;
 import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.Resource;
 
 
 public class ROEvoSerializer {
@@ -63,23 +52,15 @@ public class ROEvoSerializer {
 		}
 		
 		java.net.URI baseURI = Workflow.WORKFLOW_ROOT;
-		
-		try {
-			con.setNamespace("roevo", "http://purl.org/wf4ever/roevo#");
-			con.setNamespace("prov", "http://www.w3.org/ns/prov#");
-//			con.setNamespace("wfdesc",
-//					"http://purl.org/wf4ever/wfdesc#");
-//			con.setNamespace("wf4ever",
-//					"http://purl.org/wf4ever/wf4ever#");
-			con.setNamespace("rdfs",
-					"http://www.w3.org/2000/01/rdf-schema#");
-
+		model.setNsPrefix("roevo", "http://purl.org/wf4ever/roevo#");
+		model.setNsPrefix("prov", "http://www.w3.org/ns/prov#");
+		model.setNsPrefix("rdfs",
+				"http://www.w3.org/2000/01/rdf-schema#");
 			
-			con.export(new OrganizedRDFWriter(
-					new TurtleWriterWithBase(output, baseURI)));
-		} catch (OpenRDFException e) {
-			throw new WriterException("Can't write to output", e);
-		}
+		model.write(output, "turtle", baseURI.toASCIIString());
+
+//			throw new WriterException("Can't write to output", e);
+		
 		
 	}