You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by rw...@apache.org on 2011/06/15 16:15:13 UTC
svn commit: r1136059 [4/4] - in /incubator/stanbol/trunk: commons/web/base/
commons/web/home/ commons/web/ontology/ commons/web/sparql/ contenthub/web/
contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resource/
data/sites/dbpedia/src/main...
Modified: incubator/stanbol/trunk/entityhub/site/linkeddata/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/site/linkeddata/pom.xml?rev=1136059&r1=1136058&r2=1136059&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/site/linkeddata/pom.xml (original)
+++ incubator/stanbol/trunk/entityhub/site/linkeddata/pom.xml Wed Jun 15 14:15:10 2011
@@ -104,8 +104,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: incubator/stanbol/trunk/entityhub/yard/clerezza/src/main/java/org/apache/stanbol/entityhub/yard/clerezza/impl/ClerezzaYard.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/yard/clerezza/src/main/java/org/apache/stanbol/entityhub/yard/clerezza/impl/ClerezzaYard.java?rev=1136059&r1=1136058&r2=1136059&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/yard/clerezza/src/main/java/org/apache/stanbol/entityhub/yard/clerezza/impl/ClerezzaYard.java (original)
+++ incubator/stanbol/trunk/entityhub/yard/clerezza/src/main/java/org/apache/stanbol/entityhub/yard/clerezza/impl/ClerezzaYard.java Wed Jun 15 14:15:10 2011
@@ -85,19 +85,12 @@ import org.slf4j.LoggerFactory;
*
*/
@Component(
- //name="org.apache.stanbol.entityhub.yard.clerezzaYard",
- //factory="org.apache.stanbol.entityhub.yard.clerezzaYardFactory",
configurationFactory=true,
policy=ConfigurationPolicy.REQUIRE, //the ID is required!
specVersion="1.1",
metatype = true
)
@Service
-//@Properties(value={
-// @Property(name=Yard.ID,value="entityhubYard"),
-// @Property(name=Yard.NAME,value="Entityhub Yard"),
-// @Property(name=Yard.DESCRIPTION,value="Default values for configuring the Entityhub Yard without editing")
-//})
public class ClerezzaYard extends AbstractYard implements Yard {
private static Logger log = LoggerFactory.getLogger(ClerezzaYard.class);
/**
Modified: incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/SolrYard.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/SolrYard.java?rev=1136059&r1=1136058&r2=1136059&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/SolrYard.java (original)
+++ incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/SolrYard.java Wed Jun 15 14:15:10 2011
@@ -120,19 +120,22 @@ import org.slf4j.LoggerFactory;
// required!
specVersion = "1.1")
@Service
-@Properties(value = {
- // TODO: Added propertied from AbstractYard to fix ordering!
- @Property(name = Yard.ID, value = "entityhubYard"),
- @Property(name = Yard.NAME, value = "Entityhub Yard"),
- @Property(name = Yard.DESCRIPTION, value = "The Yard used by the Entityhub to store the data"),
- @Property(name = AbstractYard.DEFAULT_QUERY_RESULT_NUMBER, intValue = -1),
- @Property(name = AbstractYard.MAX_QUERY_RESULT_NUMBER, intValue = -1),
- // BEGIN SolrYard specific Properties
- @Property(name = SolrYard.SOLR_SERVER_LOCATION, value = "entityhub"),
- @Property(name = SolrYard.MULTI_YARD_INDEX_LAYOUT, options = {
- @PropertyOption(name = "true", value = "true"),
- @PropertyOption(name = "false", value = "false")}, value = "false"),
- @Property(name = SolrYard.MAX_BOOLEAN_CLAUSES, intValue = SolrYard.defaultMaxBooleanClauses)})
+@Properties(
+ value = {
+ // TODO: Added propertied from AbstractYard to fix ordering!
+ @Property(name = Yard.ID),
+ @Property(name = Yard.NAME),
+ @Property(name = Yard.DESCRIPTION),
+ @Property(name = AbstractYard.DEFAULT_QUERY_RESULT_NUMBER, intValue = -1),
+ @Property(name = AbstractYard.MAX_QUERY_RESULT_NUMBER, intValue = -1),
+ // BEGIN SolrYard specific Properties
+ @Property(name = SolrYard.SOLR_SERVER_LOCATION),
+ @Property(name = SolrYard.MULTI_YARD_INDEX_LAYOUT,
+ options = {
+ @PropertyOption(name = "true", value = "true"),
+ @PropertyOption(name = "false", value = "false")},
+ value = "false"),
+ @Property(name = SolrYard.MAX_BOOLEAN_CLAUSES, intValue = SolrYard.defaultMaxBooleanClauses)})
public class SolrYard extends AbstractYard implements Yard {
/**
* The key used to configure the URL for the SolrServer
Modified: incubator/stanbol/trunk/launchers/full/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/full/src/main/bundles/list.xml?rev=1136059&r1=1136058&r2=1136059&view=diff
==============================================================================
--- incubator/stanbol/trunk/launchers/full/src/main/bundles/list.xml (original)
+++ incubator/stanbol/trunk/launchers/full/src/main/bundles/list.xml Wed Jun 15 14:15:10 2011
@@ -131,11 +131,12 @@
<artifactId>httpcore-osgi</artifactId>
<version>4.0.1</version>
</bundle>
+ <!-- not a bundle
<bundle>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.1</version>
- </bundle>
+ </bundle> -->
<bundle>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
@@ -168,26 +169,43 @@
<bundle>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
- <version>1.2</version>
+ <version>1.7</version>
</bundle>
</startLevel>
<!-- Jersey -->
<startLevel level="15">
+<!-- is now included and exported by jersey-core
<bundle>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
<version>1.1.1</version>
- </bundle>
+ </bundle> -->
<bundle>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
- <version>1.2</version>
+ <version>1.7</version>
</bundle>
+ <!-- needed to read data from mime multipart requests -->
+ <bundle>
+ <groupId>com.sun.jersey.contribs</groupId>
+ <artifactId>jersey-multipart</artifactId>
+ <version>1.7</version>
+ </bundle>
+ <bundle> <!-- dependency of jersey-multipart -->
+ <groupId>org.jvnet</groupId>
+ <artifactId>mimepull</artifactId>
+ <version>1.4</version>
+ </bundle>
+<!-- <bundle>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4.1</version>
+</bundle> -->
<bundle>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.2</version>
+ <version>1.3</version>
</bundle>
</startLevel>
@@ -365,8 +383,8 @@
<version>0.9-SNAPSHOT</version>
</bundle>
<bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.engines.metaxa</artifactId>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.enhancer.engines.metaxa</artifactId>
<version>0.9-SNAPSHOT</version>
</bundle>
<bundle>
Copied: incubator/stanbol/trunk/launchers/full/src/main/resources/resources/config/org.apache.stanbol.entityhub.site.referencedSite-dbpedia.config (from r1130735, incubator/stanbol/trunk/launchers/full/src/main/resources/resources/config/org.apache.stanbol.entityhub.site.referencedSite-DBpedia.config)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/full/src/main/resources/resources/config/org.apache.stanbol.entityhub.site.referencedSite-dbpedia.config?p2=incubator/stanbol/trunk/launchers/full/src/main/resources/resources/config/org.apache.stanbol.entityhub.site.referencedSite-dbpedia.config&p1=incubator/stanbol/trunk/launchers/full/src/main/resources/resources/config/org.apache.stanbol.entityhub.site.referencedSite-DBpedia.config&r1=1130735&r2=1136059&rev=1136059&view=diff
==============================================================================
--- incubator/stanbol/trunk/launchers/full/src/main/resources/resources/config/org.apache.stanbol.entityhub.site.referencedSite-DBpedia.config (original)
+++ incubator/stanbol/trunk/launchers/full/src/main/resources/resources/config/org.apache.stanbol.entityhub.site.referencedSite-dbpedia.config Wed Jun 15 14:15:10 2011
@@ -6,8 +6,8 @@ org.apache.stanbol.entityhub.site.fieldM
org.apache.stanbol.entityhub.site.dereferencerType="org.apache.stanbol.entityhub.dereferencer.SparqlDereferencer"
org.apache.stanbol.entityhub.site.cacheStrategy="used"
org.apache.stanbol.entityhub.site.cacheId="dbpediaCache"
-org.apache.stanbol.entityhub.site.name="DB\ Pedia"
-org.apache.stanbol.entityhub.site.description="The\ OLD\ Endpoint\ for\ Wikipedia"
+org.apache.stanbol.entityhub.site.name="DBpedia"
+org.apache.stanbol.entityhub.site.description="DBpedia\ (dbpedia.org)\ is \the\ LOD(linked\ open\ data)\ Endpoint\ for\ Wikipedia"
org.apache.stanbol.entityhub.site.queryUri="http://dbpedia.org/sparql"
org.apache.stanbol.entityhub.site.defaultSymbolState="proposed"
org.apache.stanbol.entityhub.site.defaultExpireDuration="0"
Modified: incubator/stanbol/trunk/launchers/stateless/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/stateless/src/main/bundles/list.xml?rev=1136059&r1=1136058&r2=1136059&view=diff
==============================================================================
--- incubator/stanbol/trunk/launchers/stateless/src/main/bundles/list.xml (original)
+++ incubator/stanbol/trunk/launchers/stateless/src/main/bundles/list.xml Wed Jun 15 14:15:10 2011
@@ -118,26 +118,38 @@
<bundle>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
- <version>1.2</version>
+ <version>1.7</version>
</bundle>
</startLevel>
<!-- Jersey -->
<startLevel level="15">
+<!-- is now included and exported by jersey-core
<bundle>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
<version>1.1.1</version>
- </bundle>
+ </bundle> -->
<bundle>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
- <version>1.2</version>
+ <version>1.7</version>
</bundle>
+ <!-- needed to read data from mime multipart requests -->
+ <bundle>
+ <groupId>com.sun.jersey.contribs</groupId>
+ <artifactId>jersey-multipart</artifactId>
+ <version>1.7</version>
+ </bundle>
+ <bundle> <!-- dependency of jersey-multipart -->
+ <groupId>org.jvnet</groupId>
+ <artifactId>mimepull</artifactId>
+ <version>1.4</version>
+ </bundle>
<bundle>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.2</version>
+ <version>1.3</version>
</bundle>
</startLevel>
Modified: incubator/stanbol/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/parent/pom.xml?rev=1136059&r1=1136058&r2=1136059&view=diff
==============================================================================
--- incubator/stanbol/trunk/parent/pom.xml (original)
+++ incubator/stanbol/trunk/parent/pom.xml Wed Jun 15 14:15:10 2011
@@ -36,7 +36,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<stanbol-version>0.9-SNAPSHOT</stanbol-version>
- <jersey-version>1.6</jersey-version>
+ <jersey-version>1.7</jersey-version>
<pax-exam-version>1.2.0</pax-exam-version>
</properties>
@@ -645,6 +645,12 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.sun.jersey.contribs</groupId>
+ <artifactId>jersey-multipart</artifactId>
+ <version>${jersey-version}</version>
+ <scope>provided</scope>
+ </dependency>
<!-- java mail might be usefull for "multipart/form-data" requests/responses -->
<dependency>
<groupId>javax.mail</groupId>
@@ -654,6 +660,7 @@
</dependency>
<!-- JAX-RS JSR311 -->
+<!-- NOTE that JAX-RS is included and exported by jersey-core version > 1.6 -->
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
@@ -687,7 +694,7 @@
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.2</version>
+ <version>1.3</version>
<scope>provided</scope>
</dependency>