Author: enridaga
Date: Mon Oct 14 18:00:17 2013
New Revision: 1532007
URL: http://svn.apache.org/r1532007
Log:
STANBOL-1173 Fixed dependencies in pom files to match commons-ng. Cleanup of
jax-rs resources in the web project (removed references to servlet contexts and
added references to scr objects via annotations. Compiles, may not work.
Modified:
stanbol/branches/commons-ng/rules/web/pom.xml
stanbol/branches/commons-ng/rules/web/src/main/java/org/apache/stanbol/rules/web/RulesFragment.java
stanbol/branches/commons-ng/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RefactorResource.java
stanbol/branches/commons-ng/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RulesPrettyPrintResource.java
stanbol/branches/commons-ng/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RulesResource.java
stanbol/branches/commons-ng/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RecipeListWriter.java
stanbol/branches/commons-ng/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RecipeWriter.java
stanbol/branches/commons-ng/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RuleListWriter.java
Modified: stanbol/branches/commons-ng/rules/web/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/rules/web/pom.xml?rev=1532007&r1=1532006&r2=1532007&view=diff
==============================================================================
--- stanbol/branches/commons-ng/rules/web/pom.xml (original)
+++ stanbol/branches/commons-ng/rules/web/pom.xml Mon Oct 14 18:00:17 2013
@@ -21,13 +21,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>stanbol-parent</artifactId>
- <version>4-SNAPSHOT</version>
+ <version>5-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.rules.web</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Rules Web</name>
@@ -96,32 +96,32 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.base</artifactId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.viewable</artifactId>
- <version>0.11.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.rules.manager</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.rules.refactor</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.rules.base</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.owl</artifactId>
- <version>0.11.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -145,14 +145,20 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
+ <version>1.15</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
+ <version>1.15</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-multipart</artifactId>
+ <version>1.15</version>
+ <scope>compile</scope>
</dependency>
Modified:
stanbol/branches/commons-ng/rules/web/src/main/java/org/apache/stanbol/rules/web/RulesFragment.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/rules/web/src/main/java/org/apache/stanbol/rules/web/RulesFragment.java?rev=1532007&r1=1532006&r2=1532007&view=diff
==============================================================================
---
stanbol/branches/commons-ng/rules/web/src/main/java/org/apache/stanbol/rules/web/RulesFragment.java
(original)
+++
stanbol/branches/commons-ng/rules/web/src/main/java/org/apache/stanbol/rules/web/RulesFragment.java
Mon Oct 14 18:00:17 2013
@@ -30,6 +30,7 @@ import org.apache.stanbol.commons.web.ba
import org.apache.stanbol.commons.web.base.WebFragment;
import org.apache.stanbol.rules.base.api.RuleStore;
import org.apache.stanbol.rules.refactor.api.Refactorer;
+
import org.apache.stanbol.rules.web.resources.RefactorResource;
import org.apache.stanbol.rules.web.resources.RulesResource;
import org.apache.stanbol.rules.web.writers.RecipeListWriter;
Modified:
stanbol/branches/commons-ng/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RefactorResource.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RefactorResource.java?rev=1532007&r1=1532006&r2=1532007&view=diff
==============================================================================
---
stanbol/branches/commons-ng/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RefactorResource.java
(original)
+++
stanbol/branches/commons-ng/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RefactorResource.java
Mon Oct 14 18:00:17 2013
@@ -22,8 +22,8 @@ import static javax.ws.rs.core.Response.
import static javax.ws.rs.core.Response.Status.NO_CONTENT;
import static javax.ws.rs.core.Response.Status.PRECONDITION_FAILED;
import static javax.ws.rs.core.Response.Status.NOT_ACCEPTABLE;
-import static org.apache.stanbol.commons.web.base.CorsHelper.addCORSOrigin;
-import static org.apache.stanbol.commons.web.base.CorsHelper.enableCORS;
+//import static org.apache.stanbol.commons.web.base.CorsHelper.addCORSOrigin;
+//import static org.apache.stanbol.commons.web.base.CorsHelper.enableCORS;
import static
org.apache.stanbol.commons.web.base.format.KRFormat.FUNCTIONAL_OWL;
import static
org.apache.stanbol.commons.web.base.format.KRFormat.MANCHESTER_OWL;
import static org.apache.stanbol.commons.web.base.format.KRFormat.OWL_XML;
@@ -36,7 +36,7 @@ import java.io.InputStream;
import java.net.URI;
import java.net.URISyntaxException;
-import javax.servlet.ServletContext;
+//import javax.servlet.ServletContext;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.OPTIONS;
@@ -50,12 +50,13 @@ 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 javax.ws.rs.core.Response.Status;
+//import javax.ws.rs.core.Response.Status;
import org.apache.clerezza.rdf.core.TripleCollection;
import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.felix.scr.annotations.Reference;
import org.apache.stanbol.commons.owl.transformation.OWLAPIToClerezzaConverter;
-import org.apache.stanbol.commons.web.base.ContextHelper;
+//import org.apache.stanbol.commons.web.base.ContextHelper;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
import org.apache.stanbol.commons.web.base.utils.MediaTypeUtil;
import org.apache.stanbol.rules.base.api.NoSuchRecipeException;
@@ -90,15 +91,17 @@ public class RefactorResource extends Ba
private Logger log = LoggerFactory.getLogger(getClass());
+ @Reference
protected Refactorer refactorer;
+ @Reference
protected RuleStore ruleStore;
- public RefactorResource(@Context ServletContext servletContext) {
- refactorer = (Refactorer)
ContextHelper.getServiceFromContext(Refactorer.class, servletContext);
- if (refactorer == null) throw new IllegalStateException("Refactorer
missing in ServletContext");
- ruleStore = (RuleStore)
ContextHelper.getServiceFromContext(RuleStore.class, servletContext);
- if (ruleStore == null) throw new IllegalStateException("RuleStore
missing in ServletContext");
- }
+// public RefactorResource(@Context ServletContext servletContext) {
+// refactorer = (Refactorer)
ContextHelper.getServiceFromContext(Refactorer.class, servletContext);
+// if (refactorer == null) throw new IllegalStateException("Refactorer
missing in ServletContext");
+// ruleStore = (RuleStore)
ContextHelper.getServiceFromContext(RuleStore.class, servletContext);
+// if (ruleStore == null) throw new IllegalStateException("RuleStore
missing in ServletContext");
+// }
/**
* The apply mode allows the client to compose a recipe, by mean of string
containg the rules, and apply
@@ -132,7 +135,7 @@ public class RefactorResource extends Ba
MediaType mediaType =
MediaTypeUtil.getAcceptableMediaType(headers, null);
if (mediaType != null) rb.header(HttpHeaders.CONTENT_TYPE,
mediaType);
} else rb = Response.status(NOT_FOUND);
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -168,7 +171,7 @@ public class RefactorResource extends Ba
MediaType mediaType =
MediaTypeUtil.getAcceptableMediaType(headers, null);
if (mediaType != null) rb.header(HttpHeaders.CONTENT_TYPE,
mediaType);
} else rb = Response.status(NOT_FOUND);
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -202,7 +205,7 @@ public class RefactorResource extends Ba
@OPTIONS
public Response handleCorsPreflight(@Context HttpHeaders headers) {
ResponseBuilder rb = Response.ok();
- enableCORS(servletContext, rb, headers);
+// enableCORS(servletContext, rb, headers);
return rb.build();
}
@@ -210,7 +213,7 @@ public class RefactorResource extends Ba
@Path("/apply")
public Response handleCorsPreflightApply(@Context HttpHeaders headers) {
ResponseBuilder rb = Response.ok();
- enableCORS(servletContext, rb, headers);
+// enableCORS(servletContext, rb, headers);
return rb.build();
}
@@ -218,7 +221,7 @@ public class RefactorResource extends Ba
@Path("/applyfile")
public Response handleCorsPreflightApplyFile(@Context HttpHeaders headers)
{
ResponseBuilder rb = Response.ok();
- enableCORS(servletContext, rb, headers);
+// enableCORS(servletContext, rb, headers);
return rb.build();
}
@@ -271,7 +274,7 @@ public class RefactorResource extends Ba
rb = Response.status(NOT_ACCEPTABLE);
log.error(e.getMessage(), e);
}
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -306,7 +309,7 @@ public class RefactorResource extends Ba
MediaType mediaType = MediaTypeUtil.getAcceptableMediaType(headers,
null);
if (mediaType != null)
responseBuilder.header(HttpHeaders.CONTENT_TYPE, mediaType);
- addCORSOrigin(servletContext, responseBuilder, headers);
+// addCORSOrigin(servletContext, responseBuilder, headers);
return responseBuilder.build();
}
Modified:
stanbol/branches/commons-ng/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RulesPrettyPrintResource.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RulesPrettyPrintResource.java?rev=1532007&r1=1532006&r2=1532007&view=diff
==============================================================================
---
stanbol/branches/commons-ng/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RulesPrettyPrintResource.java
(original)
+++
stanbol/branches/commons-ng/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RulesPrettyPrintResource.java
Mon Oct 14 18:00:17 2013
@@ -15,8 +15,8 @@
* limitations under the License.
*/
package org.apache.stanbol.rules.web.resources;
-import javax.servlet.ServletContext;
-import javax.ws.rs.core.Context;
+//import javax.servlet.ServletContext;
+//import javax.ws.rs.core.Context;
import javax.ws.rs.core.UriInfo;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
@@ -25,10 +25,10 @@ public class RulesPrettyPrintResource ex
private Object result;
- public RulesPrettyPrintResource(@Context ServletContext servletContext,
UriInfo uriInfo, Object result) {
+ public RulesPrettyPrintResource( UriInfo uriInfo, Object result) {
this.result = result;
this.uriInfo = uriInfo;
- this.servletContext = servletContext;
+// this.servletContext = servletContext;
}
public Object getResult() {
Modified:
stanbol/branches/commons-ng/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RulesResource.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RulesResource.java?rev=1532007&r1=1532006&r2=1532007&view=diff
==============================================================================
---
stanbol/branches/commons-ng/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RulesResource.java
(original)
+++
stanbol/branches/commons-ng/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RulesResource.java
Mon Oct 14 18:00:17 2013
@@ -22,15 +22,15 @@
package org.apache.stanbol.rules.web.resources;
import static javax.ws.rs.core.MediaType.TEXT_HTML;
-import static org.apache.stanbol.commons.web.base.CorsHelper.addCORSOrigin;
-import static org.apache.stanbol.commons.web.base.CorsHelper.enableCORS;
+//import static org.apache.stanbol.commons.web.base.CorsHelper.addCORSOrigin;
+//import static org.apache.stanbol.commons.web.base.CorsHelper.enableCORS;
import java.io.InputStream;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.List;
-import javax.servlet.ServletContext;
+//import javax.servlet.ServletContext;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.GET;
@@ -49,8 +49,9 @@ import javax.ws.rs.core.Response.Respons
import javax.ws.rs.core.Response.Status;
import org.apache.clerezza.rdf.core.UriRef;
-import org.apache.stanbol.commons.viewable.Viewable;
-import org.apache.stanbol.commons.web.base.ContextHelper;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.stanbol.commons.web.viewable.Viewable;
+//import org.apache.stanbol.commons.web.base.ContextHelper;
import org.apache.stanbol.commons.web.base.format.KRFormat;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
import org.apache.stanbol.rules.base.api.AlreadyExistingRecipeException;
@@ -89,8 +90,10 @@ public class RulesResource extends BaseS
private Logger log = LoggerFactory.getLogger(getClass());
+ @Reference
private RuleStore ruleStore;
+ @Reference
private RuleAdapterManager adapterManager;
/**
@@ -99,17 +102,17 @@ public class RulesResource extends BaseS
* @param servletContext
* {To get the context where the REST service is running.}
*/
- public RulesResource(@Context ServletContext servletContext) {
- this.ruleStore = (RuleStore)
ContextHelper.getServiceFromContext(RuleStore.class, servletContext);
- this.adapterManager = (RuleAdapterManager)
ContextHelper.getServiceFromContext(
- RuleAdapterManager.class, servletContext);
- }
+// public RulesResource(@Context ServletContext servletContext) {
+// this.ruleStore = (RuleStore)
ContextHelper.getServiceFromContext(RuleStore.class, servletContext);
+// this.adapterManager = (RuleAdapterManager)
ContextHelper.getServiceFromContext(
+// RuleAdapterManager.class, servletContext);
+// }
@GET
@Produces(TEXT_HTML)
public Response get(@Context HttpHeaders headers) {
ResponseBuilder responseBuilder = Response.ok(new Viewable("index",
this), TEXT_HTML);
- addCORSOrigin(servletContext, responseBuilder, headers);
+// addCORSOrigin(servletContext, responseBuilder, headers);
return responseBuilder.build();
}
@@ -242,7 +245,7 @@ public class RulesResource extends BaseS
responseBuilder = Response.status(Status.NOT_ACCEPTABLE);
}
- addCORSOrigin(servletContext, responseBuilder, headers);
+// addCORSOrigin(servletContext, responseBuilder, headers);
return responseBuilder.build();
}
@@ -275,7 +278,7 @@ public class RulesResource extends BaseS
recipe = new RecipeImpl(recipe.getRecipeID(),
recipe.getRecipeDescription(), ruleList);
}
- responseBuilder = Response.ok(new Viewable("rules", new
RulesPrettyPrintResource(servletContext,
+ responseBuilder = Response.ok(new Viewable("rules", new
RulesPrettyPrintResource(
uriInfo, recipe)));
} catch (NoSuchRecipeException e) {
@@ -292,7 +295,7 @@ public class RulesResource extends BaseS
responseBuilder = Response.status(Status.NOT_ACCEPTABLE);
}
- addCORSOrigin(servletContext, responseBuilder, headers);
+// addCORSOrigin(servletContext, responseBuilder, headers);
return responseBuilder.build();
}
@@ -338,7 +341,7 @@ public class RulesResource extends BaseS
responseBuilder = Response.status(Status.NOT_ACCEPTABLE);
}
- addCORSOrigin(servletContext, responseBuilder, headers);
+// addCORSOrigin(servletContext, responseBuilder, headers);
return responseBuilder.build();
}
@@ -360,7 +363,7 @@ public class RulesResource extends BaseS
responseBuilder = Response.status(Status.INTERNAL_SERVER_ERROR);
}
- addCORSOrigin(servletContext, responseBuilder, headers);
+// addCORSOrigin(servletContext, responseBuilder, headers);
return responseBuilder.build();
}
@@ -445,7 +448,7 @@ public class RulesResource extends BaseS
responseBuilder = Response.ok();
- addCORSOrigin(servletContext, responseBuilder, headers);
+// addCORSOrigin(servletContext, responseBuilder, headers);
return responseBuilder.build();
}
@@ -501,7 +504,7 @@ public class RulesResource extends BaseS
responseBuilder = Response.status(Status.NOT_ACCEPTABLE);
}
- addCORSOrigin(servletContext, responseBuilder, headers);
+// addCORSOrigin(servletContext, responseBuilder, headers);
return responseBuilder.build();
}
@@ -586,7 +589,7 @@ public class RulesResource extends BaseS
log.error(e.getMessage(), e);
}
- addCORSOrigin(servletContext, responseBuilder, headers);
+// addCORSOrigin(servletContext, responseBuilder, headers);
return responseBuilder.build();
}
@@ -643,7 +646,7 @@ public class RulesResource extends BaseS
responseBuilder = Response.status(Status.NOT_FOUND);
}
- addCORSOrigin(servletContext, responseBuilder, headers);
+// addCORSOrigin(servletContext, responseBuilder, headers);
return responseBuilder.build();
}
@@ -657,7 +660,7 @@ public class RulesResource extends BaseS
@OPTIONS
public Response handleCorsPreflight(@Context HttpHeaders headers) {
ResponseBuilder rb = Response.ok();
- enableCORS(servletContext, rb, headers);
+// enableCORS(servletContext, rb, headers);
return rb.build();
}
Modified:
stanbol/branches/commons-ng/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RecipeListWriter.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RecipeListWriter.java?rev=1532007&r1=1532006&r2=1532007&view=diff
==============================================================================
---
stanbol/branches/commons-ng/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RecipeListWriter.java
(original)
+++
stanbol/branches/commons-ng/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RecipeListWriter.java
Mon Oct 14 18:00:17 2013
@@ -21,10 +21,10 @@ import java.io.OutputStream;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
-import javax.servlet.ServletContext;
+//import javax.servlet.ServletContext;
import javax.ws.rs.Produces;
import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
+//import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.ext.MessageBodyWriter;
@@ -34,6 +34,7 @@ import org.apache.clerezza.rdf.core.Trip
import org.apache.clerezza.rdf.core.serializedform.Serializer;
import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
import org.apache.clerezza.rdf.rdfjson.serializer.RdfJsonSerializingProvider;
+import org.apache.felix.scr.annotations.Reference;
import org.apache.stanbol.commons.owl.transformation.OWLAPIToClerezzaConverter;
import org.apache.stanbol.commons.web.base.format.KRFormat;
import org.apache.stanbol.rules.base.api.Recipe;
@@ -69,29 +70,29 @@ import org.slf4j.LoggerFactory;
@Produces({KRFormat.RDF_XML, KRFormat.OWL_XML, KRFormat.MANCHESTER_OWL,
KRFormat.FUNCTIONAL_OWL,
KRFormat.TURTLE, KRFormat.RDF_JSON})
public class RecipeListWriter implements MessageBodyWriter<RecipeList> {
-
+ @Reference
protected Serializer serializer;
- protected ServletContext servletContext;
-
+// protected ServletContext servletContext;
+ @Reference
protected RuleStore ruleStore;
- public RecipeListWriter(@Context ServletContext servletContext) {
- Logger log = LoggerFactory.getLogger(getClass());
- this.servletContext = servletContext;
- log.info("Setting context to " + servletContext);
- serializer = (Serializer)
this.servletContext.getAttribute(Serializer.class.getName());
- if (serializer == null) {
- log.error("Serializer not found in Servlet context.");
- serializer = new Serializer();
- }
-
- ruleStore = (RuleStore)
this.servletContext.getAttribute(RuleStore.class.getName());
-
- if (serializer == null) {
- log.error("RuleStore not found in Servlet context.");
- }
- }
+// public RecipeListWriter(@Context ServletContext servletContext) {
+// Logger log = LoggerFactory.getLogger(getClass());
+// this.servletContext = servletContext;
+// log.info("Setting context to " + servletContext);
+// serializer = (Serializer)
this.servletContext.getAttribute(Serializer.class.getName());
+// if (serializer == null) {
+// log.error("Serializer not found in Servlet context.");
+// serializer = new Serializer();
+// }
+//
+// ruleStore = (RuleStore)
this.servletContext.getAttribute(RuleStore.class.getName());
+//
+// if (serializer == null) {
+// log.error("RuleStore not found in Servlet context.");
+// }
+// }
@Override
public long getSize(RecipeList arg0, Class<?> arg1, Type arg2,
Annotation[] arg3, MediaType arg4) {
Modified:
stanbol/branches/commons-ng/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RecipeWriter.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RecipeWriter.java?rev=1532007&r1=1532006&r2=1532007&view=diff
==============================================================================
---
stanbol/branches/commons-ng/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RecipeWriter.java
(original)
+++
stanbol/branches/commons-ng/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RecipeWriter.java
Mon Oct 14 18:00:17 2013
@@ -21,10 +21,10 @@ import java.io.OutputStream;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
-import javax.servlet.ServletContext;
+//import javax.servlet.ServletContext;
import javax.ws.rs.Produces;
import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
+//import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.ext.MessageBodyWriter;
@@ -35,6 +35,7 @@ import org.apache.clerezza.rdf.core.UriR
import org.apache.clerezza.rdf.core.serializedform.Serializer;
import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
import org.apache.clerezza.rdf.rdfjson.serializer.RdfJsonSerializingProvider;
+import org.apache.felix.scr.annotations.Reference;
import org.apache.stanbol.commons.owl.transformation.OWLAPIToClerezzaConverter;
import org.apache.stanbol.commons.web.base.format.KRFormat;
import org.apache.stanbol.rules.base.api.Recipe;
@@ -72,28 +73,29 @@ import org.slf4j.LoggerFactory;
KRFormat.TURTLE, KRFormat.RDF_JSON, MediaType.TEXT_PLAIN})
public class RecipeWriter implements MessageBodyWriter<Recipe> {
+ @Reference
protected Serializer serializer;
-
- protected ServletContext servletContext;
-
+
+// protected ServletContext servletContext;
+ @Reference
protected RuleStore ruleStore;
- public RecipeWriter(@Context ServletContext servletContext) {
- Logger log = LoggerFactory.getLogger(getClass());
- this.servletContext = servletContext;
- log.info("Setting context to " + servletContext);
- serializer = (Serializer)
this.servletContext.getAttribute(Serializer.class.getName());
- if (serializer == null) {
- log.error("Serializer not found in Servlet context.");
- serializer = new Serializer();
- }
-
- ruleStore = (RuleStore)
this.servletContext.getAttribute(RuleStore.class.getName());
-
- if (serializer == null) {
- log.error("RuleStore not found in Servlet context.");
- }
- }
+// public RecipeWriter(@Context ServletContext servletContext) {
+// Logger log = LoggerFactory.getLogger(getClass());
+// this.servletContext = servletContext;
+// log.info("Setting context to " + servletContext);
+// serializer = (Serializer)
this.servletContext.getAttribute(Serializer.class.getName());
+// if (serializer == null) {
+// log.error("Serializer not found in Servlet context.");
+// serializer = new Serializer();
+// }
+//
+// ruleStore = (RuleStore)
this.servletContext.getAttribute(RuleStore.class.getName());
+//
+// if (serializer == null) {
+// log.error("RuleStore not found in Servlet context.");
+// }
+// }
@Override
public long getSize(Recipe arg0, Class<?> arg1, Type arg2, Annotation[]
arg3, MediaType arg4) {
Modified:
stanbol/branches/commons-ng/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RuleListWriter.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RuleListWriter.java?rev=1532007&r1=1532006&r2=1532007&view=diff
==============================================================================
---
stanbol/branches/commons-ng/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RuleListWriter.java
(original)
+++
stanbol/branches/commons-ng/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RuleListWriter.java
Mon Oct 14 18:00:17 2013
@@ -21,10 +21,10 @@ import java.io.OutputStream;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
-import javax.servlet.ServletContext;
+//import javax.servlet.ServletContext;
import javax.ws.rs.Produces;
import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
+//import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.ext.MessageBodyWriter;
@@ -34,9 +34,10 @@ import org.apache.clerezza.rdf.core.Trip
import org.apache.clerezza.rdf.core.serializedform.Serializer;
import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
import org.apache.clerezza.rdf.rdfjson.serializer.RdfJsonSerializingProvider;
+import org.apache.felix.scr.annotations.Reference;
import org.apache.stanbol.commons.owl.transformation.OWLAPIToClerezzaConverter;
import org.apache.stanbol.commons.web.base.format.KRFormat;
-import org.apache.stanbol.rules.base.api.Recipe;
+//import org.apache.stanbol.rules.base.api.Recipe;
import org.apache.stanbol.rules.base.api.Rule;
import org.apache.stanbol.rules.base.api.RuleStore;
import org.apache.stanbol.rules.base.api.Symbols;
@@ -72,28 +73,29 @@ import org.slf4j.LoggerFactory;
KRFormat.TURTLE, KRFormat.RDF_JSON})
public class RuleListWriter implements MessageBodyWriter<RuleList> {
+ @Reference
protected Serializer serializer;
- protected ServletContext servletContext;
-
+// protected ServletContext servletContext;
+ @Reference
protected RuleStore ruleStore;
- public RuleListWriter(@Context ServletContext servletContext) {
- Logger log = LoggerFactory.getLogger(getClass());
- this.servletContext = servletContext;
- log.info("Setting context to " + servletContext);
- serializer = (Serializer)
this.servletContext.getAttribute(Serializer.class.getName());
- if (serializer == null) {
- log.error("Serializer not found in Servlet context.");
- serializer = new Serializer();
- }
-
- ruleStore = (RuleStore)
this.servletContext.getAttribute(RuleStore.class.getName());
-
- if (serializer == null) {
- log.error("RuleStore not found in Servlet context.");
- }
- }
+// public RuleListWriter() {
+// Logger log = LoggerFactory.getLogger(getClass());
+// this.servletContext = servletContext;
+// log.info("Setting context to " + servletContext);
+// serializer = (Serializer)
this.servletContext.getAttribute(Serializer.class.getName());
+// if (serializer == null) {
+// log.error("Serializer not found in Servlet context.");
+// serializer = new Serializer();
+// }
+
+// ruleStore = (RuleStore)
this.servletContext.getAttribute(RuleStore.class.getName());
+
+// if (serializer == null) {
+// log.error("RuleStore not found in Servlet context.");
+// }
+// }
@Override
public long getSize(RuleList arg0, Class<?> arg1, Type arg2, Annotation[]
arg3, MediaType arg4) {
