You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by co...@apache.org on 2011/03/25 15:04:30 UTC
svn commit: r1085379 - in /incubator/stanbol/trunk/kres/jersey: ./
src/main/java/org/apache/stanbol/kres/jersey/
src/main/java/org/apache/stanbol/kres/jersey/resource/
src/main/java/org/apache/stanbol/kres/jersey/util/
Author: concelvio
Date: Fri Mar 25 14:04:30 2011
New Revision: 1085379
URL: http://svn.apache.org/viewvc?rev=1085379&view=rev
Log:
STANBOL-39:
- changed parent version in pom.xml to ${stanbol-version}
- removed kres-version from pom.xml
- change class reference where required
Modified:
incubator/stanbol/trunk/kres/jersey/pom.xml
incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/JerseyEndpoint.java
incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/GraphsResource.java
incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/KReSSessionIDResource.java
incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/KReSSessionResource.java
incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/util/OntologyRenderUtils.java
Modified: incubator/stanbol/trunk/kres/jersey/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/jersey/pom.xml?rev=1085379&r1=1085378&r2=1085379&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/jersey/pom.xml (original)
+++ incubator/stanbol/trunk/kres/jersey/pom.xml Fri Mar 25 14:04:30 2011
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<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">
@@ -7,7 +23,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>stanbol-parent</artifactId>
- <version>0.9-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<relativePath>../../parent</relativePath>
</parent>
<artifactId>org.apache.stanbol.kres.jersey</artifactId>
@@ -17,10 +33,6 @@
<name>Apache Stanbol KReS Jersey JAX-RS API and front-end</name>
<description>Set of common classes used to create rest service, kres site and fron-end</description>
- <properties>
- <kres-version>0.7</kres-version>
- </properties>
-
<dependencies>
<!-- dependencies on other IKS modules -->
@@ -196,14 +208,6 @@
<scope>test</scope>
</dependency>
-
- <!-- KReS -->
- <!--
- <dependency> <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.kres.api</artifactId>
- <version>${kres-version}</version> <scope>provided</scope>
- </dependency>
- -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
@@ -236,37 +240,13 @@
<artifactId>org.apache.stanbol.rules.refactor</artifactId>
<version>${stanbol-version}</version>
</dependency>
-
- <!--
- <dependency> <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.kres.manager</artifactId>
- <version>${kres-version}</version> <scope>provided</scope>
- </dependency> <dependency> <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.kres.rules</artifactId>
- <version>${kres-version}</version> <scope>provided</scope>
- </dependency> <dependency> <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.kres.semion.manager</artifactId>
- <version>${kres-version}</version> <scope>provided</scope>
- </dependency> <dependency> <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.kres.semion.refactorer</artifactId>
- <version>${kres-version}</version> <scope>provided</scope>
- </dependency>
- -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.owlapi</artifactId>
<version>${stanbol-version}</version>
<scope>provided</scope>
</dependency>
- <!--
- <dependency> <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.kres.reasoners</artifactId>
- <version>${kres-version}</version> <scope>provided</scope>
- </dependency> <dependency> <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.kres.storage.provider</artifactId>
- <version>${kres-version}</version> <scope>provided</scope>
- </dependency>
- -->
+
<dependency>
<groupId>com.hp.hpl.jena</groupId>
<artifactId>jena</artifactId>
Modified: incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/JerseyEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/JerseyEndpoint.java?rev=1085379&r1=1085378&r2=1085379&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/JerseyEndpoint.java (original)
+++ incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/JerseyEndpoint.java Fri Mar 25 14:04:30 2011
@@ -12,9 +12,9 @@ import org.apache.clerezza.rdf.core.seri
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
-import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
-import org.apache.stanbol.reengineer.base.api.SemionManager;
-import org.apache.stanbol.reengineer.base.api.SemionReengineer;
+import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
+import org.apache.stanbol.reengineer.base.api.ReengineerManager;
+import org.apache.stanbol.reengineer.base.api.Reengineer;
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext;
import org.osgi.service.http.HttpService;
@@ -47,10 +47,10 @@ public class JerseyEndpoint {
public static final String STATIC_RESOURCES_URL_ROOT_PROPERTY = "org.apache.stanbol.kres.jersey.static.url";
@Property(value = "/META-INF/static")
- public static final String STATIC_RESOURCES_CLASSPATH_PROPERTY = "eu.iksproject.kres.jersey.static.classpath";
+ public static final String STATIC_RESOURCES_CLASSPATH_PROPERTY = "org.apache.stanbol.kres.jersey.static.classpath";
@Property(value = "/META-INF/templates")
- public static final String FREEMARKER_TEMPLATE_CLASSPATH_PROPERTY = "eu.iksproject.kres.jersey.templates.classpath";
+ public static final String FREEMARKER_TEMPLATE_CLASSPATH_PROPERTY = "org.apache.stanbol.kres.jersey.templates.classpath";
@Reference
TcManager tcManager;
Modified: incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/GraphsResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/GraphsResource.java?rev=1085379&r1=1085378&r2=1085379&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/GraphsResource.java (original)
+++ incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/GraphsResource.java Fri Mar 25 14:04:30 2011
@@ -20,7 +20,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.clerezza.rdf.core.access.TcManager;
-import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
import org.apache.stanbol.ontologymanager.ontonet.impl.ontology.NoSuchStoreException;
import org.apache.stanbol.ontologymanager.ontonet.impl.ontology.OntologyStorage;
import org.semanticweb.owlapi.apibinding.OWLManager;
@@ -45,7 +45,7 @@ import org.apache.stanbol.kres.jersey.fo
public class GraphsResource extends NavigationMixin {
protected TcManager tcManager;
- protected KReSONManager onManager;
+ protected ONManager onManager;
protected OntologyStorage storage;
private final Logger log = LoggerFactory.getLogger(getClass());
@@ -53,7 +53,7 @@ public class GraphsResource extends Navi
public GraphsResource(@Context ServletContext servletContext) {
storage = (OntologyStorage) (servletContext.getAttribute(OntologyStorage.class.getName()));
tcManager = (TcManager) servletContext.getAttribute(TcManager.class.getName());
- onManager = (KReSONManager) (servletContext.getAttribute(KReSONManager.class.getName()));
+ onManager = (ONManager) (servletContext.getAttribute(ONManager.class.getName()));
if (onManager == null) {
throw new IllegalStateException("OntologyStorage missing in ServletContext");
} else {
Modified: incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/KReSSessionIDResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/KReSSessionIDResource.java?rev=1085379&r1=1085378&r2=1085379&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/KReSSessionIDResource.java (original)
+++ incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/KReSSessionIDResource.java Fri Mar 25 14:04:30 2011
@@ -11,10 +11,10 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import javax.ws.rs.core.Response.Status;
-import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSession;
+import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.Session;
import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSessionManager;
-import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ONManagerImpl;
import org.apache.stanbol.ontologymanager.ontonet.impl.renderers.SessionRenderer;
import org.semanticweb.owlapi.model.IRI;
@@ -22,20 +22,20 @@ import org.semanticweb.owlapi.model.IRI;
public class KReSSessionIDResource extends NavigationMixin {
/*
- * Placeholder for the KReSONManager to be fetched from the servlet context.
+ * Placeholder for the ONManager to be fetched from the servlet context.
*/
- protected KReSONManager onm;
+ protected ONManager onm;
protected ServletContext servletContext;
public KReSSessionIDResource(@Context ServletContext servletContext) {
this.servletContext = servletContext;
- onm = (KReSONManager) this.servletContext
- .getAttribute(KReSONManager.class.getName());
+ onm = (ONManager) this.servletContext
+ .getAttribute(ONManager.class.getName());
if (onm == null) {
System.err
.println("[KReS] :: No KReS Ontology Network Manager provided by Servlet Context. Instantiating now...");
- onm = new ONManager();
+ onm = new ONManagerImpl();
}
}
@@ -45,7 +45,7 @@ public class KReSSessionIDResource exten
@PathParam("id") String sessionId, @Context UriInfo uriInfo,
@Context HttpHeaders headers) {
- KReSSession ses = null;
+ Session ses = null;
KReSSessionManager mgr = onm.getSessionManager();
ses = mgr.getSession(IRI.create(sessionId));
if (ses == null)
Modified: incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/KReSSessionResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/KReSSessionResource.java?rev=1085379&r1=1085378&r2=1085379&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/KReSSessionResource.java (original)
+++ incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/KReSSessionResource.java Fri Mar 25 14:04:30 2011
@@ -21,7 +21,7 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
-import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologyIRISource;
import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologySource;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
@@ -30,9 +30,9 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.SessionOntologySpace;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.UnmodifiableOntologySpaceException;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSession;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.Session;
import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSessionManager;
-import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ONManagerImpl;
import org.apache.stanbol.ontologymanager.ontonet.impl.renderers.SessionRenderer;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntology;
@@ -44,19 +44,19 @@ import org.apache.stanbol.kres.jersey.fo
public class KReSSessionResource extends NavigationMixin {
/*
- * Placeholder for the KReSONManager to be fetched from the servlet context.
+ * Placeholder for the ONManager to be fetched from the servlet context.
*/
- protected KReSONManager onm;
+ protected ONManager onm;
protected ServletContext servletContext;
public KReSSessionResource(@Context ServletContext servletContext) {
this.servletContext = servletContext;
- onm = (KReSONManager) this.servletContext.getAttribute(KReSONManager.class.getName());
+ onm = (ONManager) this.servletContext.getAttribute(ONManager.class.getName());
if (onm == null) {
System.err
.println("[KReS] :: No KReS Ontology Network Manager provided by Servlet Context. Instantiating now...");
- onm = new ONManager();
+ onm = new ONManagerImpl();
}
}
@@ -127,7 +127,7 @@ public class KReSSessionResource extends
@Context UriInfo uriInfo,
@Context HttpHeaders headers) {
- KReSSession ses = null;
+ Session ses = null;
KReSSessionManager mgr = onm.getSessionManager();
/*
Modified: incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/util/OntologyRenderUtils.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/util/OntologyRenderUtils.java?rev=1085379&r1=1085378&r2=1085379&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/util/OntologyRenderUtils.java (original)
+++ incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/util/OntologyRenderUtils.java Fri Mar 25 14:04:30 2011
@@ -3,7 +3,7 @@ package org.apache.stanbol.kres.jersey.u
import java.util.ArrayList;
import java.util.List;
-import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
import org.coode.owlapi.manchesterowlsyntax.ManchesterOWLSyntaxOntologyFormat;
import org.coode.owlapi.turtle.TurtleOntologyFormat;
import org.semanticweb.owlapi.apibinding.OWLManager;
@@ -37,7 +37,7 @@ public class OntologyRenderUtils {
* @throws OWLOntologyStorageException
*/
public static String renderOntology(OWLOntology ont,
- OWLOntologyFormat format, String rewritePrefix, KReSONManager onm)
+ OWLOntologyFormat format, String rewritePrefix, ONManager onm)
throws OWLOntologyStorageException {
OWLOntologyManager tmpmgr = OWLManager.createOWLOntologyManager();
OWLDataFactory df = tmpmgr.getOWLDataFactory();
@@ -87,7 +87,7 @@ public class OntologyRenderUtils {
}
public static String renderOntology(OWLOntology ont, String format,
- String rewritePrefix, KReSONManager onm)
+ String rewritePrefix, ONManager onm)
throws OWLOntologyStorageException {
OWLOntologyManager tmpmgr = OWLManager.createOWLOntologyManager();
OWLDataFactory df = tmpmgr.getOWLDataFactory();