You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by og...@apache.org on 2011/04/09 22:20:16 UTC
svn commit: r1090669 - in /incubator/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/
commons/web/sparql/src/main/java/org/apache/stanbol/commons/...
Author: ogrisel
Date: Sat Apr 9 20:20:16 2011
New Revision: 1090669
URL: http://svn.apache.org/viewvc?rev=1090669&view=rev
Log:
Make the WebFragment carry the dependent OSGi services references instead of the toplevel endpoint
Modified:
incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/JerseyEndpoint.java
incubator/stanbol/trunk/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/SparqlEndpointWebFragment.java
incubator/stanbol/trunk/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/resource/SparqlEndpointResource.java
incubator/stanbol/trunk/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/fragment/ContentHubWebFragment.java
incubator/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerWebFragment.java
Modified: incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/JerseyEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/JerseyEndpoint.java?rev=1090669&r1=1090668&r2=1090669&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/JerseyEndpoint.java (original)
+++ incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/JerseyEndpoint.java Sat Apr 9 20:20:16 2011
@@ -10,8 +10,6 @@ import java.util.List;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
-import org.apache.clerezza.rdf.core.access.TcManager;
-import org.apache.clerezza.rdf.core.serializedform.Serializer;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
@@ -50,12 +48,6 @@ public class JerseyEndpoint {
@Reference
HttpService httpService;
-
- @Reference
- TcManager tcManager;
-
- @Reference
- Serializer serializer;
protected ComponentContext componentContext;
@@ -139,10 +131,6 @@ public class JerseyEndpoint {
servletContext.setAttribute(BaseStanbolResource.SCRIPT_RESOURCES, scriptResources);
servletContext.setAttribute(BaseStanbolResource.NAVIGATION_LINKS, navigationLinks);
- // (temporary) Make sure Clerezza persistence services are registered.
- servletContext.setAttribute(Serializer.class.getName(), serializer);
- servletContext.setAttribute(TcManager.class.getName(), tcManager);
-
log.info("JerseyEndpoint servlet registered at {}", applicationAlias);
}
Modified: incubator/stanbol/trunk/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/SparqlEndpointWebFragment.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/SparqlEndpointWebFragment.java?rev=1090669&r1=1090668&r2=1090669&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/SparqlEndpointWebFragment.java (original)
+++ incubator/stanbol/trunk/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/SparqlEndpointWebFragment.java Sat Apr 9 20:20:16 2011
@@ -6,14 +6,18 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.References;
import org.apache.felix.scr.annotations.Service;
import org.apache.stanbol.commons.web.base.LinkResource;
import org.apache.stanbol.commons.web.base.NavigationLink;
import org.apache.stanbol.commons.web.base.ScriptResource;
import org.apache.stanbol.commons.web.base.WebFragment;
import org.apache.stanbol.commons.web.sparql.resource.SparqlEndpointResource;
+import org.apache.stanbol.enhancer.servicesapi.Store;
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext;
@@ -26,6 +30,7 @@ import freemarker.cache.TemplateLoader;
*/
@Component(immediate = true, metatype = true)
@Service
+@References({})
public class SparqlEndpointWebFragment implements WebFragment {
private static final String NAME = "sparql";
@@ -33,6 +38,13 @@ public class SparqlEndpointWebFragment i
private static final String TEMPLATE_PATH = "/org/apache/stanbol/commons/web/sparql/templates";
private BundleContext bundleContext;
+
+ // put references to the required OSGi services
+ @Reference
+ TcManager tcManager;
+
+ @Reference
+ Store store;
@Override
public String getName() {
Modified: incubator/stanbol/trunk/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/resource/SparqlEndpointResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/resource/SparqlEndpointResource.java?rev=1090669&r1=1090668&r2=1090669&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/resource/SparqlEndpointResource.java (original)
+++ incubator/stanbol/trunk/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/resource/SparqlEndpointResource.java Sat Apr 9 20:20:16 2011
@@ -63,6 +63,8 @@ public class SparqlEndpointResource exte
if (query instanceof DescribeQuery || query instanceof ConstructQuery) {
mediaType = "application/rdf+xml";
}
+ // TODO: remove dependency on the "store" service and make it possible to select the default graph
+ // instead
Object result = tcManager.executeSparqlQuery(query, store.getEnhancementGraph());
return Response.ok(result, mediaType).build();
}
Modified: incubator/stanbol/trunk/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/fragment/ContentHubWebFragment.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/fragment/ContentHubWebFragment.java?rev=1090669&r1=1090668&r2=1090669&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/fragment/ContentHubWebFragment.java (original)
+++ incubator/stanbol/trunk/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/fragment/ContentHubWebFragment.java Sat Apr 9 20:20:16 2011
@@ -6,14 +6,19 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import org.apache.clerezza.rdf.core.access.TcManager;
+import org.apache.clerezza.rdf.core.serializedform.Serializer;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
import org.apache.stanbol.commons.web.base.LinkResource;
import org.apache.stanbol.commons.web.base.NavigationLink;
import org.apache.stanbol.commons.web.base.ScriptResource;
import org.apache.stanbol.commons.web.base.WebFragment;
import org.apache.stanbol.contenthub.web.resource.ContentHubRootResource;
+import org.apache.stanbol.enhancer.servicesapi.EnhancementJobManager;
+import org.apache.stanbol.enhancer.servicesapi.Store;
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext;
@@ -33,6 +38,18 @@ public class ContentHubWebFragment imple
private static final String TEMPLATE_PATH = "/org/apache/stanbol/contenthub/web/templates";
private BundleContext bundleContext;
+
+ @Reference
+ TcManager tcManager;
+
+ @Reference
+ Store store;
+
+ @Reference
+ EnhancementJobManager jobManager;
+
+ @Reference
+ Serializer serializer;
@Override
public String getName() {
Modified: incubator/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerWebFragment.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerWebFragment.java?rev=1090669&r1=1090668&r2=1090669&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerWebFragment.java (original)
+++ incubator/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerWebFragment.java Sat Apr 9 20:20:16 2011
@@ -6,14 +6,18 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import org.apache.clerezza.rdf.core.access.TcManager;
+import org.apache.clerezza.rdf.core.serializedform.Serializer;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
import org.apache.stanbol.commons.web.base.LinkResource;
import org.apache.stanbol.commons.web.base.NavigationLink;
import org.apache.stanbol.commons.web.base.ScriptResource;
import org.apache.stanbol.commons.web.base.WebFragment;
import org.apache.stanbol.enhancer.jersey.resource.EnginesRootResource;
+import org.apache.stanbol.enhancer.servicesapi.EnhancementJobManager;
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext;
@@ -36,6 +40,15 @@ public class EnhancerWebFragment impleme
private BundleContext bundleContext;
+ @Reference
+ EnhancementJobManager jobManager;
+
+ @Reference
+ TcManager tcManager;
+
+ @Reference
+ Serializer serializer;
+
@Override
public String getName() {
return NAME;