Author: reto
Date: Thu Jun 6 17:24:15 2013
New Revision: 1490366
URL: http://svn.apache.org/r1490366
Log:
STANBOL-1097: commons compiling again, temporarily disabled CORS support
Added:
stanbol/branches/commons-ng/commons/web/base.jersey/src/main/java/org/apache/stanbol/commons/web/base/jersey/DefaultApplication.java
- copied, changed from r1490284,
stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/DefaultApplication.java
stanbol/branches/commons-ng/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/SparqlMenuItem.java
Removed:
stanbol/branches/commons-ng/commons/jobs/web/src/main/java/org/apache/stanbol/commons/jobs/web/JobsFragment.java
stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/DefaultApplication.java
stanbol/branches/commons-ng/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/SparqlEndpointWebFragment.java
Modified:
stanbol/branches/commons-ng/commons/freemarker/pom.xml
stanbol/branches/commons-ng/commons/jobs/web/pom.xml
stanbol/branches/commons-ng/commons/jobs/web/src/main/java/org/apache/stanbol/commons/jobs/web/resources/JobsResource.java
stanbol/branches/commons-ng/commons/jobs/web/src/main/java/org/apache/stanbol/commons/jobs/web/writers/JobInfoWriter.java
stanbol/branches/commons-ng/commons/ldpathtemplate/pom.xml
stanbol/branches/commons-ng/commons/owl/pom.xml
stanbol/branches/commons-ng/commons/owl/src/main/java/org/apache/stanbol/commons/owl/web/OWLOntologyWriter.java
stanbol/branches/commons-ng/commons/security/usermanagement/pom.xml
stanbol/branches/commons-ng/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/resource/UserResource.java
stanbol/branches/commons-ng/commons/solr/web/pom.xml
stanbol/branches/commons-ng/commons/web/base.jersey/pom.xml
stanbol/branches/commons-ng/commons/web/base.jersey/src/main/java/org/apache/stanbol/commons/web/base/jersey/JerseyEndpoint.java
stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/readers/GraphReader.java
stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/writers/GraphWriter.java
stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/writers/ResultSetWriter.java
stanbol/branches/commons-ng/commons/web/home/pom.xml
stanbol/branches/commons-ng/commons/web/sparql/pom.xml
stanbol/branches/commons-ng/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/resource/SparqlEndpointResource.java
stanbol/branches/commons-ng/parent/pom.xml
Modified: stanbol/branches/commons-ng/commons/freemarker/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/freemarker/pom.xml?rev=1490366&r1=1490365&r2=1490366&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/freemarker/pom.xml (original)
+++ stanbol/branches/commons-ng/commons/freemarker/pom.xml Thu Jun 6 17:24:15
2013
@@ -42,7 +42,9 @@ from the bundles. More Freemarker utilit
</developerConnection>
<url>http://stanbol.apache.org/</url>
</scm>
-
+ <properties>
+ <freemarker-version>2.3.19</freemarker-version>
+ </properties>
<build>
<!-- make it an OSGi bundle -->
<plugins>
@@ -104,6 +106,7 @@ from the bundles. More Freemarker utilit
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
+ <version>${freemarker-version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Modified: stanbol/branches/commons-ng/commons/jobs/web/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/jobs/web/pom.xml?rev=1490366&r1=1490365&r2=1490366&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/jobs/web/pom.xml (original)
+++ stanbol/branches/commons-ng/commons/jobs/web/pom.xml Thu Jun 6 17:24:15
2013
@@ -27,7 +27,7 @@
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.jobs.web</artifactId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Commons Jobs Web</name>
@@ -68,7 +68,7 @@
<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>
<!-- specific deps for this project -->
Modified:
stanbol/branches/commons-ng/commons/jobs/web/src/main/java/org/apache/stanbol/commons/jobs/web/resources/JobsResource.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/jobs/web/src/main/java/org/apache/stanbol/commons/jobs/web/resources/JobsResource.java?rev=1490366&r1=1490365&r2=1490366&view=diff
==============================================================================
---
stanbol/branches/commons-ng/commons/jobs/web/src/main/java/org/apache/stanbol/commons/jobs/web/resources/JobsResource.java
(original)
+++
stanbol/branches/commons-ng/commons/jobs/web/src/main/java/org/apache/stanbol/commons/jobs/web/resources/JobsResource.java
Thu Jun 6 17:24:15 2013
@@ -25,7 +25,6 @@ import java.util.Set;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
-import javax.servlet.ServletContext;
import javax.ws.rs.DELETE;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
@@ -35,9 +34,12 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+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.base.ContextHelper;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
import org.apache.stanbol.commons.jobs.api.Job;
import org.apache.stanbol.commons.jobs.api.JobInfo;
@@ -54,23 +56,26 @@ import org.slf4j.LoggerFactory;
* @author enridaga
*
*/
+@Component
+@Service(Object.class)
+@Property(name = "javax.ws.rs", boolValue = true)
@Path("/jobs")
public class JobsResource extends BaseStanbolResource {
private Logger log = LoggerFactory.getLogger(getClass());
- private ServletContext context;
- private HttpHeaders headers;
+
+ @Context
+ protected HttpHeaders headers;
- private JobInfo info = null;
+ //private JobInfo info = null;
- public JobsResource(@Context ServletContext servletContext, @Context
HttpHeaders headers) {
- this.context = servletContext;
- this.headers = headers;
- }
+ @Reference
+ private JobManager jobManager;
+
- public JobInfo getJobInfo(){
+ /*public JobInfo getJobInfo(){
return info;
- }
+ }*/
@GET
public Response get(){
@@ -93,13 +98,14 @@ public class JobsResource extends BaseSt
return Response.status(Response.Status.BAD_REQUEST).build();
}
- JobManager m = getJobManager();
+ JobManager m = jobManager;
// If the job exists
if (m.hasJob(id)) {
log.info("Found job with id {}", id);
Future<?> f = m.ping(id);
- this.info = new JobInfoImpl();
+ //this.info = new JobInfoImpl();
+ JobInfo info = new JobInfoImpl();
if(f.isDone()){
// The job is finished
if(f.isCancelled()){
@@ -164,7 +170,7 @@ public class JobsResource extends BaseSt
log.info("Called DELETE ({})", jid);
if(!jid.equals("")){
log.info("Looking for test job {}", jid);
- JobManager m = getJobManager();
+ JobManager m = jobManager;
// If the job exists
if (m.hasJob(jid)){
@@ -188,7 +194,7 @@ public class JobsResource extends BaseSt
@DELETE
public Response delete(){
log.info("Called DELETE all jobs");
- JobManager manager = getJobManager();
+ JobManager manager = jobManager;
manager.removeAll();
return Response.ok("All jobs have been deleted.").build();
}
@@ -208,7 +214,7 @@ public class JobsResource extends BaseSt
// If an Id have been provided, check whether the job has finished and
return the result
if(!jid.equals("")){
log.info("Looking for test job {}", jid);
- JobManager m = getJobManager();
+ JobManager m = jobManager;
// Remove first slash from param value
jid = jid.substring(1);
@@ -255,7 +261,7 @@ public class JobsResource extends BaseSt
}
}else{
// No id have been provided, we create a new test job
- JobManager m = getJobManager();
+ JobManager m = jobManager;
String id = m.execute(new Job() {
@Override
public JobResult call() throws Exception {
@@ -292,13 +298,5 @@ public class JobsResource extends BaseSt
}
}
- /**
- * Gets the job manager
- *
- * @return
- */
- private JobManager getJobManager() {
- log.debug("(getJobManager()) ");
- return (JobManager)
ContextHelper.getServiceFromContext(JobManager.class, this.context);
- }
+
}
Modified:
stanbol/branches/commons-ng/commons/jobs/web/src/main/java/org/apache/stanbol/commons/jobs/web/writers/JobInfoWriter.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/jobs/web/src/main/java/org/apache/stanbol/commons/jobs/web/writers/JobInfoWriter.java?rev=1490366&r1=1490365&r2=1490366&view=diff
==============================================================================
---
stanbol/branches/commons-ng/commons/jobs/web/src/main/java/org/apache/stanbol/commons/jobs/web/writers/JobInfoWriter.java
(original)
+++
stanbol/branches/commons-ng/commons/jobs/web/src/main/java/org/apache/stanbol/commons/jobs/web/writers/JobInfoWriter.java
Thu Jun 6 17:24:15 2013
@@ -30,6 +30,9 @@ import javax.ws.rs.ext.MessageBodyWriter
import javax.ws.rs.ext.Provider;
import org.apache.commons.io.IOUtils;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Service;
import org.apache.stanbol.commons.jobs.api.JobInfo;
import org.apache.stanbol.commons.jobs.impl.JobInfoImpl;
@@ -39,6 +42,9 @@ import org.apache.stanbol.commons.jobs.i
* @author enridaga
*
*/
+@Component
+@Service(Object.class)
+@Property(name = "javax.ws.rs", boolValue = true)
@Provider
@Produces({"application/json","text/plain"})
public class JobInfoWriter implements MessageBodyWriter<JobInfo> {
Modified: stanbol/branches/commons-ng/commons/ldpathtemplate/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/ldpathtemplate/pom.xml?rev=1490366&r1=1490365&r2=1490366&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/ldpathtemplate/pom.xml (original)
+++ stanbol/branches/commons-ng/commons/ldpathtemplate/pom.xml Thu Jun 6
17:24:15 2013
@@ -72,6 +72,7 @@
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
+ <version>2.3.19</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
Modified: stanbol/branches/commons-ng/commons/owl/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/owl/pom.xml?rev=1490366&r1=1490365&r2=1490366&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/owl/pom.xml (original)
+++ stanbol/branches/commons-ng/commons/owl/pom.xml Thu Jun 6 17:24:15 2013
@@ -128,7 +128,7 @@
<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>
<!-- OWL deps -->
Modified:
stanbol/branches/commons-ng/commons/owl/src/main/java/org/apache/stanbol/commons/owl/web/OWLOntologyWriter.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/owl/src/main/java/org/apache/stanbol/commons/owl/web/OWLOntologyWriter.java?rev=1490366&r1=1490365&r2=1490366&view=diff
==============================================================================
---
stanbol/branches/commons-ng/commons/owl/src/main/java/org/apache/stanbol/commons/owl/web/OWLOntologyWriter.java
(original)
+++
stanbol/branches/commons-ng/commons/owl/src/main/java/org/apache/stanbol/commons/owl/web/OWLOntologyWriter.java
Thu Jun 6 17:24:15 2013
@@ -41,7 +41,6 @@ import java.io.OutputStream;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
-import javax.servlet.ServletContext;
import javax.ws.rs.Produces;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Context;
@@ -56,6 +55,10 @@ import org.apache.clerezza.rdf.core.seri
import org.apache.clerezza.rdf.core.serializedform.SerializingProvider;
import org.apache.clerezza.rdf.jena.serializer.JenaSerializerProvider;
import org.apache.clerezza.rdf.rdfjson.serializer.RdfJsonSerializingProvider;
+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.owl.transformation.OWLAPIToClerezzaConverter;
import org.coode.owlapi.manchesterowlsyntax.ManchesterOWLSyntaxOntologyFormat;
import org.coode.owlapi.turtle.TurtleOntologyFormat;
@@ -70,25 +73,17 @@ import org.semanticweb.owlapi.model.OWLO
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Component
+@Service(Object.class)
+@Property(name = "javax.ws.rs", boolValue = true)
@Provider
@Produces({RDF_XML, OWL_XML, MANCHESTER_OWL, FUNCTIONAL_OWL, TURTLE, X_TURTLE,
N3, N_TRIPLE, RDF_JSON,
TEXT_PLAIN})
public class OWLOntologyWriter implements MessageBodyWriter<OWLOntology> {
+ @Reference
protected Serializer serializer;
- protected ServletContext servletContext;
-
- public OWLOntologyWriter(@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.info("Serializer not found in Servlet context.");
- serializer = new Serializer();
- }
- }
@Override
public long getSize(OWLOntology arg0, Class<?> arg1, Type arg2,
Annotation[] arg3, MediaType arg4) {
Modified: stanbol/branches/commons-ng/commons/security/usermanagement/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/security/usermanagement/pom.xml?rev=1490366&r1=1490365&r2=1490366&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/security/usermanagement/pom.xml
(original)
+++ stanbol/branches/commons-ng/commons/security/usermanagement/pom.xml Thu Jun
6 17:24:15 2013
@@ -111,10 +111,6 @@
<artifactId>org.apache.stanbol.commons.ldpathtemplate</artifactId>
<version>0.12.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>com.sun.jersey.contribs</groupId>
- <artifactId>jersey-multipart</artifactId>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified:
stanbol/branches/commons-ng/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/resource/UserResource.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/resource/UserResource.java?rev=1490366&r1=1490365&r2=1490366&view=diff
==============================================================================
---
stanbol/branches/commons-ng/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/resource/UserResource.java
(original)
+++
stanbol/branches/commons-ng/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/resource/UserResource.java
Thu Jun 6 17:24:15 2013
@@ -16,7 +16,6 @@
*/
package org.apache.stanbol.commons.usermanagement.resource;
-import com.sun.jersey.multipart.FormDataParam;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
Modified: stanbol/branches/commons-ng/commons/solr/web/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/solr/web/pom.xml?rev=1490366&r1=1490365&r2=1490366&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/solr/web/pom.xml (original)
+++ stanbol/branches/commons-ng/commons/solr/web/pom.xml Thu Jun 6 17:24:15
2013
@@ -114,12 +114,8 @@
<version>0.11.0</version>
</dependency>
<dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: stanbol/branches/commons-ng/commons/web/base.jersey/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/web/base.jersey/pom.xml?rev=1490366&r1=1490365&r2=1490366&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/web/base.jersey/pom.xml (original)
+++ stanbol/branches/commons-ng/commons/web/base.jersey/pom.xml Thu Jun 6
17:24:15 2013
@@ -27,7 +27,7 @@
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.base.jersey</artifactId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Commons Web Base Jersey</name>
@@ -97,23 +97,29 @@
<dependencies>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <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>
<!-- Jersey -->
<dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-servlet</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
+ <groupId>org.glassfish.jersey.containers</groupId>
+ <!-- if your container implements Servlet API older than 3.0,
+ use "jersey-container-servlet-core", otherwise
+ "jersey-container-servlet" -->
+ <artifactId>jersey-container-servlet-core</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <!-- jersey depends on unavailable version -->
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.2-b04</version>
</dependency>
<!-- <dependency>
<groupId>com.sun.jersey</groupId>
@@ -139,13 +145,11 @@
<artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
- <!-- Jetty -->
+ <!-- only for temporary workaround for STANBOL-1073, TODO: update zz
dependencies and remove -->
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>rdf.core</artifactId>
</dependency>
-
<!-- for tests -->
<dependency>
<groupId>junit</groupId>
Copied:
stanbol/branches/commons-ng/commons/web/base.jersey/src/main/java/org/apache/stanbol/commons/web/base/jersey/DefaultApplication.java
(from r1490284,
stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/DefaultApplication.java)
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/web/base.jersey/src/main/java/org/apache/stanbol/commons/web/base/jersey/DefaultApplication.java?p2=stanbol/branches/commons-ng/commons/web/base.jersey/src/main/java/org/apache/stanbol/commons/web/base/jersey/DefaultApplication.java&p1=stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/DefaultApplication.java&r1=1490284&r2=1490366&rev=1490366&view=diff
==============================================================================
---
stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/DefaultApplication.java
(original)
+++
stanbol/branches/commons-ng/commons/web/base.jersey/src/main/java/org/apache/stanbol/commons/web/base/jersey/DefaultApplication.java
Thu Jun 6 17:24:15 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.commons.web.base;
+package org.apache.stanbol.commons.web.base.jersey;
import java.util.ArrayList;
import java.util.HashSet;
@@ -26,6 +26,7 @@ import javax.ws.rs.core.Application;
import org.apache.stanbol.commons.web.base.writers.GraphWriter;
import org.apache.stanbol.commons.web.base.writers.JenaModelWriter;
import org.apache.stanbol.commons.web.base.writers.ResultSetWriter;
+import org.glassfish.jersey.server.ResourceConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -48,11 +49,11 @@ public class DefaultApplication extends
Set<Class<?>> classes = new HashSet<Class<?>>();
// resources contributed buy other bundles
classes.addAll(contributedClasses);
-
+ //TODO check if clerezza rdf.jaxrs prvoder fits the purpose
// message body writers, hard-coded for now
- classes.add(GraphWriter.class);
- classes.add(JenaModelWriter.class);
- classes.add(ResultSetWriter.class);
+ //classes.add(GraphWriter.class);
+ //classes.add(JenaModelWriter.class);
+ //classes.add(ResultSetWriter.class);
return classes;
}
Modified:
stanbol/branches/commons-ng/commons/web/base.jersey/src/main/java/org/apache/stanbol/commons/web/base/jersey/JerseyEndpoint.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/web/base.jersey/src/main/java/org/apache/stanbol/commons/web/base/jersey/JerseyEndpoint.java?rev=1490366&r1=1490365&r2=1490366&view=diff
==============================================================================
---
stanbol/branches/commons-ng/commons/web/base.jersey/src/main/java/org/apache/stanbol/commons/web/base/jersey/JerseyEndpoint.java
(original)
+++
stanbol/branches/commons-ng/commons/web/base.jersey/src/main/java/org/apache/stanbol/commons/web/base/jersey/JerseyEndpoint.java
Thu Jun 6 17:24:15 2013
@@ -46,17 +46,17 @@ import org.osgi.service.http.NamespaceEx
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.sun.jersey.spi.container.servlet.ServletContainer;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.Collection;
import org.apache.clerezza.rdf.core.serializedform.Parser;
import org.apache.felix.scr.annotations.References;
-import org.apache.stanbol.commons.web.base.DefaultApplication;
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.glassfish.jersey.server.ResourceConfig;
+import org.glassfish.jersey.servlet.ServletContainer;
/**
* Jersey-based RESTful endpoint for the Stanbol Enhancer engines and store.
@@ -212,7 +212,8 @@ public class JerseyEndpoint {
Collections.sort(navigationLinks);
// bind the aggregate JAX-RS application to a dedicated servlet
- ServletContainer container = new ServletContainer(app);
+ ServletContainer container = new ServletContainer(
+ ResourceConfig.forApplication(app));
Bundle appBundle = componentContext.getBundleContext().getBundle();
httpService.registerServlet(applicationAlias, container,
getInitParams(), null);
registeredAliases.add(applicationAlias);
Modified:
stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/readers/GraphReader.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/readers/GraphReader.java?rev=1490366&r1=1490365&r2=1490366&view=diff
==============================================================================
---
stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/readers/GraphReader.java
(original)
+++
stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/readers/GraphReader.java
Thu Jun 6 17:24:15 2013
@@ -49,6 +49,7 @@ import org.apache.felix.scr.annotations.
* JAX-RS provider that parses RDF by using the OSGi parsing service
*/
//TODO make it a service/component
+//TODO check if clerezza rdf.jaxrs prvoder fits the purpose?
@Provider
public class GraphReader implements MessageBodyReader<Graph> {
Modified:
stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/writers/GraphWriter.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/writers/GraphWriter.java?rev=1490366&r1=1490365&r2=1490366&view=diff
==============================================================================
---
stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/writers/GraphWriter.java
(original)
+++
stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/writers/GraphWriter.java
Thu Jun 6 17:24:15 2013
@@ -46,6 +46,7 @@ import org.apache.felix.scr.annotations.
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+//TODO check if clerezza rdf.jaxrs prvoder fits the purpose?
//TODO make it a service/component
@Provider
// @Produces({TEXT_PLAIN, N3, N_TRIPLE, RDF_XML, TURTLE, X_TURTLE, RDF_JSON,
APPLICATION_JSON})
Modified:
stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/writers/ResultSetWriter.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/writers/ResultSetWriter.java?rev=1490366&r1=1490365&r2=1490366&view=diff
==============================================================================
---
stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/writers/ResultSetWriter.java
(original)
+++
stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/writers/ResultSetWriter.java
Thu Jun 6 17:24:15 2013
@@ -55,6 +55,8 @@ import org.w3c.dom.Document;
* Clerezza does provide such a writer, but it seems to require
* quite a lot of Clerezza dependencies that we don't really need.
*/
+//TODO check if clerezza rdf.jaxrs prvoder fits the purpose?
+//make component/service
@Provider
//@Produces({"application/sparql-results+xml", "application/xml", "text/xml"})
public class ResultSetWriter implements MessageBodyWriter<ResultSet> {
Modified: stanbol/branches/commons-ng/commons/web/home/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/web/home/pom.xml?rev=1490366&r1=1490365&r2=1490366&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/web/home/pom.xml (original)
+++ stanbol/branches/commons-ng/commons/web/home/pom.xml Thu Jun 6 17:24:15
2013
@@ -89,7 +89,7 @@
<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>
@@ -105,7 +105,6 @@
<artifactId>commons-lang</artifactId>
</dependency>
- <!-- Jersey, servlet and freemarker -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.viewable</artifactId>
Modified: stanbol/branches/commons-ng/commons/web/sparql/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/web/sparql/pom.xml?rev=1490366&r1=1490365&r2=1490366&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/web/sparql/pom.xml (original)
+++ stanbol/branches/commons-ng/commons/web/sparql/pom.xml Thu Jun 6 17:24:15
2013
@@ -27,7 +27,7 @@
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.sparql</artifactId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Commons Web SPARQL</name>
@@ -76,7 +76,7 @@
<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>
<!-- Jersey and servlet -->
@@ -85,25 +85,10 @@
<artifactId>org.apache.stanbol.commons.web.viewable</artifactId>
<version>0.11.0</version>
</dependency>
+
<dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- </dependency>
- <!-- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-json</artifactId>
- </dependency> -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
</dependency>
<!-- generic tax -->
Added:
stanbol/branches/commons-ng/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/SparqlMenuItem.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/SparqlMenuItem.java?rev=1490366&view=auto
==============================================================================
---
stanbol/branches/commons-ng/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/SparqlMenuItem.java
(added)
+++
stanbol/branches/commons-ng/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/SparqlMenuItem.java
Thu Jun 6 17:24:15 2013
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2013 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.stanbol.commons.web.sparql;
+
+import org.apache.stanbol.commons.web.base.NavigationLink;
+
+/**
+ *
+ */
+public class SparqlMenuItem extends NavigationLink {
+
+ private static final String htmlDescription = "This is the <strong>SPARQL
endpoint</strong> for the Stanbol store."+
+ "<a
href=\"http://en.wikipedia.org/wiki/Sparql\";>SPARQL</a> is the"+
+ "standard query language the most commonly used to
provide interactive"+
+ "access to semantic knowledge bases.";
+
+ public SparqlMenuItem() {
+ super("sparql", "/sparql", htmlDescription , 50);
+ }
+
+}
\ No newline at end of file
Modified:
stanbol/branches/commons-ng/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/resource/SparqlEndpointResource.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/resource/SparqlEndpointResource.java?rev=1490366&r1=1490365&r2=1490366&view=diff
==============================================================================
---
stanbol/branches/commons-ng/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/resource/SparqlEndpointResource.java
(original)
+++
stanbol/branches/commons-ng/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/resource/SparqlEndpointResource.java
Thu Jun 6 17:24:15 2013
@@ -18,8 +18,6 @@ package org.apache.stanbol.commons.web.s
import static javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED;
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 java.util.ArrayList;
import java.util.Arrays;
@@ -27,11 +25,9 @@ import java.util.Comparator;
import java.util.LinkedHashMap;
import java.util.List;
-import javax.servlet.ServletContext;
import javax.ws.rs.Consumes;
import javax.ws.rs.FormParam;
import javax.ws.rs.GET;
-import javax.ws.rs.OPTIONS;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
@@ -50,8 +46,12 @@ import org.apache.clerezza.rdf.core.spar
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.base.ContextHelper;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
@@ -78,6 +78,9 @@ import org.osgi.framework.ServiceReferen
* </p>
*
*/
+@Component
+@Service(Object.class)
+@Property(name = "javax.ws.rs", boolValue = true)
@Path("/sparql")
public class SparqlEndpointResource extends BaseStanbolResource {
@@ -104,23 +107,25 @@ public class SparqlEndpointResource exte
};
- private ServletContext servletContext;
-
+ @Reference
protected TcManager tcManager;
private static final String GRAPH_URI = "graph.uri";
+ private BundleContext bundleContext;
+
- public SparqlEndpointResource(@Context ServletContext servletContext) {
- this.tcManager = ContextHelper.getServiceFromContext(TcManager.class,
servletContext);
- this.servletContext = servletContext;
+ @Activate
+ protected void activate(BundleContext bundleContext) {
+ this.bundleContext = bundleContext;
}
- @OPTIONS
+ //TODO re-enable
+ /*@OPTIONS
public Response handleCorsPreflight(@Context HttpHeaders headers) {
ResponseBuilder res = Response.ok();
enableCORS(servletContext, res, headers);
return res.build();
- }
+ }*/
/**
* HTTP GET service to execute SPARQL queries on {@link TripleCollection}s
registered to OSGi environment.
@@ -165,7 +170,7 @@ public class SparqlEndpointResource exte
rb = Response.status(Status.NOT_FOUND).entity(
String.format("There is no registered graph with given uri:
%s", graphUri));
}
- addCORSOrigin(servletContext, rb, headers);
+ //addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -210,7 +215,6 @@ public class SparqlEndpointResource exte
private LinkedHashMap<ServiceReference,TripleCollection>
getServices(String graphUri) throws InvalidSyntaxException {
LinkedHashMap<ServiceReference,TripleCollection> registeredGraphs =
new LinkedHashMap<ServiceReference,TripleCollection>();
- BundleContext bundleContext =
ContextHelper.getBundleContext(servletContext);
ServiceReference[] refs =
bundleContext.getServiceReferences(TripleCollection.class.getName(),
getFilter(graphUri));
if (refs != null) {
Modified: stanbol/branches/commons-ng/parent/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/parent/pom.xml?rev=1490366&r1=1490365&r2=1490366&view=diff
==============================================================================
--- stanbol/branches/commons-ng/parent/pom.xml (original)
+++ stanbol/branches/commons-ng/parent/pom.xml Thu Jun 6 17:24:15 2013
@@ -609,6 +609,11 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
+ <artifactId>jaxrs.utils</artifactId>
+ <version>0.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
<artifactId>rdf.metadata</artifactId>
<version>0.1-incubating</version>
</dependency>
@@ -829,7 +834,6 @@
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>2.0</version>
- <scope>provided</scope>
</dependency>
<!-- Freemarker -->
