Author: rwesten
Date: Wed Aug 26 13:13:00 2015
New Revision: 1697924
URL: http://svn.apache.org/r1697924
Log:
merged implementation of STANBOL-1439 to trunk. Also needed to adapt some pom
files of web modules because jettison was no longer available as transitive
dependency.
Added:
stanbol/trunk/commons/jsonld/src/main/java/org/apache/stanbol/commons/jsonld/clerezza/
- copied from r1697898,
stanbol/branches/release-0.12/commons/jsonld/src/main/java/org/apache/stanbol/commons/jsonld/clerezza/
stanbol/trunk/commons/jsonld/src/main/resources/
- copied from r1697898,
stanbol/branches/release-0.12/commons/jsonld/src/main/resources/
Removed:
stanbol/trunk/commons/jsonld/src/main/java/org/apache/stanbol/commons/jsonld/JsonComparator.java
stanbol/trunk/commons/jsonld/src/main/java/org/apache/stanbol/commons/jsonld/JsonLd.java
stanbol/trunk/commons/jsonld/src/main/java/org/apache/stanbol/commons/jsonld/JsonLdCommon.java
stanbol/trunk/commons/jsonld/src/main/java/org/apache/stanbol/commons/jsonld/JsonLdIRI.java
stanbol/trunk/commons/jsonld/src/main/java/org/apache/stanbol/commons/jsonld/JsonLdParser.java
stanbol/trunk/commons/jsonld/src/main/java/org/apache/stanbol/commons/jsonld/JsonLdParserCommon.java
stanbol/trunk/commons/jsonld/src/main/java/org/apache/stanbol/commons/jsonld/JsonLdProfile.java
stanbol/trunk/commons/jsonld/src/main/java/org/apache/stanbol/commons/jsonld/JsonLdProfileParser.java
stanbol/trunk/commons/jsonld/src/main/java/org/apache/stanbol/commons/jsonld/JsonLdProperty.java
stanbol/trunk/commons/jsonld/src/main/java/org/apache/stanbol/commons/jsonld/JsonLdPropertyValue.java
stanbol/trunk/commons/jsonld/src/main/java/org/apache/stanbol/commons/jsonld/JsonLdResource.java
stanbol/trunk/commons/jsonld/src/main/java/org/apache/stanbol/commons/jsonld/JsonSerializer.java
stanbol/trunk/commons/jsonld/src/main/java/org/apache/stanbol/commons/jsonld/ShorteningException.java
stanbol/trunk/commons/jsonld/src/test/java/eu/
stanbol/trunk/commons/jsonld/src/test/java/org/
stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/writers/JsonLdSerializerProvider.java
stanbol/trunk/commons/web/base/src/test/java/org/apache/stanbol/commons/web/base/writers/
Modified:
stanbol/trunk/ (props changed)
stanbol/trunk/commons/ (props changed)
stanbol/trunk/commons/jsonld/pom.xml
stanbol/trunk/commons/pom.xml
stanbol/trunk/commons/web/base/pom.xml
stanbol/trunk/enhancer/ (props changed)
stanbol/trunk/enhancer/jersey/pom.xml
stanbol/trunk/enhancer/jersey/src/main/resources/templates/imports/enhancerweb.ftl
stanbol/trunk/enhancer/jersey/src/test/java/org/apache/stanbol/enhancer/jersey/ContentItemReaderWriterTest.java
stanbol/trunk/entityhub/ (props changed)
stanbol/trunk/entityhub/jersey/pom.xml
stanbol/trunk/integration-tests/ (props changed)
stanbol/trunk/integration-tests/pom.xml
stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/commons/httpqueryheaders/it/HttpQueryHeaderPostTest.java
stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/DefaultChainTest.java
stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/MultipartRequestTest.java
stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/entityhub/it/ldpath/DbpediaLDPathTest.java
stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
stanbol/trunk/parent/pom.xml
stanbol/trunk/rules/web/pom.xml
Propchange: stanbol/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 26 13:13:00 2015
@@ -1 +1 @@
-/stanbol/branches/release-0.12:1571146,1571150,1572559,1572583,1572586,1572588,1572944,1573918,1573936,1574911,1577150,1581735,1581830,1587573,1587824,1587844,1587860,1588447,1588449,1589341,1590930,1593490,1593899,1594122,1594490,1595157-1595158,1596518,1597063,1597561,1597575,1597760,1598019,1599433,1599973,1604752,1608340,1608360,1609451,1617239,1624001,1626979,1633539,1635413,1638045,1674012,1675556
+/stanbol/branches/release-0.12:1571146,1571150,1572559,1572583,1572586,1572588,1572944,1573918,1573936,1574911,1577150,1581735,1581830,1587573,1587824,1587844,1587860,1588447,1588449,1589341,1590930,1593490,1593899,1594122,1594490,1595157-1595158,1596518,1597063,1597561,1597575,1597760,1598019,1599433,1599973,1604752,1608340,1608360,1609451,1617239,1624001,1626979,1633539,1635413,1638045,1674012,1675556,1689331,1691353,1697898
Propchange: stanbol/trunk/commons/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 26 13:13:00 2015
@@ -1,2 +1,2 @@
-/stanbol/branches/release-0.12/commons:1572583,1572588,1589341,1595158,1596518,1597561,1598019,1599433,1599973,1626979
+/stanbol/branches/release-0.12/commons:1572583,1572588,1589341,1595158,1596518,1597561,1598019,1599433,1599973,1626979,1691353,1697898
/stanbol/trunk/commons:1487448-1496831
Modified: stanbol/trunk/commons/jsonld/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/jsonld/pom.xml?rev=1697924&r1=1697923&r2=1697924&view=diff
==============================================================================
--- stanbol/trunk/commons/jsonld/pom.xml (original)
+++ stanbol/trunk/commons/jsonld/pom.xml Wed Aug 26 13:13:00 2015
@@ -56,25 +56,38 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Export-Package></Export-Package>
<Import-Package>
- org.apache.stanbol.commons.jsonld.*,
*
</Import-Package>
- <Export-Package>
- org.apache.stanbol.commons.jsonld.*;version=${project.version}
- </Export-Package>
+ <Private-Package>
+
org.apache.stanbol.commons.jsonld.clerezza;version=${project.version}
+ </Private-Package>
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+
</plugins>
</build>
<dependencies>
<dependency>
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
+ <groupId>com.github.jsonld-java</groupId>
+ <artifactId>jsonld-java-clerezza</artifactId>
+ <version>0.6.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>rdf.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
-
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
Modified: stanbol/trunk/commons/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/pom.xml?rev=1697924&r1=1697923&r2=1697924&view=diff
==============================================================================
--- stanbol/trunk/commons/pom.xml (original)
+++ stanbol/trunk/commons/pom.xml Wed Aug 26 13:13:00 2015
@@ -113,7 +113,10 @@
<!-- Apache Clerezza utils and extensions-->
<module>indexedgraph</module>
- <module>jsonld</module> <!-- JSON-LD implementation for Stanbol (outdated)
-->
+ <!-- JSON-LD serializer/parser provider for Clerezza
+ (should move to
https://github.com/jsonld-java/jsonld-java/tree/master/integration/clerezza)
+ -->
+ <module>jsonld</module>
<module>ldpath/clerezza</module>
<module>launchpad</module>
Modified: stanbol/trunk/commons/web/base/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/web/base/pom.xml?rev=1697924&r1=1697923&r2=1697924&view=diff
==============================================================================
--- stanbol/trunk/commons/web/base/pom.xml (original)
+++ stanbol/trunk/commons/web/base/pom.xml Wed Aug 26 13:13:00 2015
@@ -87,12 +87,6 @@
</build>
<dependencies>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.jsonld</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
-
<!-- Clerezza dependencies -->
<dependency>
<groupId>org.apache.clerezza</groupId>
Propchange: stanbol/trunk/enhancer/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 26 13:13:00 2015
@@ -1,5 +1,5 @@
/incubator/stanbol/branches/dbpedia-spotlight-engines:1374978-1386535
/incubator/stanbol/branches/stanbol-nlp-processing/enhancer:1386989-1388016
-/stanbol/branches/release-0.12/enhancer:1571146,1571150,1572586,1572588,1587573,1587860,1588449,1593490,1593899,1594490,1596518,1597575,1604752,1608340,1608360,1624001,1626979,1633539,1638045,1675556
+/stanbol/branches/release-0.12/enhancer:1571146,1571150,1572586,1572588,1587573,1587860,1588449,1593490,1593899,1594490,1596518,1597575,1604752,1608340,1608360,1624001,1626979,1633539,1638045,1675556,1697898
/stanbol/branches/stanbol-nlp-processing/enhancer:1388017-1413353
/stanbol/branches/stanbol-solr4/enhancer:1455112-1458685
Modified: stanbol/trunk/enhancer/jersey/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/pom.xml?rev=1697924&r1=1697923&r2=1697924&view=diff
==============================================================================
--- stanbol/trunk/enhancer/jersey/pom.xml (original)
+++ stanbol/trunk/enhancer/jersey/pom.xml Wed Aug 26 13:13:00 2015
@@ -187,6 +187,11 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
+ <!-- Json lib used for serializers -->
+ <dependency>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ </dependency>
<!-- for tests -->
Modified:
stanbol/trunk/enhancer/jersey/src/main/resources/templates/imports/enhancerweb.ftl
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/src/main/resources/templates/imports/enhancerweb.ftl?rev=1697924&r1=1697923&r2=1697924&view=diff
==============================================================================
---
stanbol/trunk/enhancer/jersey/src/main/resources/templates/imports/enhancerweb.ftl
(original)
+++
stanbol/trunk/enhancer/jersey/src/main/resources/templates/imports/enhancerweb.ftl
Wed Aug 26 13:13:00 2015
@@ -92,7 +92,7 @@ $(".enginelisting p").click(function ()
<p><textarea rows="15" name="content"></textarea></p>
<p class="submitButtons">Output format:
<select name="format">
- <option value="application/json">JSON-LD</option>
+ <option value="application/ld+json">JSON-LD</option>
<option value="application/rdf+xml">RDF/XML</option>
<option value="application/rdf+json">RDF/JSON</option>
<option value="text/turtle">Turtle</option>
Modified:
stanbol/trunk/enhancer/jersey/src/test/java/org/apache/stanbol/enhancer/jersey/ContentItemReaderWriterTest.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/src/test/java/org/apache/stanbol/enhancer/jersey/ContentItemReaderWriterTest.java?rev=1697924&r1=1697923&r2=1697924&view=diff
==============================================================================
---
stanbol/trunk/enhancer/jersey/src/test/java/org/apache/stanbol/enhancer/jersey/ContentItemReaderWriterTest.java
(original)
+++
stanbol/trunk/enhancer/jersey/src/test/java/org/apache/stanbol/enhancer/jersey/ContentItemReaderWriterTest.java
Wed Aug 26 13:13:00 2015
@@ -60,7 +60,6 @@ import org.apache.clerezza.rdf.core.seri
import org.apache.clerezza.rdf.core.serializedform.Serializer;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.commons.io.IOUtils;
-import org.apache.stanbol.commons.web.base.writers.JsonLdSerializerProvider;
import
org.apache.stanbol.enhancer.contentitem.inmemory.InMemoryContentItemFactory;
import org.apache.stanbol.enhancer.jersey.reader.ContentItemReader;
import org.apache.stanbol.enhancer.jersey.writers.ContentItemWriter;
Propchange: stanbol/trunk/entityhub/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 26 13:13:00 2015
@@ -1,3 +1,3 @@
-/stanbol/branches/release-0.12/entityhub:1572588,1581735,1587824,1587844,1595157-1595158,1599973,1626979,1635413
+/stanbol/branches/release-0.12/entityhub:1572588,1581735,1587824,1587844,1595157-1595158,1599973,1626979,1635413,1689331
/stanbol/branches/stanbol-solr4/entityhub:1455112-1458685
/stanbol/trunk/entityhub:1494993-1533392
Modified: stanbol/trunk/entityhub/jersey/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/entityhub/jersey/pom.xml?rev=1697924&r1=1697923&r2=1697924&view=diff
==============================================================================
--- stanbol/trunk/entityhub/jersey/pom.xml (original)
+++ stanbol/trunk/entityhub/jersey/pom.xml Wed Aug 26 13:13:00 2015
@@ -133,7 +133,11 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
-
+ <!-- Json lib used for serializers -->
+ <dependency>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ </dependency>
<!-- jersey-multipart now uses an other lib to read multipart/mime
however the MessagebodyReaderUtils still use this lib -->
<dependency>
Propchange: stanbol/trunk/integration-tests/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 26 13:13:00 2015
@@ -1,2 +1,2 @@
-/stanbol/branches/release-0.12/integration-tests:1587573,1594122
+/stanbol/branches/release-0.12/integration-tests:1587573,1594122,1697898
/stanbol/branches/stanbol-solr4/integration-tests:1455112-1458685
Modified: stanbol/trunk/integration-tests/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/integration-tests/pom.xml?rev=1697924&r1=1697923&r2=1697924&view=diff
==============================================================================
--- stanbol/trunk/integration-tests/pom.xml (original)
+++ stanbol/trunk/integration-tests/pom.xml Wed Aug 26 13:13:00 2015
@@ -112,8 +112,9 @@
<server.ready.timeout.seconds>180</server.ready.timeout.seconds>
<server.ready.path.1>/:stanbol.css</server.ready.path.1>
<server.ready.path.2>/enhancer:Stateless REST
analysis:Accept:text/html</server.ready.path.2>
- <!-- server.ready.path.3>/contenthub:Recently uploaded Content
Items</server.ready.path.3>
- <server.ready.path.4>/entityhub:The RESTful API of the
Entityhub</server.ready.path.4>
+ <server.ready.path.3>/entityhub:The RESTful API of the
Entityhub</server.ready.path.3>
+ <!-- comment the following paths to use the integration test with
the stable launcher
+ <server.ready.path.4>/contenthub:Recently uploaded Content
Items</server.ready.path.4>
<server.ready.path.5>/ontonet:Apache Stanbol
OntoNet:Accept:text/html</server.ready.path.5>
<server.ready.path.6>/reasoners:The Stanbol Reasoners
provides</server.ready.path.6> -->
</systemPropertyVariables>
Modified:
stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/commons/httpqueryheaders/it/HttpQueryHeaderPostTest.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/commons/httpqueryheaders/it/HttpQueryHeaderPostTest.java?rev=1697924&r1=1697923&r2=1697924&view=diff
==============================================================================
---
stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/commons/httpqueryheaders/it/HttpQueryHeaderPostTest.java
(original)
+++
stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/commons/httpqueryheaders/it/HttpQueryHeaderPostTest.java
Wed Aug 26 13:13:00 2015
@@ -69,8 +69,11 @@ public class HttpQueryHeaderPostTest ext
.assertStatus(200)
//check for JSON-LD (the default content type
.assertContentType("application/ld+json")
- .assertContentRegexp("entity-reference\":
\"http://dbpedia.org/resource/London\"";,
- "creator\":
\"org.apache.stanbol.enhancer.engines.langdetect.LanguageDetectionEnhancementEngine\"",
- "creator\":
\"org.apache.stanbol.enhancer.engines.entitytagging.impl.NamedEntityTaggingEngine\"");
+ .assertContentContains(
+ "\"http://fise.iks-project.eu/ontology/entity-reference\"; : [ {",
+ "\"@id\" : \"http://dbpedia.org/resource/London\"";,
+ "\"http://purl.org/dc/terms/creator\"; : [ {",
+ "\"@value\" :
\"org.apache.stanbol.enhancer.engines.langdetect.LanguageDetectionEnhancementEngine\"",
+ "\"@value\" :
\"org.apache.stanbol.enhancer.engines.entitytagging.impl.NamedEntityTaggingEngine\"");
}
}
Modified:
stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/DefaultChainTest.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/DefaultChainTest.java?rev=1697924&r1=1697923&r2=1697924&view=diff
==============================================================================
---
stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/DefaultChainTest.java
(original)
+++
stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/DefaultChainTest.java
Wed Aug 26 13:13:00 2015
@@ -36,9 +36,9 @@ public class DefaultChainTest extends En
* Expected content-type, Expected regexp
*/
public final static String [] ACCEPT_FORMAT_TEST_DATA = new String[] {
- "application/json",
- "application/json", //now JSON LD uses application/json
- "\"creator\":
\"org.apache.stanbol.enhancer.engines.langdetect.LanguageDetectionEnhancementEngine\",",
+ "application/ld+json",
+ "application/ld+json", //now JSON LD uses application/ld+json
+ "\"@value\" :
\"org.apache.stanbol.enhancer.engines.langdetect.LanguageDetectionEnhancementEngine\"",
"application/rdf+xml",
"application/rdf+xml",
Modified:
stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/MultipartRequestTest.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/MultipartRequestTest.java?rev=1697924&r1=1697923&r2=1697924&view=diff
==============================================================================
---
stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/MultipartRequestTest.java
(original)
+++
stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/MultipartRequestTest.java
Wed Aug 26 13:13:00 2015
@@ -113,9 +113,10 @@ public class MultipartRequestTest extend
//This is basically testing backward compatibility
String[] jsonLDMetadataTests = new String[]{
- "\"@id\": \"http://dbpedia.org/resource/Paris\",";,
- "\"@id\": \"http://dbpedia.org/resource/Bob_Marley\",";,
- "\"dc:creator\":
\"org.apache.stanbol.enhancer.engines.entitytagging.impl.NamedEntityTaggingEngine\","
+ "\"@id\" : \"http://dbpedia.org/resource/Paris\",";,
+ "\"@id\" : \"http://dbpedia.org/resource/Bob_Marley\",";,
+ "\"http://purl.org/dc/terms/creator\"; : [ {",
+ "\"@value\" :
\"org.apache.stanbol.enhancer.engines.entitytagging.impl.NamedEntityTaggingEngine\""
};
String[] params = new String []{
"outputContent","text/plain"
@@ -127,7 +128,7 @@ public class MultipartRequestTest extend
.withContent(HTML_CONTENT)
)
.assertStatus(200) //metadata as JSONLD
- .assertContentRegexp(jsonLDMetadataTests);
+ .assertContentContains(jsonLDMetadataTests);
params = new String []{
"outputContent","application/octet-stream"}; //omitMetadata=false
@@ -138,7 +139,7 @@ public class MultipartRequestTest extend
.withContent(HTML_CONTENT)
)
.assertStatus(200) //metadata as JSONLD
- .assertContentRegexp(jsonLDMetadataTests);
+ .assertContentContains(jsonLDMetadataTests);
params = new String []{
"outputContent","application/octet-stream"}; //omitMetadata=false
@@ -149,7 +150,7 @@ public class MultipartRequestTest extend
.withContent(HTML_CONTENT)
)
.assertStatus(200) //metadata as JSONLD
- .assertContentRegexp(jsonLDMetadataTests);
+ .assertContentContains(jsonLDMetadataTests);
}
@Test
Modified:
stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/entityhub/it/ldpath/DbpediaLDPathTest.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/entityhub/it/ldpath/DbpediaLDPathTest.java?rev=1697924&r1=1697923&r2=1697924&view=diff
==============================================================================
---
stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/entityhub/it/ldpath/DbpediaLDPathTest.java
(original)
+++
stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/entityhub/it/ldpath/DbpediaLDPathTest.java
Wed Aug 26 13:13:00 2015
@@ -145,10 +145,10 @@ public class DbpediaLDPathTest extends E
)
.assertStatus(200)
.assertContentContains(
- "\"@id\": \"http://dbpedia.org/resource/London\"";,
- "\"@value\": \"London\"",
- "\"@id\": \"http://dbpedia.org/resource/Paris\"";,
- "\"@value\": \"Paris\"");
+ "\"@id\" : \"http://dbpedia.org/resource/London\"";,
+ "\"@value\" : \"London\"",
+ "\"@id\" : \"http://dbpedia.org/resource/Paris\"";,
+ "\"@value\" : \"Paris\"");
}
@Test
public void testUnknownContext() throws IOException {
@@ -160,7 +160,7 @@ public class DbpediaLDPathTest extends E
"ldpath","name = rdfs:label[@en] :: xsd:string;")
)
.assertStatus(200)
- .assertContentContains("{","}");
+ .assertContentContains("[","]");
}
@Test
public void testLDPath() throws IOException {
@@ -181,16 +181,18 @@ public class DbpediaLDPathTest extends E
.assertStatus(200)
.assertContentType("application/json")
.assertContentContains(
- "\"@id\": \"http://dbpedia.org/resource/Paris\"";,
- "\"comment\": {",
+ "\"@id\" : \"http://dbpedia.org/resource/Paris\"";,
+ "\"comment\" : [ {",
"Paris is the capital and largest city of France.",
- "\"homepage\": \"http://www.paris.fr/\"";,
- "\"labels\": [",
- "\"@value\": \"Parigi\"",
- "\"@value\": \"å·´é»\"",
- "\"location\": \"[48.8567,2.3508]\"",
- "\"name\": {",
- "\"@value\": \"Paris\""
+ "\"homepage\" : [ {",
+ "\"@id\" : \"http://www.paris.fr/\"";,
+ "\"labels\" : [ {",
+ "\"@value\" : \"Parigi\"",
+ "\"@value\" : \"å·´é»\"",
+ "\"location\" : [ {",
+ "\"@value\" : \"[48.8567,2.3508]\"",
+ "\"name\" : [ {",
+ "\"@value\" : \"Paris\""
);
}
/*
Modified:
stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml?rev=1697924&r1=1697923&r2=1697924&view=diff
==============================================================================
---
stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
(original)
+++
stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
Wed Aug 26 13:13:00 2015
@@ -223,6 +223,21 @@
<artifactId>jackson-jaxrs</artifactId>
<version>1.9.13</version>
</bundle>
+ <bundle> <!-- e.g. required by the JSON-LD serializer -->
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson2-version}</version>
+ </bundle>
+ <bundle> <!-- e.g. required by the JSON-LD serializer -->
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson2-version}</version>
+ </bundle>
+ <bundle>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson2-version}</version>
+ </bundle>
<!-- Velocity -->
<!-- only used by Enhancer Benchmarking
(org.apache.stanbol.enhancer.benchmark) -->
<bundle>
@@ -449,11 +464,22 @@
<version>1.0.0-SNAPSHOT</version>
</bundle>
<!-- support for JSON-LD -->
- <bundle>
+ <!-- JSON-LD support for Clerezza -->
+ <bundle> <!-- this for now provides the Parser/Serializer provider for
Clerezza -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.jsonld</artifactId>
<version>1.0.0-SNAPSHOT</version>
</bundle>
+ <bundle> <!-- this will (in a future version replace the above) -->
+ <groupId>com.github.jsonld-java</groupId>
+ <artifactId>jsonld-java-clerezza</artifactId>
+ <version>0.6.0</version>
+ </bundle>
+ <bundle> <!-- core jsonld library used by jena, sesame and now clerezza -->
+ <groupId>com.github.jsonld-java</groupId>
+ <artifactId>jsonld-java</artifactId>
+ <version>0.6.0</version>
+ </bundle>
<!-- Support for Jobs -->
<bundle>
<groupId>org.apache.stanbol</groupId>
Modified: stanbol/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/parent/pom.xml?rev=1697924&r1=1697923&r2=1697924&view=diff
==============================================================================
--- stanbol/trunk/parent/pom.xml (original)
+++ stanbol/trunk/parent/pom.xml Wed Aug 26 13:13:00 2015
@@ -62,7 +62,7 @@
<!-- commons lib versions -->
<httpcomponents-version>4.4.1</httpcomponents-version>
<jackson-version>1.9.13</jackson-version>
- <jackson2-version>2.5.3</jackson2-version>
+ <jackson2-version>2.6.1</jackson2-version>
<owlapi-version>3.3</owlapi-version>
<!-- sesame and marmotta versions -->
@@ -1074,7 +1074,7 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-tdb</artifactId>
- <version>1.0.1</version>
+ <version>1.0.2</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza.ext</groupId>
@@ -1085,7 +1085,7 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-arq</artifactId>
- <version>2.11.1</version>
+ <version>2.11.2</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza.ext</groupId>
@@ -1096,7 +1096,7 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-iri</artifactId>
- <version>1.0.1</version>
+ <version>1.0.2</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza.ext</groupId>
Modified: stanbol/trunk/rules/web/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/rules/web/pom.xml?rev=1697924&r1=1697923&r2=1697924&view=diff
==============================================================================
--- stanbol/trunk/rules/web/pom.xml (original)
+++ stanbol/trunk/rules/web/pom.xml Wed Aug 26 13:13:00 2015
@@ -141,6 +141,13 @@
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
+
+ <!-- Json lib used for serializers -->
+ <dependency>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ </dependency>
+
<!--
<dependency>
<groupId>com.sun.jersey</groupId>
