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 2014/05/12 07:20:36 UTC
svn commit: r1593887 - in /stanbol/trunk: ./
commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/
commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/resource/
enhancement-engines/ enhancer/jersey/src/main/java/org/apa...
Author: rwesten
Date: Mon May 12 05:20:35 2014
New Revision: 1593887
URL: http://svn.apache.org/r1593887
Log:
STANBOL-1296: The SPARQL endpoint no longer uses API deprecated after the clerezza dependency updates; STANBOL-1094: Menue Items of the Enhancer and the Entityhub do now use the OSGI whiteboard pattern; Refine Reconcile Similarity support does no longer use deprecated API of the Entityhub Similarity constraint (related to STANBOL-598); Minor Changes: Organized some import statements; Integration-Tests now do INFO level logging (to avoid a 350MByte+ log file after the tests; Updated commons-compress maven dependency to version 1.8 (prior: 1.6)
Added:
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerMenueItem.java
stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/fragment/EntityhubMenueItem.java
Modified:
stanbol/trunk/ (props changed)
stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/WebFragment.java
stanbol/trunk/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/resource/SparqlEndpointResource.java
stanbol/trunk/enhancement-engines/ (props changed)
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerWebFragment.java
stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/fragment/EntityhubWebFragment.java
stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/EntityhubRootResource.java
stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/SiteManagerRootResource.java
stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/BaseGoogleRefineReconcileResource.java
stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/EntityhubReconcileResource.java
stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/ReferencedSiteReconcileResource.java
stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/SiteManagerReconcileResource.java
stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/utils/LDPathHelper.java
stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/web/writer/EntityWriter.java
stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/web/writer/ModelWriterTracker.java
stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/web/writer/RepresentationWriter.java
stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/web/writer/ResultListWriter.java
stanbol/trunk/integration-tests/pom.xml
stanbol/trunk/parent/pom.xml
Propchange: stanbol/trunk/
------------------------------------------------------------------------------
Merged /stanbol/branches/release-0.12:r1590930
Modified: stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/WebFragment.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/WebFragment.java?rev=1593887&r1=1593886&r2=1593887&view=diff
==============================================================================
--- stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/WebFragment.java (original)
+++ stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/WebFragment.java Mon May 12 05:20:35 2014
@@ -24,7 +24,8 @@ import java.util.Set;
* Interface to be implemented by bundles that want to customize the stanbol web interface and REST API by
* contributing static resources, JAX-RS resources and Freemarker views.
*
- * @deprecated The whiteboard pattern should be used for registering OSGi components and navigations links, Links and ScriptResource should be in the template
+ * @deprecated The whiteboard pattern should be used for registering OSGi components
+ * and navigations links, Links and ScriptResource should be in the template
* TODO: add some kind of ordering information
*/
@Deprecated
Modified: stanbol/trunk/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/resource/SparqlEndpointResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/resource/SparqlEndpointResource.java?rev=1593887&r1=1593886&r2=1593887&view=diff
==============================================================================
--- stanbol/trunk/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/resource/SparqlEndpointResource.java (original)
+++ stanbol/trunk/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/resource/SparqlEndpointResource.java Mon May 12 05:20:35 2014
@@ -38,16 +38,12 @@ import org.apache.clerezza.rdf.core.Trip
import org.apache.clerezza.rdf.core.UriRef;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.rdf.core.sparql.ParseException;
-import org.apache.clerezza.rdf.core.sparql.QueryParser;
-import org.apache.clerezza.rdf.core.sparql.query.ConstructQuery;
-import org.apache.clerezza.rdf.core.sparql.query.DescribeQuery;
-import org.apache.clerezza.rdf.core.sparql.query.Query;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
-import org.apache.stanbol.commons.viewable.Viewable;
+import org.apache.stanbol.commons.web.viewable.Viewable;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
@@ -80,29 +76,6 @@ import org.osgi.framework.ServiceReferen
@Path("/sparql")
public class SparqlEndpointResource extends BaseStanbolResource {
- private static final Comparator<ServiceReference> SERVICE_RANKING_COMPARATOR = new Comparator<ServiceReference>() {
-
- public int compare(ServiceReference ref1, ServiceReference ref2) {
- int r1,r2;
- Object tmp = ref1.getProperty(Constants.SERVICE_RANKING);
- r1 = tmp != null ? ((Integer)tmp).intValue() : 0;
- tmp = ref2.getProperty(Constants.SERVICE_RANKING);
- r2 = tmp != null ? ((Integer)tmp).intValue() : 0;
- if(r1 == r2){
- tmp = ref1.getProperty(Constants.SERVICE_ID);
- long id1 = tmp != null ? ((Long)tmp).longValue() : Long.MAX_VALUE;
- tmp = ref2.getProperty(Constants.SERVICE_ID);
- long id2 = tmp != null ? ((Long)tmp).longValue() : Long.MAX_VALUE;
- //the lowest id must be first -> id1 < id2 -> [id1,id2] -> return -1
- return id1 < id2 ? -1 : id2 == id1 ? 0 : 1;
- } else {
- //the highest ranking MUST BE first -> r1 < r2 -> [r2,r1] -> return 1
- return r1 < r2 ? 1:-1;
- }
- }
-
- };
-
@Reference
protected TcManager tcManager;
@@ -145,23 +118,27 @@ public class SparqlEndpointResource exte
@Produces({TEXT_HTML + ";qs=2", "application/sparql-results+xml", "application/rdf+xml"})
public Response sparql(@QueryParam(value = "graphuri") String graphUri,
@QueryParam(value = "query") String sparqlQuery,
- @Context HttpHeaders headers) throws ParseException, InvalidSyntaxException {
+ @Context HttpHeaders headers) throws InvalidSyntaxException {
if (sparqlQuery == null) {
populateTripleCollectionList(getServices(null));
return Response.ok(new Viewable("index", this), TEXT_HTML).build();
}
-
- Query query = QueryParser.getInstance().parse(sparqlQuery);
+
String mediaType = "application/sparql-results+xml";
- if (query instanceof DescribeQuery || query instanceof ConstructQuery) {
- mediaType = "application/rdf+xml";
- }
TripleCollection tripleCollection = getTripleCollection(graphUri);
ResponseBuilder rb;
if (tripleCollection != null) {
- Object result = tcManager.executeSparqlQuery(query, tripleCollection);
- rb = Response.ok(result, mediaType);
+ Object result;
+ try {
+ result = tcManager.executeSparqlQuery(sparqlQuery, tripleCollection);
+ if (result instanceof TripleCollection) {
+ mediaType = "application/rdf+xml";
+ }
+ rb = Response.ok(result, mediaType);
+ } catch (ParseException e) {
+ rb = Response.status(Status.BAD_REQUEST).entity(e.getMessage());
+ }
} else {
rb = Response.status(Status.NOT_FOUND).entity(
String.format("There is no registered graph with given uri: %s", graphUri));
@@ -179,7 +156,7 @@ public class SparqlEndpointResource exte
@Produces({"application/sparql-results+xml", "application/rdf+xml"})
public Response postSparql(@FormParam("graphuri") String graphUri,
@FormParam("query") String sparqlQuery,
- @Context HttpHeaders headers) throws ParseException, InvalidSyntaxException {
+ @Context HttpHeaders headers) throws InvalidSyntaxException {
return sparql(graphUri, sparqlQuery, headers);
}
@@ -215,7 +192,7 @@ public class SparqlEndpointResource exte
getFilter(graphUri));
if (refs != null) {
if (refs.length > 1) {
- Arrays.sort(refs, SERVICE_RANKING_COMPARATOR);
+ Arrays.sort(refs);
}
for (ServiceReference ref : refs) {
registeredGraphs.put(ref, (TripleCollection) bundleContext.getService(ref));
Propchange: stanbol/trunk/enhancement-engines/
------------------------------------------------------------------------------
Merged /stanbol/branches/release-0.12/enhancement-engines:r1590930
Added: stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerMenueItem.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerMenueItem.java?rev=1593887&view=auto
==============================================================================
--- stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerMenueItem.java (added)
+++ stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerMenueItem.java Mon May 12 05:20:35 2014
@@ -0,0 +1,24 @@
+package org.apache.stanbol.enhancer.jersey.fragment;
+
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Service;
+import org.apache.stanbol.commons.web.base.NavigationLink;
+
+/**
+ * The menue item for the Stanbol Enhancer component
+ */
+@Component
+@Service(value=NavigationLink.class)
+public class EnhancerMenueItem extends NavigationLink {
+
+ private static final String htmlDescription =
+ "This is a <strong>stateless interface</strong> to allow clients to submit"+
+ "content to <strong>analyze</strong> by the <code>EnhancementEngine</code>s"+
+ "and get the resulting <strong>RDF enhancements</strong> at once without"+
+ "storing anything on the server-side.";
+
+ public EnhancerMenueItem() {
+ super("enhancer", "/enhancer", htmlDescription, 10);
+ }
+
+}
Modified: stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerWebFragment.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerWebFragment.java?rev=1593887&r1=1593886&r2=1593887&view=diff
==============================================================================
--- stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerWebFragment.java (original)
+++ stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerWebFragment.java Mon May 12 05:20:35 2014
@@ -94,9 +94,7 @@ public class EnhancerWebFragment impleme
@Override
public List<NavigationLink> getNavigationLinks() {
- List<NavigationLink> links = new ArrayList<NavigationLink>();
- links.add(new NavigationLink("enhancer", "/enhancer", htmlDescription, 10));
- return links;
+ return Collections.emptyList();
}
}
Added: stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/fragment/EntityhubMenueItem.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/fragment/EntityhubMenueItem.java?rev=1593887&view=auto
==============================================================================
--- stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/fragment/EntityhubMenueItem.java (added)
+++ stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/fragment/EntityhubMenueItem.java Mon May 12 05:20:35 2014
@@ -0,0 +1,24 @@
+package org.apache.stanbol.entityhub.jersey.fragment;
+
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Service;
+import org.apache.stanbol.commons.web.base.NavigationLink;
+/**
+ * The {@link NavigationLink} to the Entityhub component
+ */
+@Component
+@Service(value=NavigationLink.class)
+public class EntityhubMenueItem extends NavigationLink {
+ private static final String htmlDescription =
+ "The <strong>Entityhub</strong> componnet allows users to manage "
+ + "knowledge of the domain of interest. <strong>Referenced Sites"
+ + "</strong> allow to refer remote datasets and/or to provide fast "
+ + "local indexes for such datasets (e.g. as needed for entity linking "
+ + "with the Stanbol Enhancer. <strong>Managed Sites</strong> provide "
+ + "a full CRUD interface for managing data sets.";
+
+ public EntityhubMenueItem() {
+ super("entityhub", "/entityhub",htmlDescription,30);
+ }
+
+}
Modified: stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/fragment/EntityhubWebFragment.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/fragment/EntityhubWebFragment.java?rev=1593887&r1=1593886&r2=1593887&view=diff
==============================================================================
--- stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/fragment/EntityhubWebFragment.java (original)
+++ stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/fragment/EntityhubWebFragment.java Mon May 12 05:20:35 2014
@@ -102,11 +102,7 @@ public class EntityhubWebFragment implem
@Override
public List<NavigationLink> getNavigationLinks() {
- List<NavigationLink> navList = new ArrayList<NavigationLink>();
- navList.add(new NavigationLink("entityhub", "/entityhub",
- "The Entityhub allows to manage controlled vocabularies (e.g. used "
- + "for EntityLinking by the Stanbol Enhancer Component)", 30));
- return navList;
+ return Collections.emptyList();
}
@Override
Modified: stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/EntityhubRootResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/EntityhubRootResource.java?rev=1593887&r1=1593886&r2=1593887&view=diff
==============================================================================
--- stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/EntityhubRootResource.java (original)
+++ stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/EntityhubRootResource.java Mon May 12 05:20:35 2014
@@ -16,11 +16,6 @@
*/
package org.apache.stanbol.entityhub.jersey.resource;
-import static javax.ws.rs.HttpMethod.DELETE;
-import static javax.ws.rs.HttpMethod.GET;
-import static javax.ws.rs.HttpMethod.OPTIONS;
-import static javax.ws.rs.HttpMethod.POST;
-import static javax.ws.rs.HttpMethod.PUT;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
import static javax.ws.rs.core.MediaType.TEXT_HTML;
@@ -51,7 +46,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
-import javax.servlet.ServletContext;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.DefaultValue;
Modified: stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/SiteManagerRootResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/SiteManagerRootResource.java?rev=1593887&r1=1593886&r2=1593887&view=diff
==============================================================================
--- stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/SiteManagerRootResource.java (original)
+++ stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/SiteManagerRootResource.java Mon May 12 05:20:35 2014
@@ -16,9 +16,6 @@
*/
package org.apache.stanbol.entityhub.jersey.resource;
-import static javax.ws.rs.HttpMethod.GET;
-import static javax.ws.rs.HttpMethod.OPTIONS;
-import static javax.ws.rs.HttpMethod.POST;
import static javax.ws.rs.core.MediaType.TEXT_HTML;
import static org.apache.clerezza.rdf.core.serializedform.SupportedFormat.N3;
import static org.apache.clerezza.rdf.core.serializedform.SupportedFormat.N_TRIPLE;
@@ -40,7 +37,6 @@ import java.util.Iterator;
import java.util.Set;
import java.util.TreeSet;
-import javax.servlet.ServletContext;
import javax.ws.rs.Consumes;
import javax.ws.rs.DefaultValue;
import javax.ws.rs.FormParam;
@@ -65,8 +61,8 @@ import org.apache.marmotta.ldpath.model.
import org.apache.stanbol.commons.indexedgraph.IndexedMGraph;
import org.apache.stanbol.commons.namespaceprefix.NamespaceMappingUtils;
import org.apache.stanbol.commons.namespaceprefix.NamespacePrefixService;
-import org.apache.stanbol.commons.viewable.Viewable;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
+import org.apache.stanbol.commons.web.viewable.Viewable;
import org.apache.stanbol.entityhub.core.query.QueryResultListImpl;
import org.apache.stanbol.entityhub.jersey.utils.JerseyUtils;
import org.apache.stanbol.entityhub.ldpath.EntityhubLDPath;
@@ -83,7 +79,6 @@ import org.apache.stanbol.entityhub.serv
import org.codehaus.jettison.json.JSONArray;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
Modified: stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/BaseGoogleRefineReconcileResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/BaseGoogleRefineReconcileResource.java?rev=1593887&r1=1593886&r2=1593887&view=diff
==============================================================================
--- stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/BaseGoogleRefineReconcileResource.java (original)
+++ stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/BaseGoogleRefineReconcileResource.java Mon May 12 05:20:35 2014
@@ -32,7 +32,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
-import javax.servlet.ServletContext;
import javax.ws.rs.FormParam;
import javax.ws.rs.GET;
import javax.ws.rs.OPTIONS;
@@ -45,18 +44,19 @@ import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.ResponseBuilder;
-import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Component;
import org.apache.stanbol.commons.namespaceprefix.NamespaceMappingUtils;
import org.apache.stanbol.commons.namespaceprefix.NamespacePrefixService;
-import org.apache.stanbol.commons.viewable.Viewable;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
import org.apache.stanbol.commons.web.base.utils.MediaTypeUtil;
+import org.apache.stanbol.commons.web.viewable.Viewable;
import org.apache.stanbol.entityhub.jersey.grefine.ReconcileProperty;
import org.apache.stanbol.entityhub.jersey.grefine.ReconcileQuery;
import org.apache.stanbol.entityhub.jersey.grefine.ReconcileValue;
import org.apache.stanbol.entityhub.jersey.grefine.Utils;
import org.apache.stanbol.entityhub.servicesapi.EntityhubException;
+import org.apache.stanbol.entityhub.servicesapi.defaults.DataTypeEnum;
import org.apache.stanbol.entityhub.servicesapi.defaults.SpecialFieldEnum;
import org.apache.stanbol.entityhub.servicesapi.model.Reference;
import org.apache.stanbol.entityhub.servicesapi.model.Representation;
@@ -286,9 +286,9 @@ public abstract class BaseGoogleRefineRe
//hold all references for @references special property
HashSet<String> references = new HashSet<String>();
//holds all texts for @fullText special property
- List<String> fullText = new ArrayList<String>();
+ List<String> fullText = null;
//holds the context for the @similarity special property
- StringBuilder similarityContext = new StringBuilder();
+ Collection<String> similarityContext = null;
//the field used for the @similarity special property
HashSet<String> similarityFields = new LinkedHashSet<String>();
@@ -326,9 +326,7 @@ public abstract class BaseGoogleRefineRe
if(property.getParameter() != null){
log.warn("parameters are not supported for @fullText -> ignore '{}'",property.getParameter());
}
- for(String text : texts){ //add the values
- fullText.add(text);
- }
+ fullText = texts;
} else if(property.getName().equalsIgnoreCase("similarity")){
String propUri = property.getParameter() != null ?
nsPrefixService.getFullName(property.getParameter()) :
@@ -342,9 +340,7 @@ public abstract class BaseGoogleRefineRe
NamespaceMappingUtils.getPrefix(property.getParameter()),property);
similarityFields.add(SpecialFieldEnum.fullText.getUri());
}
- for(String text : texts){ //Append the text values to the context
- similarityContext.append(text).append(' ');
- }
+ similarityContext = texts;
} else {
//TODO: implement LDPATH support
log.warn("ignore unsupported special property {}",property);
@@ -377,7 +373,6 @@ public abstract class BaseGoogleRefineRe
}
//clean up
ids.clear();
- texts.clear();
values.clear();
}
//now add constraints for the collected special properties
@@ -386,12 +381,12 @@ public abstract class BaseGoogleRefineRe
ReferenceConstraint refConstraint = new ReferenceConstraint(references, MODE.all);
query.setConstraint(SpecialFieldEnum.references.getUri(), refConstraint);
}
- if(!fullText.isEmpty()){
+ if(fullText != null && !fullText.isEmpty()){
TextConstraint textConstraint = new TextConstraint(fullText);
query.setConstraint(SpecialFieldEnum.fullText.getUri(), textConstraint);
//add full text constraint
}
- if(similarityContext.length() > 0 && !similarityFields.isEmpty()){
+ if(similarityContext != null && !similarityContext.isEmpty()){
//add similarity constraint
Iterator<String> fieldIt = similarityFields.iterator();
String field = fieldIt.next();
@@ -401,9 +396,9 @@ public abstract class BaseGoogleRefineRe
while(fieldIt.hasNext()){
addFields.add(fieldIt.next());
}
- simConstraint = new SimilarityConstraint(similarityContext.toString(),addFields);
+ simConstraint = new SimilarityConstraint(similarityContext,DataTypeEnum.Text, addFields);
} else {
- simConstraint = new SimilarityConstraint(similarityContext.toString());
+ simConstraint = new SimilarityConstraint(similarityContext,DataTypeEnum.Text);
}
query.setConstraint(field, simConstraint);
}
Modified: stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/EntityhubReconcileResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/EntityhubReconcileResource.java?rev=1593887&r1=1593886&r2=1593887&view=diff
==============================================================================
--- stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/EntityhubReconcileResource.java (original)
+++ stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/EntityhubReconcileResource.java Mon May 12 05:20:35 2014
@@ -16,9 +16,7 @@
*/
package org.apache.stanbol.entityhub.jersey.resource.reconcile;
-import javax.servlet.ServletContext;
import javax.ws.rs.Path;
-import javax.ws.rs.core.Context;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
@@ -36,8 +34,6 @@ import org.apache.stanbol.entityhub.serv
@Path("/entityhub/reconcile")
public class EntityhubReconcileResource extends BaseGoogleRefineReconcileResource {
- private Entityhub _entityhub;
-
public EntityhubReconcileResource() {
super();
}
Modified: stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/ReferencedSiteReconcileResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/ReferencedSiteReconcileResource.java?rev=1593887&r1=1593886&r2=1593887&view=diff
==============================================================================
--- stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/ReferencedSiteReconcileResource.java (original)
+++ stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/ReferencedSiteReconcileResource.java Mon May 12 05:20:35 2014
@@ -16,11 +16,9 @@
*/
package org.apache.stanbol.entityhub.jersey.resource.reconcile;
-import javax.servlet.ServletContext;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import org.apache.felix.scr.annotations.Component;
Modified: stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/SiteManagerReconcileResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/SiteManagerReconcileResource.java?rev=1593887&r1=1593886&r2=1593887&view=diff
==============================================================================
--- stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/SiteManagerReconcileResource.java (original)
+++ stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/SiteManagerReconcileResource.java Mon May 12 05:20:35 2014
@@ -36,15 +36,12 @@ import org.apache.stanbol.entityhub.serv
public class SiteManagerReconcileResource extends BaseGoogleRefineReconcileResource {
@Reference
- SiteManager _siteManager;
+ SiteManager siteManager;
- private SiteManager getSiteManager(){
- return _siteManager;
- }
@Override
protected QueryResultList<Representation> performQuery(String siteId, FieldQuery query) throws SiteException {
- return getSiteManager().find(query);
+ return siteManager.find(query);
}
@Override
Modified: stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/utils/LDPathHelper.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/utils/LDPathHelper.java?rev=1593887&r1=1593886&r2=1593887&view=diff
==============================================================================
--- stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/utils/LDPathHelper.java (original)
+++ stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/utils/LDPathHelper.java Mon May 12 05:20:35 2014
@@ -30,7 +30,6 @@ import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
-import javax.servlet.ServletContext;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
@@ -45,8 +44,8 @@ import org.apache.marmotta.ldpath.model.
import org.apache.marmotta.ldpath.model.selectors.PropertySelector;
import org.apache.marmotta.ldpath.model.transformers.DoubleTransformer;
import org.apache.stanbol.commons.indexedgraph.IndexedMGraph;
-import org.apache.stanbol.commons.viewable.Viewable;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
+import org.apache.stanbol.commons.web.viewable.Viewable;
import org.apache.stanbol.entityhub.core.model.InMemoryValueFactory;
import org.apache.stanbol.entityhub.jersey.resource.EntityhubRootResource;
import org.apache.stanbol.entityhub.jersey.resource.ReferencedSiteRootResource;
Modified: stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/web/writer/EntityWriter.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/web/writer/EntityWriter.java?rev=1593887&r1=1593886&r2=1593887&view=diff
==============================================================================
--- stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/web/writer/EntityWriter.java (original)
+++ stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/web/writer/EntityWriter.java Mon May 12 05:20:35 2014
@@ -4,37 +4,23 @@ import java.io.IOException;
import java.io.OutputStream;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
import java.util.Iterator;
-import java.util.Set;
-import javax.servlet.ServletContext;
import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response.Status;
import javax.ws.rs.ext.MessageBodyWriter;
import javax.ws.rs.ext.Provider;
-import org.apache.clerezza.rdf.core.serializedform.Serializer;
-import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
-import org.apache.commons.io.IOUtils;
-import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
import org.apache.stanbol.entityhub.servicesapi.model.Entity;
-import org.apache.stanbol.entityhub.servicesapi.model.Representation;
import org.apache.stanbol.entityhub.web.ModelWriter;
import org.apache.stanbol.entityhub.web.ModelWriterRegistry;
-import org.codehaus.jettison.json.JSONException;
import org.osgi.framework.ServiceReference;
-import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/web/writer/ModelWriterTracker.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/web/writer/ModelWriterTracker.java?rev=1593887&r1=1593886&r2=1593887&view=diff
==============================================================================
--- stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/web/writer/ModelWriterTracker.java (original)
+++ stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/web/writer/ModelWriterTracker.java Mon May 12 05:20:35 2014
@@ -5,17 +5,14 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
-import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import javax.print.attribute.standard.Severity;
import javax.ws.rs.core.MediaType;
import org.apache.stanbol.entityhub.servicesapi.model.Representation;
@@ -23,7 +20,6 @@ import org.apache.stanbol.entityhub.web.
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.util.tracker.ServiceTracker;
-import org.osgi.util.tracker.ServiceTrackerCustomizer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/web/writer/RepresentationWriter.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/web/writer/RepresentationWriter.java?rev=1593887&r1=1593886&r2=1593887&view=diff
==============================================================================
--- stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/web/writer/RepresentationWriter.java (original)
+++ stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/web/writer/RepresentationWriter.java Mon May 12 05:20:35 2014
@@ -4,26 +4,15 @@ import java.io.IOException;
import java.io.OutputStream;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
import java.util.Iterator;
-import java.util.Set;
-import javax.servlet.ServletContext;
import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response.Status;
import javax.ws.rs.ext.MessageBodyWriter;
import javax.ws.rs.ext.Provider;
-import org.apache.clerezza.rdf.core.serializedform.Serializer;
-import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
-import org.apache.commons.io.IOUtils;
-import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
@@ -31,9 +20,7 @@ import org.apache.felix.scr.annotations.
import org.apache.stanbol.entityhub.servicesapi.model.Representation;
import org.apache.stanbol.entityhub.web.ModelWriter;
import org.apache.stanbol.entityhub.web.ModelWriterRegistry;
-import org.codehaus.jettison.json.JSONException;
import org.osgi.framework.ServiceReference;
-import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/web/writer/ResultListWriter.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/web/writer/ResultListWriter.java?rev=1593887&r1=1593886&r2=1593887&view=diff
==============================================================================
--- stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/web/writer/ResultListWriter.java (original)
+++ stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/web/writer/ResultListWriter.java Mon May 12 05:20:35 2014
@@ -4,26 +4,15 @@ import java.io.IOException;
import java.io.OutputStream;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
import java.util.Iterator;
-import java.util.Set;
-import javax.servlet.ServletContext;
import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response.Status;
import javax.ws.rs.ext.MessageBodyWriter;
import javax.ws.rs.ext.Provider;
-import org.apache.clerezza.rdf.core.serializedform.Serializer;
-import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
-import org.apache.commons.io.IOUtils;
-import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
@@ -33,9 +22,7 @@ import org.apache.stanbol.entityhub.serv
import org.apache.stanbol.entityhub.servicesapi.query.QueryResultList;
import org.apache.stanbol.entityhub.web.ModelWriter;
import org.apache.stanbol.entityhub.web.ModelWriterRegistry;
-import org.codehaus.jettison.json.JSONException;
import org.osgi.framework.ServiceReference;
-import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: stanbol/trunk/integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/integration-tests/pom.xml?rev=1593887&r1=1593886&r2=1593887&view=diff
==============================================================================
--- stanbol/trunk/integration-tests/pom.xml (original)
+++ stanbol/trunk/integration-tests/pom.xml Mon May 12 05:20:35 2014
@@ -51,7 +51,7 @@
<test.server.url></test.server.url>
<!-- Options for the VM that executes our runnable jar -->
- <jar.executor.vm.options>-Xmx1g -XX:MaxPermSize=256m -Dorg.apache.stanbol.offline.mode=true -Dorg.apache.sling.commons.log.level=DEBUG</jar.executor.vm.options>
+ <jar.executor.vm.options>-Xmx1g -XX:MaxPermSize=256m -Dorg.apache.stanbol.offline.mode=true</jar.executor.vm.options>
<!-- Set this to true to keep the runnable jar running - useful to debug tests -->
<keepJarRunning>false</keepJarRunning>
Modified: stanbol/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/parent/pom.xml?rev=1593887&r1=1593886&r2=1593887&view=diff
==============================================================================
--- stanbol/trunk/parent/pom.xml (original)
+++ stanbol/trunk/parent/pom.xml Mon May 12 05:20:35 2014
@@ -801,12 +801,12 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.6</version>
+ <version>1.8</version>
</dependency>
<dependency> <!-- dependency of commons-compress 1.4+ -->
<groupId>org.tukaani</groupId>
<artifactId>xz</artifactId>
- <version>1.4</version>
+ <version>1.5</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>