Author: reto
Date: Fri Nov 1 19:41:46 2013
New Revision: 1538043
URL: http://svn.apache.org/r1538043
Log:
STANBOL-1197: removed STANBOL-1073 work around and removed unused imports
Modified:
stanbol/trunk/commons/web/base.jersey/pom.xml
stanbol/trunk/commons/web/base.jersey/src/main/java/org/apache/stanbol/commons/web/base/jersey/DefaultApplication.java
stanbol/trunk/commons/web/base.jersey/src/main/java/org/apache/stanbol/commons/web/base/jersey/EditableLayoutConfiguration.java
stanbol/trunk/commons/web/base.jersey/src/main/java/org/apache/stanbol/commons/web/base/jersey/JerseyEndpoint.java
Modified: stanbol/trunk/commons/web/base.jersey/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/web/base.jersey/pom.xml?rev=1538043&r1=1538042&r2=1538043&view=diff
==============================================================================
--- stanbol/trunk/commons/web/base.jersey/pom.xml (original)
+++ stanbol/trunk/commons/web/base.jersey/pom.xml Fri Nov 1 19:41:46 2013
@@ -129,12 +129,6 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
-
- <!-- only for temporary workaround for STANBOL-1073, TODO: update zz
dependencies and remove -->
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.core</artifactId>
- </dependency>
<!-- for tests -->
<dependency>
<groupId>junit</groupId>
Modified:
stanbol/trunk/commons/web/base.jersey/src/main/java/org/apache/stanbol/commons/web/base/jersey/DefaultApplication.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/web/base.jersey/src/main/java/org/apache/stanbol/commons/web/base/jersey/DefaultApplication.java?rev=1538043&r1=1538042&r2=1538043&view=diff
==============================================================================
---
stanbol/trunk/commons/web/base.jersey/src/main/java/org/apache/stanbol/commons/web/base/jersey/DefaultApplication.java
(original)
+++
stanbol/trunk/commons/web/base.jersey/src/main/java/org/apache/stanbol/commons/web/base/jersey/DefaultApplication.java
Fri Nov 1 19:41:46 2013
@@ -16,17 +16,11 @@
*/
package org.apache.stanbol.commons.web.base.jersey;
-import java.util.ArrayList;
import java.util.HashSet;
-import java.util.List;
import java.util.Set;
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;
Modified:
stanbol/trunk/commons/web/base.jersey/src/main/java/org/apache/stanbol/commons/web/base/jersey/EditableLayoutConfiguration.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/web/base.jersey/src/main/java/org/apache/stanbol/commons/web/base/jersey/EditableLayoutConfiguration.java?rev=1538043&r1=1538042&r2=1538043&view=diff
==============================================================================
---
stanbol/trunk/commons/web/base.jersey/src/main/java/org/apache/stanbol/commons/web/base/jersey/EditableLayoutConfiguration.java
(original)
+++
stanbol/trunk/commons/web/base.jersey/src/main/java/org/apache/stanbol/commons/web/base/jersey/EditableLayoutConfiguration.java
Fri Nov 1 19:41:46 2013
@@ -16,20 +16,7 @@
package org.apache.stanbol.commons.web.base.jersey;
import java.util.List;
-import javax.ws.rs.core.UriBuilder;
-import org.apache.stanbol.commons.web.base.NavigationLink;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.UriBuilder;
-import javax.ws.rs.core.UriInfo;
-import org.apache.commons.lang.StringUtils;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Service;
import org.apache.stanbol.commons.web.base.LinkResource;
Modified:
stanbol/trunk/commons/web/base.jersey/src/main/java/org/apache/stanbol/commons/web/base/jersey/JerseyEndpoint.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/web/base.jersey/src/main/java/org/apache/stanbol/commons/web/base/jersey/JerseyEndpoint.java?rev=1538043&r1=1538042&r2=1538043&view=diff
==============================================================================
---
stanbol/trunk/commons/web/base.jersey/src/main/java/org/apache/stanbol/commons/web/base/jersey/JerseyEndpoint.java
(original)
+++
stanbol/trunk/commons/web/base.jersey/src/main/java/org/apache/stanbol/commons/web/base/jersey/JerseyEndpoint.java
Fri Nov 1 19:41:46 2013
@@ -36,7 +36,6 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.ReferencePolicy;
-import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.service.cm.ConfigurationException;
@@ -48,8 +47,6 @@ import org.slf4j.LoggerFactory;
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.LinkResource;
import org.apache.stanbol.commons.web.base.NavigationLink;
@@ -87,8 +84,6 @@ public class JerseyEndpoint {
@Property(value = "/static")
public static final String STATIC_RESOURCES_URL_ROOT_PROPERTY =
"org.apache.stanbol.commons.web.static.url";
- @Reference
- private Parser parser;
@Reference
private EditableLayoutConfiguration layoutConfiguration;
@@ -178,10 +173,6 @@ public class JerseyEndpoint {
//we have not yet been activated
return;
}
- //temporary workaround for STANBOL-1073
- InputStream in = new ByteArrayInputStream(
- "<http://example.org/me> <http://xmlns.com/foaf/0.1/name>
\"Jane Doe\" .".getBytes());
- parser.parse(in, "text/turtle");
//end of STANBOL-1073 work around
if (componentContext == null) {
log.debug(" ... can not init Jersey Endpoint - Component not yet
activated!");
