Author: concelvio
Date: Thu Mar 31 11:43:21 2011
New Revision: 1087256
URL: http://svn.apache.org/viewvc?rev=1087256&view=rev
Log:
STANBOL-133:
Whit this commit the point "* kres/jersey module should not have dependency to
kres/owlapi in any way" can be checked out.
- renamed owlapi to owl;
- renamed artifact from org.apache.stanbol.owlapi to org.apache.stanbol.owl;
renamed single packages;
- moved OWLOtnologyWriter.java from org.apache.stanbol.kres.jersey.writer to
org.apache.stanbol.owl.web;
- copied KRFormat.java into org.apache.stanbol.owl.web;
- removed OWLmodelWriter.java from org.apache.stanbol.kres.jersey.writer (not
used any more);
- refactoring where required imports and dependency in pom.xml files.
Added:
incubator/stanbol/trunk/kres/owl/
- copied from r1087247, incubator/stanbol/trunk/kres/owlapi/
incubator/stanbol/trunk/kres/owl/src/main/java/org/apache/stanbol/owl/
incubator/stanbol/trunk/kres/owl/src/main/java/org/apache/stanbol/owl/RunSingleSPARQL.java
- copied, changed from r1087247,
incubator/stanbol/trunk/kres/owlapi/src/main/java/org/apache/stanbol/owlapi/RunSingleSPARQL.java
incubator/stanbol/trunk/kres/owl/src/main/java/org/apache/stanbol/owl/trasformation/
incubator/stanbol/trunk/kres/owl/src/main/java/org/apache/stanbol/owl/trasformation/JenaToClerezzaConverter.java
- copied, changed from r1087247,
incubator/stanbol/trunk/kres/owlapi/src/main/java/org/apache/stanbol/owlapi/trasformation/JenaToClerezzaConverter.java
incubator/stanbol/trunk/kres/owl/src/main/java/org/apache/stanbol/owl/trasformation/JenaToOwlConvert.java
- copied, changed from r1087247,
incubator/stanbol/trunk/kres/owlapi/src/main/java/org/apache/stanbol/owlapi/trasformation/JenaToOwlConvert.java
incubator/stanbol/trunk/kres/owl/src/main/java/org/apache/stanbol/owl/trasformation/OWLAPIToClerezzaConverter.java
- copied, changed from r1087247,
incubator/stanbol/trunk/kres/owlapi/src/main/java/org/apache/stanbol/owlapi/trasformation/OWLAPIToClerezzaConverter.java
incubator/stanbol/trunk/kres/owl/src/main/java/org/apache/stanbol/owl/web/
incubator/stanbol/trunk/kres/owl/src/main/java/org/apache/stanbol/owl/web/KRFormat.java
incubator/stanbol/trunk/kres/owl/src/main/java/org/apache/stanbol/owl/web/OWLOntologyWriter.java
- copied, changed from r1087247,
incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/writers/OWLOntologyWriter.java
incubator/stanbol/trunk/kres/owl/src/test/java/org/apache/stanbol/owl/
incubator/stanbol/trunk/kres/owl/src/test/java/org/apache/stanbol/owl/RunSingleSPARQLTest.java
- copied, changed from r1087247,
incubator/stanbol/trunk/kres/owlapi/src/test/java/org/apache/stanbol/owlapi/RunSingleSPARQLTest.java
incubator/stanbol/trunk/kres/owl/src/test/java/org/apache/stanbol/owl/trasformation/
incubator/stanbol/trunk/kres/owl/src/test/java/org/apache/stanbol/owl/trasformation/ConversionTester.java
- copied, changed from r1087247,
incubator/stanbol/trunk/kres/owlapi/src/test/java/org/apache/stanbol/owlapi/trasformation/ConversionTester.java
Removed:
incubator/stanbol/trunk/kres/owl/src/main/java/org/apache/stanbol/owlapi/RunSingleSPARQL.java
incubator/stanbol/trunk/kres/owl/src/main/java/org/apache/stanbol/owlapi/trasformation/JenaToClerezzaConverter.java
incubator/stanbol/trunk/kres/owl/src/main/java/org/apache/stanbol/owlapi/trasformation/JenaToOwlConvert.java
incubator/stanbol/trunk/kres/owl/src/main/java/org/apache/stanbol/owlapi/trasformation/OWLAPIToClerezzaConverter.java
incubator/stanbol/trunk/kres/owl/src/test/java/org/apache/stanbol/owlapi/RunSingleSPARQLTest.java
incubator/stanbol/trunk/kres/owl/src/test/java/org/apache/stanbol/owlapi/trasformation/ConversionTester.java
incubator/stanbol/trunk/kres/owlapi/
Modified:
incubator/stanbol/trunk/kres/owl/pom.xml
Modified: incubator/stanbol/trunk/kres/owl/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/owl/pom.xml?rev=1087256&r1=1087247&r2=1087256&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/owl/pom.xml (original)
+++ incubator/stanbol/trunk/kres/owl/pom.xml Thu Mar 31 11:43:21 2011
@@ -26,7 +26,7 @@
<relativePath>../../parent</relativePath>
</parent>
- <artifactId>org.apache.stanbol.owlapi</artifactId>
+ <artifactId>org.apache.stanbol.owl</artifactId>
<version>${stanbol-version}</version>
<packaging>bundle</packaging>
<name>Apache Stanbol OSGi bundle for OWL API</name>
@@ -89,12 +89,30 @@
<artifactId>jena</artifactId>
<version>2.6.2</version>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>com.hp.hpl.jena</groupId>
<artifactId>arq</artifactId>
<version>2.8.3</version>
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ <version>1.1.1</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.rdf.rdfjson</artifactId>
+ <version>0.3-incubating-SNAPSHOT</version>
+ <type>bundle</type>
+ </dependency>
</dependencies>
<build>
@@ -106,23 +124,17 @@
<configuration>
<instructions>
<Import-Package>
- com.hp.hpl.jena.graph,
-
com.hp.hpl.jena.ontology,
-
com.hp.hpl.jena.rdf.model,
-
org.apache.clerezza.rdf.core,
-
org.apache.clerezza.rdf.core.impl,
-
org.apache.clerezza.rdf.core.serializedform,
-
org.apache.clerezza.rdf.jena.parser,
-
org.apache.clerezza.rdf.jena.serializer,
- javax.swing,
- javax.xml.parsers,
- org.xml.sax,
- org.xml.sax.helpers,
+ com.hp.hpl.jena.*,
+
org.apache.clerezza.rdf.*,
+ javax.*,
+ org.xml.sax.*,
de.uulm.ecs.ai.*,
org.semanticweb.owlapi.*,
org.coode.*,
uk.ac.manchester.cs.*,
- com.clarkparsia.owlapi.*
+
com.clarkparsia.owlapi.*,
+
org.slf4j.*;version=1.5.2,
+ *
</Import-Package>
<Export-Package>
de.uulm.ecs.ai.*,
@@ -130,7 +142,7 @@
org.coode.*,
uk.ac.manchester.cs.*,
com.clarkparsia.owlapi.*,
-
org.apache.stanbol.owlapi.trasformation.*;version=${stanbol-version}
+
org.apache.stanbol.owl.*;version=${stanbol-version}
</Export-Package>
<Private-Package />
<_nouses>true</_nouses>
Copied:
incubator/stanbol/trunk/kres/owl/src/main/java/org/apache/stanbol/owl/RunSingleSPARQL.java
(from r1087247,
incubator/stanbol/trunk/kres/owlapi/src/main/java/org/apache/stanbol/owlapi/RunSingleSPARQL.java)
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/owl/src/main/java/org/apache/stanbol/owl/RunSingleSPARQL.java?p2=incubator/stanbol/trunk/kres/owl/src/main/java/org/apache/stanbol/owl/RunSingleSPARQL.java&p1=incubator/stanbol/trunk/kres/owlapi/src/main/java/org/apache/stanbol/owlapi/RunSingleSPARQL.java&r1=1087247&r2=1087256&rev=1087256&view=diff
==============================================================================
---
incubator/stanbol/trunk/kres/owlapi/src/main/java/org/apache/stanbol/owlapi/RunSingleSPARQL.java
(original)
+++
incubator/stanbol/trunk/kres/owl/src/main/java/org/apache/stanbol/owl/RunSingleSPARQL.java
Thu Mar 31 11:43:21 2011
@@ -3,7 +3,7 @@
* and open the template in the editor.
*/
-package org.apache.stanbol.owlapi;
+package org.apache.stanbol.owl;
import java.util.HashMap;
import java.util.Iterator;
@@ -16,7 +16,7 @@ import com.hp.hpl.jena.query.QueryExecut
import com.hp.hpl.jena.query.QueryExecutionFactory;
import com.hp.hpl.jena.query.ResultSet;
-import org.apache.stanbol.owlapi.trasformation.JenaToOwlConvert;
+import org.apache.stanbol.owl.trasformation.JenaToOwlConvert;
/**
*
Copied:
incubator/stanbol/trunk/kres/owl/src/main/java/org/apache/stanbol/owl/trasformation/JenaToClerezzaConverter.java
(from r1087247,
incubator/stanbol/trunk/kres/owlapi/src/main/java/org/apache/stanbol/owlapi/trasformation/JenaToClerezzaConverter.java)
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/owl/src/main/java/org/apache/stanbol/owl/trasformation/JenaToClerezzaConverter.java?p2=incubator/stanbol/trunk/kres/owl/src/main/java/org/apache/stanbol/owl/trasformation/JenaToClerezzaConverter.java&p1=incubator/stanbol/trunk/kres/owlapi/src/main/java/org/apache/stanbol/owlapi/trasformation/JenaToClerezzaConverter.java&r1=1087247&r2=1087256&rev=1087256&view=diff
==============================================================================
---
incubator/stanbol/trunk/kres/owlapi/src/main/java/org/apache/stanbol/owlapi/trasformation/JenaToClerezzaConverter.java
(original)
+++
incubator/stanbol/trunk/kres/owl/src/main/java/org/apache/stanbol/owl/trasformation/JenaToClerezzaConverter.java
Thu Mar 31 11:43:21 2011
@@ -1,4 +1,4 @@
-package org.apache.stanbol.owlapi.trasformation;
+package org.apache.stanbol.owl.trasformation;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Copied:
incubator/stanbol/trunk/kres/owl/src/main/java/org/apache/stanbol/owl/trasformation/JenaToOwlConvert.java
(from r1087247,
incubator/stanbol/trunk/kres/owlapi/src/main/java/org/apache/stanbol/owlapi/trasformation/JenaToOwlConvert.java)
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/owl/src/main/java/org/apache/stanbol/owl/trasformation/JenaToOwlConvert.java?p2=incubator/stanbol/trunk/kres/owl/src/main/java/org/apache/stanbol/owl/trasformation/JenaToOwlConvert.java&p1=incubator/stanbol/trunk/kres/owlapi/src/main/java/org/apache/stanbol/owlapi/trasformation/JenaToOwlConvert.java&r1=1087247&r2=1087256&rev=1087256&view=diff
==============================================================================
---
incubator/stanbol/trunk/kres/owlapi/src/main/java/org/apache/stanbol/owlapi/trasformation/JenaToOwlConvert.java
(original)
+++
incubator/stanbol/trunk/kres/owl/src/main/java/org/apache/stanbol/owl/trasformation/JenaToOwlConvert.java
Thu Mar 31 11:43:21 2011
@@ -3,7 +3,7 @@
* and open the template in the editor.
*/
-package org.apache.stanbol.owlapi.trasformation;
+package org.apache.stanbol.owl.trasformation;
import com.hp.hpl.jena.ontology.AnnotationProperty;
Copied:
incubator/stanbol/trunk/kres/owl/src/main/java/org/apache/stanbol/owl/trasformation/OWLAPIToClerezzaConverter.java
(from r1087247,
incubator/stanbol/trunk/kres/owlapi/src/main/java/org/apache/stanbol/owlapi/trasformation/OWLAPIToClerezzaConverter.java)
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/owl/src/main/java/org/apache/stanbol/owl/trasformation/OWLAPIToClerezzaConverter.java?p2=incubator/stanbol/trunk/kres/owl/src/main/java/org/apache/stanbol/owl/trasformation/OWLAPIToClerezzaConverter.java&p1=incubator/stanbol/trunk/kres/owlapi/src/main/java/org/apache/stanbol/owlapi/trasformation/OWLAPIToClerezzaConverter.java&r1=1087247&r2=1087256&rev=1087256&view=diff
==============================================================================
---
incubator/stanbol/trunk/kres/owlapi/src/main/java/org/apache/stanbol/owlapi/trasformation/OWLAPIToClerezzaConverter.java
(original)
+++
incubator/stanbol/trunk/kres/owl/src/main/java/org/apache/stanbol/owl/trasformation/OWLAPIToClerezzaConverter.java
Thu Mar 31 11:43:21 2011
@@ -1,4 +1,4 @@
-package org.apache.stanbol.owlapi.trasformation;
+package org.apache.stanbol.owl.trasformation;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Added:
incubator/stanbol/trunk/kres/owl/src/main/java/org/apache/stanbol/owl/web/KRFormat.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/owl/src/main/java/org/apache/stanbol/owl/web/KRFormat.java?rev=1087256&view=auto
==============================================================================
---
incubator/stanbol/trunk/kres/owl/src/main/java/org/apache/stanbol/owl/web/KRFormat.java
(added)
+++
incubator/stanbol/trunk/kres/owl/src/main/java/org/apache/stanbol/owl/web/KRFormat.java
Thu Mar 31 11:43:21 2011
@@ -0,0 +1,38 @@
+package org.apache.stanbol.owl.web;
+
+import javax.ws.rs.core.MediaType;
+
+/**
+ * Additional MIME types for knowledge representation formats.
+ *
+ * @author andrea.nuzzolese
+ * @author alessandro
+ *
+ */
+public class KRFormat extends MediaType {
+
+ public static final String RDF_XML = "application/rdf+xml";
+
+ public static final MediaType RDF_XML_TYPE = new MediaType("application",
"rdf+xml");
+
+ public static final String OWL_XML = "application/owl+xml";
+
+ public static final MediaType OWL_XML_TYPE = new MediaType("application",
"owl+xml");
+
+ public static final String MANCHESTER_OWL = "application/manchester+owl";
+
+ public static final MediaType MANCHESTER_OWL_TYPE = new
MediaType("application", "manchester+xml");
+
+ public static final String FUNCTIONAL_OWL = "application/functional+owl";
+
+ public static final MediaType FUNCTIONAL_OWL_TYPE = new
MediaType("application", "functional+xml");
+
+ public static final String TURTLE = "application/turtle";
+
+ public static final MediaType TURTLE_TYPE = new MediaType("application",
"turtle");
+
+ public static final String RDF_JSON = "application/rdf+json";
+
+ public static final MediaType RDF_JSON_TYPE = new MediaType("application",
"rdf+json");
+
+}
Copied:
incubator/stanbol/trunk/kres/owl/src/main/java/org/apache/stanbol/owl/web/OWLOntologyWriter.java
(from r1087247,
incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/writers/OWLOntologyWriter.java)
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/owl/src/main/java/org/apache/stanbol/owl/web/OWLOntologyWriter.java?p2=incubator/stanbol/trunk/kres/owl/src/main/java/org/apache/stanbol/owl/web/OWLOntologyWriter.java&p1=incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/writers/OWLOntologyWriter.java&r1=1087247&r2=1087256&rev=1087256&view=diff
==============================================================================
---
incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/writers/OWLOntologyWriter.java
(original)
+++
incubator/stanbol/trunk/kres/owl/src/main/java/org/apache/stanbol/owl/web/OWLOntologyWriter.java
Thu Mar 31 11:43:21 2011
@@ -1,4 +1,4 @@
-package org.apache.stanbol.kres.jersey.writers;
+package org.apache.stanbol.owl.web;
import java.io.IOException;
import java.io.OutputStream;
@@ -30,8 +30,7 @@ import org.semanticweb.owlapi.model.OWLO
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.stanbol.kres.jersey.format.KRFormat;
-import org.apache.stanbol.owlapi.trasformation.OWLAPIToClerezzaConverter;
+import org.apache.stanbol.owl.trasformation.OWLAPIToClerezzaConverter;
@Provider
@Produces( { KRFormat.RDF_XML, KRFormat.OWL_XML, KRFormat.MANCHESTER_OWL,
Copied:
incubator/stanbol/trunk/kres/owl/src/test/java/org/apache/stanbol/owl/RunSingleSPARQLTest.java
(from r1087247,
incubator/stanbol/trunk/kres/owlapi/src/test/java/org/apache/stanbol/owlapi/RunSingleSPARQLTest.java)
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/owl/src/test/java/org/apache/stanbol/owl/RunSingleSPARQLTest.java?p2=incubator/stanbol/trunk/kres/owl/src/test/java/org/apache/stanbol/owl/RunSingleSPARQLTest.java&p1=incubator/stanbol/trunk/kres/owlapi/src/test/java/org/apache/stanbol/owlapi/RunSingleSPARQLTest.java&r1=1087247&r2=1087256&rev=1087256&view=diff
==============================================================================
---
incubator/stanbol/trunk/kres/owlapi/src/test/java/org/apache/stanbol/owlapi/RunSingleSPARQLTest.java
(original)
+++
incubator/stanbol/trunk/kres/owl/src/test/java/org/apache/stanbol/owl/RunSingleSPARQLTest.java
Thu Mar 31 11:43:21 2011
@@ -3,14 +3,14 @@
* and open the template in the editor.
*/
-package org.apache.stanbol.owlapi;
+package org.apache.stanbol.owl;
import static org.junit.Assert.*;
import java.io.File;
import java.util.HashMap;
-import org.apache.stanbol.owlapi.RunSingleSPARQL;
+import org.apache.stanbol.owl.RunSingleSPARQL;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
Copied:
incubator/stanbol/trunk/kres/owl/src/test/java/org/apache/stanbol/owl/trasformation/ConversionTester.java
(from r1087247,
incubator/stanbol/trunk/kres/owlapi/src/test/java/org/apache/stanbol/owlapi/trasformation/ConversionTester.java)
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/owl/src/test/java/org/apache/stanbol/owl/trasformation/ConversionTester.java?p2=incubator/stanbol/trunk/kres/owl/src/test/java/org/apache/stanbol/owl/trasformation/ConversionTester.java&p1=incubator/stanbol/trunk/kres/owlapi/src/test/java/org/apache/stanbol/owlapi/trasformation/ConversionTester.java&r1=1087247&r2=1087256&rev=1087256&view=diff
==============================================================================
---
incubator/stanbol/trunk/kres/owlapi/src/test/java/org/apache/stanbol/owlapi/trasformation/ConversionTester.java
(original)
+++
incubator/stanbol/trunk/kres/owl/src/test/java/org/apache/stanbol/owl/trasformation/ConversionTester.java
Thu Mar 31 11:43:21 2011
@@ -3,13 +3,13 @@
* and open the template in the editor.
*/
-package org.apache.stanbol.owlapi.trasformation;
+package org.apache.stanbol.owl.trasformation;
/**
*
* @author elvio
*/
-import org.apache.stanbol.owlapi.trasformation.JenaToOwlConvert;
+import org.apache.stanbol.owl.trasformation.JenaToOwlConvert;
import com.hp.hpl.jena.ontology.AnnotationProperty;
import com.hp.hpl.jena.rdf.model.StmtIterator;
import java.net.URI;
