svn commit: r1139802 - in /incubator/stanbol/trunk/enhancer/engines/refactor: pom.xml src/main/java/org/apache/stanbol/enhancer/engines/refactor/RefactorEnhancementEngine.java

[rw...@apache.org]

Author: rwesten
Date: Sun Jun 26 14:52:12 2011
New Revision: 1139802

URL: http://svn.apache.org/viewvc?rev=1139802&view=rev
Log:
This resolves STANBOL-214 by updating the refactor engine to the new Entityhub API and removing the unused dependency

Modified:
    incubator/stanbol/trunk/enhancer/engines/refactor/pom.xml
    incubator/stanbol/trunk/enhancer/engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/RefactorEnhancementEngine.java

Modified: incubator/stanbol/trunk/enhancer/engines/refactor/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/refactor/pom.xml?rev=1139802&r1=1139801&r2=1139802&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/refactor/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/engines/refactor/pom.xml Sun Jun 26 14:52:12 2011
@@ -22,8 +22,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-	<groupId>org.apache.stanbol</groupId>
-	<artifactId>stanbol-parent</artifactId>
+    <groupId>org.apache.stanbol</groupId>
+    <artifactId>org.apache.stanbol.enhancer.parent</artifactId>
 	<version>0.9-SNAPSHOT</version>
 	<relativePath>../../parent</relativePath>
   </parent>
@@ -81,7 +81,7 @@
 
   <dependencies>
     <!--  added temporary for the AutotaggingServlet -->
-    <dependency>
+<!--    <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
       <scope>provided</scope>
@@ -90,7 +90,7 @@
 	  <groupId>org.json</groupId>
 	  <artifactId>json</artifactId>
 	  <scope>provided</scope>
-	</dependency>    
+	</dependency>    -->
     <!--  end -->
     
     <!-- Enhancer Sevice API -->

Modified: incubator/stanbol/trunk/enhancer/engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/RefactorEnhancementEngine.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/RefactorEnhancementEngine.java?rev=1139802&r1=1139801&r2=1139802&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/RefactorEnhancementEngine.java (original)
+++ incubator/stanbol/trunk/enhancer/engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/RefactorEnhancementEngine.java Sun Jun 26 14:52:12 2011
@@ -29,8 +29,8 @@ import org.apache.stanbol.enhancer.servi
 import org.apache.stanbol.enhancer.servicesapi.ServiceProperties;
 import org.apache.stanbol.entityhub.model.clerezza.RdfRepresentation;
 import org.apache.stanbol.entityhub.model.clerezza.RdfValueFactory;
+import org.apache.stanbol.entityhub.servicesapi.model.Entity;
 import org.apache.stanbol.entityhub.servicesapi.model.Representation;
-import org.apache.stanbol.entityhub.servicesapi.model.Sign;
 import org.apache.stanbol.entityhub.servicesapi.site.ReferencedSiteManager;
 import org.apache.stanbol.ontologymanager.ontonet.api.DuplicateIDException;
 import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
@@ -44,7 +44,6 @@ import org.apache.stanbol.ontologymanage
 import org.apache.stanbol.ontologymanager.ontonet.api.session.Session;
 import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionManager;
 import org.apache.stanbol.owl.transformation.OWLAPIToClerezzaConverter;
-import org.apache.stanbol.reasoners.base.api.Reasoner;
 import org.apache.stanbol.rules.base.api.NoSuchRecipeException;
 import org.apache.stanbol.rules.base.api.Recipe;
 import org.apache.stanbol.rules.base.api.Rule;
@@ -395,20 +394,14 @@ public class RefactorEnhancementEngine i
 
 			@Override
 			public OWLOntology getRootOntology() {
-
-				InputStream inputStream;
 				try {
 					/*
 					 * The input stream for the dbpedia ontology is obtained
 					 * through the dereferencer component.
 					 */
-					
-					
 					 //inputStream = dereferencer.resolve(uri);
 					 OWLOntologyManager manager = OWLManager.createOWLOntologyManager();
 					 return manager.loadOntologyFromOntologyDocument(IRI.create(uri));
-					 
-					
 					//return getEntityOntology(uri);
 				} catch (Exception e) {
 					log.error("Cannot load the ontology "+uri, e);
@@ -700,7 +693,7 @@ public class RefactorEnhancementEngine i
 		/*
 		 * Ask to the entityhub the fetch the entity.
 		 */
-		Sign entitySign = referencedSiteManager.getSign(entityURI);
+		Entity entitySign = referencedSiteManager.getEntity(entityURI);
 		
 		/*
 		 * Wrap the entity graph into an owl ontology.