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:06:04 UTC
svn commit: r1085381 - in /incubator/stanbol/trunk/kres/ontologymanager/web:
./ src/main/java/org/apache/stanbol/ontologymanager/web/
Author: concelvio
Date: Fri Mar 25 14:06:03 2011
New Revision: 1085381
URL: http://svn.apache.org/viewvc?rev=1085381&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/ontologymanager/web/pom.xml
incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JerseyEndpoint.java
incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMOntResource.java
incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMRootResource.java
incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMScopeOntologyResource.java
incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMScopeResource.java
Modified: incubator/stanbol/trunk/kres/ontologymanager/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/web/pom.xml?rev=1085381&r1=1085380&r2=1085381&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/web/pom.xml (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/web/pom.xml Fri Mar 25 14:06:03 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,8 +23,8 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>stanbol-parent</artifactId>
- <version>0.9-SNAPSHOT</version>
- <relativePath>../../parent</relativePath>
+ <version>${stanbol-version}</version>
+ <relativePath>../../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
@@ -17,11 +33,6 @@
<packaging>bundle</packaging>
<name>Apache Stanbol Ontology Manager Web</name>
- <description>Set of rest services to deal with ontology manager</description>
-
- <properties>
- <kres-version>0.7</kres-version>
- </properties>
<dependencies>
@@ -196,15 +207,6 @@
<version>${pax-exam-version}</version>
<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>
@@ -252,33 +254,6 @@
<version>${stanbol-version}</version>
<scope>provided</scope>
</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>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/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JerseyEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JerseyEndpoint.java?rev=1085381&r1=1085380&r2=1085381&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JerseyEndpoint.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JerseyEndpoint.java Fri Mar 25 14:06:03 2011
@@ -10,7 +10,7 @@ import javax.servlet.ServletException;
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.ontologymanager.ontonet.api.ONManager;
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext;
import org.osgi.service.http.HttpService;
@@ -52,7 +52,7 @@ public class JerseyEndpoint {
HttpService httpService;
@Reference
- KReSONManager onm;
+ ONManager onm;
protected ServletContext servletContext;
@@ -101,7 +101,7 @@ public class JerseyEndpoint {
servletContext = container.getServletContext();
servletContext.setAttribute(BundleContext.class.getName(),
ctx.getBundleContext());
- servletContext.setAttribute(KReSONManager.class.getName(), onm);
+ servletContext.setAttribute(ONManager.class.getName(), onm);
servletContext.setAttribute(STATIC_RESOURCES_URL_ROOT_PROPERTY,
staticUrlRoot);
Modified: incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMOntResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMOntResource.java?rev=1085381&r1=1085380&r2=1085381&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMOntResource.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMOntResource.java Fri Mar 25 14:06:03 2011
@@ -14,9 +14,9 @@ import javax.ws.rs.core.Response;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.rdf.core.serializedform.Serializer;
import org.apache.stanbol.kres.jersey.resource.NavigationMixin;
-import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyIndex;
-import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ONManagerImpl;
import org.apache.stanbol.ontologymanager.ontonet.impl.ontology.OntologyStorage;
import org.coode.owlapi.turtle.TurtleOntologyFormat;
import org.semanticweb.owlapi.apibinding.OWLManager;
@@ -35,9 +35,9 @@ public class ONMOntResource extends Navi
private Logger log = LoggerFactory.getLogger(getClass());
/*
- * 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 OntologyStorage storage;
protected ServletContext servletContext;
@@ -46,7 +46,7 @@ public class ONMOntResource extends Navi
public ONMOntResource(@Context ServletContext servletContext) {
this.servletContext = servletContext;
- this.onm = (KReSONManager) servletContext.getAttribute(KReSONManager.class.getName());
+ this.onm = (ONManager) servletContext.getAttribute(ONManager.class.getName());
// this.storage = (OntologyStorage) servletContext
// .getAttribute(OntologyStorage.class.getName());
// Contingency code for missing components follows.
@@ -57,7 +57,7 @@ public class ONMOntResource extends Navi
if (onm == null) {
log
.warn("No KReSONManager in servlet context. Instantiating manually...");
- onm = new ONManager(new TcManager(), null,
+ onm = new ONManagerImpl(new TcManager(), null,
new Hashtable<String, Object>());
}
this.storage = onm.getOntologyStore();
Modified: incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMRootResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMRootResource.java?rev=1085381&r1=1085380&r2=1085381&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMRootResource.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMRootResource.java Fri Mar 25 14:06:03 2011
@@ -16,10 +16,10 @@ import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
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.api.ontology.OntologyScope;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
-import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ONManagerImpl;
import org.apache.stanbol.ontologymanager.ontonet.impl.ontology.OntologyStorage;
import org.apache.stanbol.ontologymanager.ontonet.impl.renderers.ScopeSetRenderer;
import org.semanticweb.owlapi.model.OWLOntology;
@@ -45,16 +45,16 @@ public class ONMRootResource extends Nav
private Logger log = LoggerFactory.getLogger(getClass());
/*
- * 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 OntologyStorage storage;
protected ServletContext servletContext;
public ONMRootResource(@Context ServletContext servletContext) {
this.servletContext = servletContext;
- this.onm = (KReSONManager) servletContext.getAttribute(KReSONManager.class.getName());
+ this.onm = (ONManager) servletContext.getAttribute(ONManager.class.getName());
// this.storage = (OntologyStorage) servletContext
// .getAttribute(OntologyStorage.class.getName());
// Contingency code for missing components follows.
@@ -65,7 +65,7 @@ public class ONMRootResource extends Nav
if (onm == null) {
log
.warn("No KReSONManager in servlet context. Instantiating manually...");
- onm = new ONManager(new TcManager(), null,
+ onm = new ONManagerImpl(new TcManager(), null,
new Hashtable<String, Object>());
}
this.storage = onm.getOntologyStore();
Modified: incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMScopeOntologyResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMScopeOntologyResource.java?rev=1085381&r1=1085380&r2=1085381&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMScopeOntologyResource.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMScopeOntologyResource.java Fri Mar 25 14:06:03 2011
@@ -20,13 +20,13 @@ 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.api.io.RootOntologySource;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpace;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpaceModificationException;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
-import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ONManagerImpl;
import org.apache.stanbol.ontologymanager.ontonet.impl.ontology.OntologyStorage;
import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.io.RDFXMLOntologyFormat;
@@ -57,16 +57,16 @@ public class ONMScopeOntologyResource ex
private Logger log = LoggerFactory.getLogger(getClass());
/*
- * 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 OntologyStorage storage;
protected ServletContext servletContext;
public ONMScopeOntologyResource(@Context ServletContext servletContext) {
this.servletContext = servletContext;
- this.onm = (KReSONManager) servletContext.getAttribute(KReSONManager.class.getName());
+ this.onm = (ONManager) servletContext.getAttribute(ONManager.class.getName());
// this.storage = (OntologyStorage) servletContext
// .getAttribute(OntologyStorage.class.getName());
// Contingency code for missing components follows.
@@ -77,7 +77,7 @@ public class ONMScopeOntologyResource ex
if (onm == null) {
log
.warn("No KReSONManager in servlet context. Instantiating manually...");
- onm = new ONManager(new TcManager(), null,
+ onm = new ONManagerImpl(new TcManager(), null,
new Hashtable<String, Object>());
}
this.storage = onm.getOntologyStore();
Modified: incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMScopeResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMScopeResource.java?rev=1085381&r1=1085380&r2=1085381&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMScopeResource.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMScopeResource.java Fri Mar 25 14:06:03 2011
@@ -27,7 +27,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.stanbol.ontologymanager.ontonet.api.DuplicateIDException;
-import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
import org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyInputSource;
import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologyIRISource;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
@@ -35,7 +35,7 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpace;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.UnmodifiableOntologySpaceException;
-import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ONManagerImpl;
import org.apache.stanbol.ontologymanager.ontonet.impl.io.OntologyRegistryIRISource;
import org.apache.stanbol.ontologymanager.ontonet.impl.ontology.OntologyStorage;
import org.semanticweb.owlapi.model.IRI;
@@ -53,17 +53,17 @@ public class ONMScopeResource extends Na
private Logger log = LoggerFactory.getLogger(getClass());
/*
- * 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 OntologyStorage storage;
protected ServletContext servletContext;
public ONMScopeResource(@Context ServletContext servletContext) {
this.servletContext = servletContext;
- this.onm = (KReSONManager) servletContext
- .getAttribute(KReSONManager.class.getName());
+ this.onm = (ONManager) servletContext
+ .getAttribute(ONManager.class.getName());
this.storage = (OntologyStorage) servletContext
.getAttribute(OntologyStorage.class.getName());
// this.storage = (OntologyStorage) servletContext
@@ -76,7 +76,7 @@ public class ONMScopeResource extends Na
if (onm == null) {
log
.warn("No KReSONManager in servlet context. Instantiating manually...");
- onm = new ONManager(new TcManager(), null,
+ onm = new ONManagerImpl(new TcManager(), null,
new Hashtable<String, Object>());
}
this.storage = onm.getOntologyStore();