Author: rwesten
Date: Mon Jan 24 09:03:50 2011
New Revision: 1062689
URL: http://svn.apache.org/viewvc?rev=1062689&view=rev
Log:
STANBOL-40 Renaming preparation: Found that the Zemanta was not part of the mvn
build process. Also made a change needed because of an API change in Clerezza
Modified:
incubator/stanbol/trunk/fise/engines/opencalais/ (props changed)
incubator/stanbol/trunk/fise/engines/zemanta/ (props changed)
incubator/stanbol/trunk/fise/engines/zemanta/pom.xml
incubator/stanbol/trunk/fise/engines/zemanta/src/main/java/eu/iksproject/fise/engines/zemanta/impl/ZemantaAPIWrapper.java
incubator/stanbol/trunk/fise/pom.xml
Propchange: incubator/stanbol/trunk/fise/engines/opencalais/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jan 24 09:03:50 2011
@@ -1 +1,7 @@
target
+
+.settings
+
+.classpath
+
+.project
Propchange: incubator/stanbol/trunk/fise/engines/zemanta/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jan 24 09:03:50 2011
@@ -0,0 +1,7 @@
+.settings
+
+target
+
+.project
+
+.classpath
Modified: incubator/stanbol/trunk/fise/engines/zemanta/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/fise/engines/zemanta/pom.xml?rev=1062689&r1=1062688&r2=1062689&view=diff
==============================================================================
--- incubator/stanbol/trunk/fise/engines/zemanta/pom.xml (original)
+++ incubator/stanbol/trunk/fise/engines/zemanta/pom.xml Mon Jan 24 09:03:50
2011
@@ -35,30 +35,25 @@
<dependency>
<groupId>eu.iksproject</groupId>
<artifactId>eu.iksproject.fise.servicesapi</artifactId>
- <version>0.9-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.rdf.core</artifactId>
- <version>0.12-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.rdf.jena.parser</artifactId>
- <version>0.10-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.2.0</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.4</version>
</dependency>
@@ -75,18 +70,15 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.7</version>
- <scope>test</scope>
</dependency>
<dependency><!-- for debugging enhancements -->
<groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.rdf.jena.serializer</artifactId>
- <version>0.9-incubating-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.5.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified:
incubator/stanbol/trunk/fise/engines/zemanta/src/main/java/eu/iksproject/fise/engines/zemanta/impl/ZemantaAPIWrapper.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/fise/engines/zemanta/src/main/java/eu/iksproject/fise/engines/zemanta/impl/ZemantaAPIWrapper.java?rev=1062689&r1=1062688&r2=1062689&view=diff
==============================================================================
---
incubator/stanbol/trunk/fise/engines/zemanta/src/main/java/eu/iksproject/fise/engines/zemanta/impl/ZemantaAPIWrapper.java
(original)
+++
incubator/stanbol/trunk/fise/engines/zemanta/src/main/java/eu/iksproject/fise/engines/zemanta/impl/ZemantaAPIWrapper.java
Mon Jan 24 09:03:50 2011
@@ -12,6 +12,8 @@ import java.util.EnumMap;
import java.util.Map;
import org.apache.clerezza.rdf.core.Graph;
+import org.apache.clerezza.rdf.core.MGraph;
+import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
import org.apache.clerezza.rdf.jena.parser.JenaParserProvider;
import org.slf4j.Logger;
@@ -118,9 +120,10 @@ public class ZemantaAPIWrapper {
private Graph parseResponse(InputStream is) {
JenaParserProvider jenaParserProvider = new JenaParserProvider();
//NOTE(rw): the new third parameter is the base URI used to resolve
relative paths
- Graph g = jenaParserProvider.parse(is, SupportedFormat.RDF_XML,null);
+ MGraph g = new SimpleMGraph();
+ jenaParserProvider.parse(g,is, SupportedFormat.RDF_XML,null);
log.debug("graph: " + g.toString());
- return g;
+ return g.getGraph();
}
}
Modified: incubator/stanbol/trunk/fise/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/fise/pom.xml?rev=1062689&r1=1062688&r2=1062689&view=diff
==============================================================================
--- incubator/stanbol/trunk/fise/pom.xml (original)
+++ incubator/stanbol/trunk/fise/pom.xml Mon Jan 24 09:03:50 2011
@@ -59,6 +59,7 @@
<module>engines/geonames</module>
<module>engines/entitytagging</module><!-- RICK based enhancement
engine(s) -->
<module>engines/opencalais</module>
+ <module>engines/zemanta</module>
<module>jersey</module>
