svn commit: r1138487 - in /incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web: ReengineerFragment.java resources/ReengineerResource.java

[en...@apache.org]

Author: enridaga
Date: Wed Jun 22 14:42:51 2011
New Revision: 1138487

URL: http://svn.apache.org/viewvc?rev=1138487&view=rev
Log:
Applying patch from Alberto at STANBOL-150

Modified:
    incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/ReengineerFragment.java
    incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/resources/ReengineerResource.java

Modified: incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/ReengineerFragment.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/ReengineerFragment.java?rev=1138487&r1=1138486&r2=1138487&view=diff
==============================================================================
--- incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/ReengineerFragment.java (original)
+++ incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/ReengineerFragment.java Wed Jun 22 14:42:51 2011
@@ -6,6 +6,7 @@ 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;
@@ -14,6 +15,7 @@ import org.apache.stanbol.commons.web.ba
 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.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
 import org.apache.stanbol.reengineer.base.api.ReengineerManager;
 import org.apache.stanbol.reengineer.web.resources.ReengineerResource;
 import org.osgi.framework.BundleContext;
@@ -43,9 +45,11 @@ public class ReengineerFragment implemen
     private BundleContext bundleContext;
     
     @Reference
+    TcManager tcManager;
+    
+    @Reference
     ReengineerManager reengineeringManager;
-
-
+    
     @Override
     public BundleContext getBundleContext() {
         return bundleContext;
@@ -54,6 +58,7 @@ public class ReengineerFragment implemen
     @Override
     public Set<Class<?>> getJaxrsResourceClasses() {
         Set<Class<?>> classes = new HashSet<Class<?>>();
+        
         // resources
         classes.add(ReengineerResource.class);
 

Modified: incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/resources/ReengineerResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/resources/ReengineerResource.java?rev=1138487&r1=1138486&r2=1138487&view=diff
==============================================================================
--- incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/resources/ReengineerResource.java (original)
+++ incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/resources/ReengineerResource.java Wed Jun 22 14:42:51 2011
@@ -26,6 +26,7 @@ import org.apache.clerezza.rdf.core.UriR
 import org.apache.clerezza.rdf.core.access.TcManager;
 import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
 import org.apache.clerezza.rdf.core.impl.TripleImpl;
+import org.apache.stanbol.commons.web.base.ContextHelper;
 import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
 import org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
 import org.apache.stanbol.reengineer.base.api.DataSource;
@@ -62,9 +63,9 @@ public class ReengineerResource extends 
 
 
     public ReengineerResource(@Context ServletContext servletContext) {
-        tcManager = (TcManager) servletContext.getAttribute(TcManager.class.getName());
+        tcManager = (TcManager) ContextHelper.getServiceFromContext(TcManager.class, servletContext);
         storage = (ClerezzaOntologyStorage) servletContext.getAttribute(ClerezzaOntologyStorage.class.getName());
-        reengineeringManager  = (ReengineerManager) (servletContext.getAttribute(ReengineerManager.class.getName()));
+        reengineeringManager = (ReengineerManager) ContextHelper.getServiceFromContext(ReengineerManager.class, servletContext);
         if (reengineeringManager == null) {
             throw new IllegalStateException(
             "ReengineeringManager missing in ServletContext");