You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by re...@apache.org on 2012/11/29 19:36:15 UTC
svn commit: r1415312 [1/2] - in /stanbol/trunk: cmsadapter/web/
cmsadapter/web/src/main/java/org/apache/stanbol/cmsadapter/web/resources/
commons/jobs/web/
commons/jobs/web/src/main/java/org/apache/stanbol/commons/jobs/web/resources/
commons/ldtemplate...
Author: reto
Date: Thu Nov 29 18:36:05 2012
New Revision: 1415312
URL: http://svn.apache.org/viewvc?rev=1415312&view=rev
Log:
STANBOL-742: cleanup and renaming LdViewable to RdfViewable as this class is independent of the templating mechanism used
Added:
stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/viewable/
stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/viewable/RdfViewable.java
- copied, changed from r1414940, stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/ldviewable/LdViewable.java
stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/viewable/Viewable.java
- copied, changed from r1414940, stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/ldviewable/Viewable.java
stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/viewable/mbw/
stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/viewable/mbw/LdViewableWriter.java
- copied, changed from r1414940, stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/ldviewable/mbw/LdViewableWriter.java
stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/viewable/mbw/ViewableWriter.java
- copied, changed from r1415062, stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/ldviewable/mbw/ViewableWriter.java
stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/viewable/webfragment/
stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/viewable/webfragment/LdViewableWebFragment.java
- copied, changed from r1414940, stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/ldviewable/webfragment/LdViewableWebFragment.java
Removed:
stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/ldviewable/LdViewable.java
stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/ldviewable/Viewable.java
stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/ldviewable/mbw/LdViewableWriter.java
stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/ldviewable/mbw/ViewableWriter.java
stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/ldviewable/webfragment/LdViewableWebFragment.java
Modified:
stanbol/trunk/cmsadapter/web/pom.xml
stanbol/trunk/cmsadapter/web/src/main/java/org/apache/stanbol/cmsadapter/web/resources/ContenthubFeedResource.java
stanbol/trunk/cmsadapter/web/src/main/java/org/apache/stanbol/cmsadapter/web/resources/RDFMapperResource.java
stanbol/trunk/cmsadapter/web/src/main/java/org/apache/stanbol/cmsadapter/web/resources/RootResource.java
stanbol/trunk/cmsadapter/web/src/main/java/org/apache/stanbol/cmsadapter/web/resources/SessionResource.java
stanbol/trunk/commons/jobs/web/pom.xml
stanbol/trunk/commons/jobs/web/src/main/java/org/apache/stanbol/commons/jobs/web/resources/JobsResource.java
stanbol/trunk/commons/ldtemplaterenderer/src/main/java/org/apache/stanbol/commons/ldpathtemplate/LdRenderer.java
stanbol/trunk/commons/security/usermanagement/pom.xml
stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/resource/UserResource.java
stanbol/trunk/commons/solr/web/pom.xml
stanbol/trunk/commons/web/home/pom.xml
stanbol/trunk/commons/web/home/src/main/java/org/apache/stanbol/commons/web/home/resource/StanbolRootResource.java
stanbol/trunk/commons/web/ldviewable/pom.xml
stanbol/trunk/commons/web/sparql/pom.xml
stanbol/trunk/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/resource/SparqlEndpointResource.java
stanbol/trunk/contenthub/web/pom.xml
stanbol/trunk/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/ContentItemResource.java
stanbol/trunk/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/FeaturedSearchResource.java
stanbol/trunk/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/SemanticIndexManagerResource.java
stanbol/trunk/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/StoreResource.java
stanbol/trunk/demos/webvie/pom.xml
stanbol/trunk/demos/webvie/src/main/java/org/apache/stanbol/commons/web/vie/resource/EnhancerVieRootResource.java
stanbol/trunk/enhancer/jersey/pom.xml
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerUiResource.java
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource.java
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEngineResource.java
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEnginesRootResource.java
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource.java
stanbol/trunk/enhancer/topic-web/pom.xml
stanbol/trunk/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicClassifierRootResource.java
stanbol/trunk/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicModelResource.java
stanbol/trunk/entityhub/jersey/pom.xml
stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/EntityhubRootResource.java
stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/ReferencedSiteRootResource.java
stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/SiteManagerRootResource.java
stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/BaseGoogleRefineReconcileResource.java
stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/utils/LDPathHelper.java
stanbol/trunk/factstore/factstore/pom.xml
stanbol/trunk/factstore/factstore/src/main/java/org/apache/stanbol/factstore/web/resource/FactStoreRootResource.java
stanbol/trunk/factstore/factstore/src/main/java/org/apache/stanbol/factstore/web/resource/FactsResource.java
stanbol/trunk/integration-tests/pom.xml
stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
stanbol/trunk/ontologymanager/web/pom.xml
stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntoNetRootResource.java
stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/RegistryManagerResource.java
stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeManagerResource.java
stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java
stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionManagerResource.java
stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java
stanbol/trunk/parent/pom.xml
stanbol/trunk/reasoners/web/pom.xml
stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/JobsResource.java
stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource.java
stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServicesResource.java
stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/utils/ResponseTaskBuilder.java
stanbol/trunk/rules/web/pom.xml
stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RulesResource.java
Modified: stanbol/trunk/cmsadapter/web/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/cmsadapter/web/pom.xml?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/cmsadapter/web/pom.xml (original)
+++ stanbol/trunk/cmsadapter/web/pom.xml Thu Nov 29 18:36:05 2012
@@ -74,7 +74,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.ldviewable</artifactId>
+ <artifactId>org.apache.stanbol.commons.viewable</artifactId>
</dependency>
<!-- Jersey -->
<dependency>
Modified: stanbol/trunk/cmsadapter/web/src/main/java/org/apache/stanbol/cmsadapter/web/resources/ContenthubFeedResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/cmsadapter/web/src/main/java/org/apache/stanbol/cmsadapter/web/resources/ContenthubFeedResource.java?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/cmsadapter/web/src/main/java/org/apache/stanbol/cmsadapter/web/resources/ContenthubFeedResource.java (original)
+++ stanbol/trunk/cmsadapter/web/src/main/java/org/apache/stanbol/cmsadapter/web/resources/ContenthubFeedResource.java Thu Nov 29 18:36:05 2012
@@ -48,10 +48,10 @@ import org.apache.stanbol.cmsadapter.ser
import org.apache.stanbol.cmsadapter.servicesapi.mapping.ContenthubFeederException;
import org.apache.stanbol.cmsadapter.servicesapi.repository.RepositoryAccessException;
import org.apache.stanbol.cmsadapter.web.utils.RestUtil;
+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.ldviewable.Viewable;
/**
* This resource provides services to submit content repository objects into Contenthub component. Submitted
Modified: stanbol/trunk/cmsadapter/web/src/main/java/org/apache/stanbol/cmsadapter/web/resources/RDFMapperResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/cmsadapter/web/src/main/java/org/apache/stanbol/cmsadapter/web/resources/RDFMapperResource.java?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/cmsadapter/web/src/main/java/org/apache/stanbol/cmsadapter/web/resources/RDFMapperResource.java (original)
+++ stanbol/trunk/cmsadapter/web/src/main/java/org/apache/stanbol/cmsadapter/web/resources/RDFMapperResource.java Thu Nov 29 18:36:05 2012
@@ -57,12 +57,12 @@ import org.apache.stanbol.cmsadapter.ser
import org.apache.stanbol.cmsadapter.servicesapi.mapping.RDFMapper;
import org.apache.stanbol.cmsadapter.servicesapi.repository.RepositoryAccessException;
import org.apache.stanbol.cmsadapter.web.utils.RestUtil;
+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.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.stanbol.commons.ldviewable.Viewable;
import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
Modified: stanbol/trunk/cmsadapter/web/src/main/java/org/apache/stanbol/cmsadapter/web/resources/RootResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/cmsadapter/web/src/main/java/org/apache/stanbol/cmsadapter/web/resources/RootResource.java?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/cmsadapter/web/src/main/java/org/apache/stanbol/cmsadapter/web/resources/RootResource.java (original)
+++ stanbol/trunk/cmsadapter/web/src/main/java/org/apache/stanbol/cmsadapter/web/resources/RootResource.java Thu Nov 29 18:36:05 2012
@@ -29,9 +29,9 @@ import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.ResponseBuilder;
+import org.apache.stanbol.commons.viewable.Viewable;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
-import org.apache.stanbol.commons.ldviewable.Viewable;
@Path("/cmsadapter")
public class RootResource extends BaseStanbolResource {
Modified: stanbol/trunk/cmsadapter/web/src/main/java/org/apache/stanbol/cmsadapter/web/resources/SessionResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/cmsadapter/web/src/main/java/org/apache/stanbol/cmsadapter/web/resources/SessionResource.java?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/cmsadapter/web/src/main/java/org/apache/stanbol/cmsadapter/web/resources/SessionResource.java (original)
+++ stanbol/trunk/cmsadapter/web/src/main/java/org/apache/stanbol/cmsadapter/web/resources/SessionResource.java Thu Nov 29 18:36:05 2012
@@ -36,10 +36,10 @@ import javax.ws.rs.core.Response.Status;
import org.apache.stanbol.cmsadapter.core.repository.SessionManager;
import org.apache.stanbol.cmsadapter.servicesapi.repository.RepositoryAccessException;
import org.apache.stanbol.cmsadapter.web.utils.RestUtil;
+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.ldviewable.Viewable;
/**
* Resource providing services for session management
Modified: stanbol/trunk/commons/jobs/web/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/jobs/web/pom.xml?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/commons/jobs/web/pom.xml (original)
+++ stanbol/trunk/commons/jobs/web/pom.xml Thu Nov 29 18:36:05 2012
@@ -83,7 +83,7 @@
<!-- specific deps for this project -->
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.ldviewable</artifactId>
+ <artifactId>org.apache.stanbol.commons.viewable</artifactId>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
Modified: stanbol/trunk/commons/jobs/web/src/main/java/org/apache/stanbol/commons/jobs/web/resources/JobsResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/jobs/web/src/main/java/org/apache/stanbol/commons/jobs/web/resources/JobsResource.java?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/commons/jobs/web/src/main/java/org/apache/stanbol/commons/jobs/web/resources/JobsResource.java (original)
+++ stanbol/trunk/commons/jobs/web/src/main/java/org/apache/stanbol/commons/jobs/web/resources/JobsResource.java Thu Nov 29 18:36:05 2012
@@ -36,6 +36,7 @@ import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+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;
@@ -46,7 +47,6 @@ import org.apache.stanbol.commons.jobs.i
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.stanbol.commons.ldviewable.Viewable;
/**
* Manages Background Jobs
Modified: stanbol/trunk/commons/ldtemplaterenderer/src/main/java/org/apache/stanbol/commons/ldpathtemplate/LdRenderer.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/ldtemplaterenderer/src/main/java/org/apache/stanbol/commons/ldpathtemplate/LdRenderer.java?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/commons/ldtemplaterenderer/src/main/java/org/apache/stanbol/commons/ldpathtemplate/LdRenderer.java (original)
+++ stanbol/trunk/commons/ldtemplaterenderer/src/main/java/org/apache/stanbol/commons/ldpathtemplate/LdRenderer.java Thu Nov 29 18:36:05 2012
@@ -162,6 +162,8 @@ public class LdRenderer {
*/
public void renderPojo(Object pojo, final String templatePath, Writer out) {
Configuration freemarker= new Configuration();
+ freemarker.setDefaultEncoding("utf-8");
+ freemarker.setOutputEncoding("utf-8");
freemarker.setObjectWrapper(new DefaultObjectWrapper());
freemarker.setTemplateLoader(templateLoader);
try {
Modified: stanbol/trunk/commons/security/usermanagement/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/security/usermanagement/pom.xml?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/commons/security/usermanagement/pom.xml (original)
+++ stanbol/trunk/commons/security/usermanagement/pom.xml Thu Nov 29 18:36:05 2012
@@ -97,7 +97,7 @@
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.ldviewable</artifactId>
+ <artifactId>org.apache.stanbol.commons.viewable</artifactId>
<version>0.10.0-SNAPSHOT</version>
</dependency>
Modified: stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/resource/UserResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/resource/UserResource.java?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/resource/UserResource.java (original)
+++ stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/resource/UserResource.java Thu Nov 29 18:36:05 2012
@@ -45,9 +45,9 @@ import org.apache.clerezza.rdf.utils.MGr
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.ldviewable.LdViewable;
import org.apache.clerezza.rdf.ontologies.PERMISSION;
import org.apache.stanbol.commons.security.PasswordUtil;
+import org.apache.stanbol.commons.viewable.RdfViewable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -77,20 +77,20 @@ public class UserResource {
@GET
@Path("users")
- public LdViewable listUsers(){
- return new LdViewable("listUser.ftl", getUserType(), this.getClass());
+ public RdfViewable listUsers(){
+ return new RdfViewable("listUser.ftl", getUserType(), this.getClass());
}
@GET
@Path("user/{username}")
- public LdViewable editUser(@PathParam("username") String userName) {
- return new LdViewable("editUser.ftl", getUser(userName), this.getClass());
+ public RdfViewable editUser(@PathParam("username") String userName) {
+ return new RdfViewable("editUser.ftl", getUser(userName), this.getClass());
}
@GET
@Path("view-user")
- public LdViewable viewUser(@QueryParam("userName") String userName) {
- return new LdViewable("edit.ftl", getUser(userName), this.getClass());
+ public RdfViewable viewUser(@QueryParam("userName") String userName) {
+ return new RdfViewable("edit.ftl", getUser(userName), this.getClass());
}
/**
Modified: stanbol/trunk/commons/solr/web/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/web/pom.xml?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/commons/solr/web/pom.xml (original)
+++ stanbol/trunk/commons/solr/web/pom.xml Thu Nov 29 18:36:05 2012
@@ -113,7 +113,7 @@
<!-- Web dependencies -->
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.ldviewable</artifactId>
+ <artifactId>org.apache.stanbol.commons.viewable</artifactId>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
Modified: stanbol/trunk/commons/web/home/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/web/home/pom.xml?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/commons/web/home/pom.xml (original)
+++ stanbol/trunk/commons/web/home/pom.xml Thu Nov 29 18:36:05 2012
@@ -107,7 +107,7 @@
<!-- Jersey, servlet and freemarker -->
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.ldviewable</artifactId>
+ <artifactId>org.apache.stanbol.commons.viewable</artifactId>
</dependency>
<!-- <dependency>
<groupId>com.sun.jersey</groupId>
Modified: stanbol/trunk/commons/web/home/src/main/java/org/apache/stanbol/commons/web/home/resource/StanbolRootResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/web/home/src/main/java/org/apache/stanbol/commons/web/home/resource/StanbolRootResource.java?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/commons/web/home/src/main/java/org/apache/stanbol/commons/web/home/resource/StanbolRootResource.java (original)
+++ stanbol/trunk/commons/web/home/src/main/java/org/apache/stanbol/commons/web/home/resource/StanbolRootResource.java Thu Nov 29 18:36:05 2012
@@ -23,7 +23,7 @@ import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.Response;
-import org.apache.stanbol.commons.ldviewable.Viewable;
+import org.apache.stanbol.commons.viewable.Viewable;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
Modified: stanbol/trunk/commons/web/ldviewable/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/web/ldviewable/pom.xml?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/commons/web/ldviewable/pom.xml (original)
+++ stanbol/trunk/commons/web/ldviewable/pom.xml Thu Nov 29 18:36:05 2012
@@ -27,12 +27,12 @@
</parent>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.ldviewable</artifactId>
+ <artifactId>org.apache.stanbol.commons.viewable</artifactId>
<version>0.10.0-SNAPSHOT</version>
<packaging>bundle</packaging>
- <name>Apache Stanbol LDPath Template Viewable</name>
- <description>A service providing a message body writer for ldpath template viewable</description>
+ <name>Apache Stanbol Template Viewable</name>
+ <description>A service providing classes and message body writer for response rendering with the viewable pattern</description>
<scm>
<connection>
scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/commons/web/ldviewable
Copied: stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/viewable/RdfViewable.java (from r1414940, stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/ldviewable/LdViewable.java)
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/viewable/RdfViewable.java?p2=stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/viewable/RdfViewable.java&p1=stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/ldviewable/LdViewable.java&r1=1414940&r2=1415312&rev=1415312&view=diff
==============================================================================
--- stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/ldviewable/LdViewable.java (original)
+++ stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/viewable/RdfViewable.java Thu Nov 29 18:36:05 2012
@@ -14,24 +14,24 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.commons.ldviewable;
+package org.apache.stanbol.commons.viewable;
import org.apache.clerezza.rdf.utils.GraphNode;
/**
- * An LdViewable is a GraphNode associated with a template path. The template
+ * An RdfViewable is a GraphNode associated with a template path. The template
* path will be attempted to be resolved based on the accepted target formats
* to create a representation of the GraphNode.
*
*/
-public class LdViewable {
+public class RdfViewable {
/**
*
* @param templatePath the templatePath
* @param graphNode the graphNode with the actual content
*/
- public LdViewable(final String templatePath, final GraphNode graphNode) {
+ public RdfViewable(final String templatePath, final GraphNode graphNode) {
this.templatePath = templatePath;
this.graphNode = graphNode;
}
@@ -41,7 +41,7 @@ public class LdViewable {
* the slash-separated package name of the given Class.
*
*/
- public LdViewable(final String templatePath, final GraphNode graphNode, final Class<?> clazz) {
+ public RdfViewable(final String templatePath, final GraphNode graphNode, final Class<?> clazz) {
final String slahSeparatedPacakgeName = clazz.getPackage().getName().replace('.', '/');
if (templatePath.startsWith("/")) {
this.templatePath = slahSeparatedPacakgeName+templatePath;
Copied: stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/viewable/Viewable.java (from r1414940, stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/ldviewable/Viewable.java)
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/viewable/Viewable.java?p2=stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/viewable/Viewable.java&p1=stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/ldviewable/Viewable.java&r1=1414940&r2=1415312&rev=1415312&view=diff
==============================================================================
--- stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/ldviewable/Viewable.java (original)
+++ stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/viewable/Viewable.java Thu Nov 29 18:36:05 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.commons.ldviewable;
+package org.apache.stanbol.commons.viewable;
/**
@@ -25,7 +25,7 @@ package org.apache.stanbol.commons.ldvie
* application logic is not clearly separated from the presentation but
* where backend method are called by the presentation layer.
*
- * Users should consider migrate to LdViewable instead where instead of
+ * Users should consider migrate to RdfViewable instead where instead of
* an arbitrary Object a GraphNode representing a node in a graph is passed,
* this approach also allows the response to be rendered as RDF.
*
Copied: stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/viewable/mbw/LdViewableWriter.java (from r1414940, stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/ldviewable/mbw/LdViewableWriter.java)
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/viewable/mbw/LdViewableWriter.java?p2=stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/viewable/mbw/LdViewableWriter.java&p1=stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/ldviewable/mbw/LdViewableWriter.java&r1=1414940&r2=1415312&rev=1415312&view=diff
==============================================================================
--- stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/ldviewable/mbw/LdViewableWriter.java (original)
+++ stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/viewable/mbw/LdViewableWriter.java Thu Nov 29 18:36:05 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.commons.ldviewable.mbw;
+package org.apache.stanbol.commons.viewable.mbw;
import java.io.IOException;
import java.io.OutputStream;
@@ -33,12 +33,12 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
import org.apache.stanbol.commons.ldpathtemplate.LdRenderer;
-import org.apache.stanbol.commons.ldviewable.LdViewable;
+import org.apache.stanbol.commons.viewable.RdfViewable;
@Component
@Service(LdViewableWriter.class)
@Produces("text/html")
-public class LdViewableWriter implements MessageBodyWriter<LdViewable> {
+public class LdViewableWriter implements MessageBodyWriter<RdfViewable> {
@Reference
private LdRenderer ldRenderer;
@@ -46,17 +46,17 @@ public class LdViewableWriter implements
@Override
public boolean isWriteable(Class<?> type, Type genericType,
Annotation[] annotations, MediaType mediaType) {
- return LdViewable.class.isAssignableFrom(type);
+ return RdfViewable.class.isAssignableFrom(type);
}
@Override
- public long getSize(LdViewable t, Class<?> type, Type genericType,
+ public long getSize(RdfViewable t, Class<?> type, Type genericType,
Annotation[] annotations, MediaType mediaType) {
return -1;
}
@Override
- public void writeTo(LdViewable t, Class<?> type, Type genericType,
+ public void writeTo(RdfViewable t, Class<?> type, Type genericType,
Annotation[] annotations, MediaType mediaType,
MultivaluedMap<String, Object> httpHeaders,
OutputStream entityStream) throws IOException,
Copied: stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/viewable/mbw/ViewableWriter.java (from r1415062, stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/ldviewable/mbw/ViewableWriter.java)
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/viewable/mbw/ViewableWriter.java?p2=stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/viewable/mbw/ViewableWriter.java&p1=stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/ldviewable/mbw/ViewableWriter.java&r1=1415062&r2=1415312&rev=1415312&view=diff
==============================================================================
--- stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/ldviewable/mbw/ViewableWriter.java (original)
+++ stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/viewable/mbw/ViewableWriter.java Thu Nov 29 18:36:05 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.commons.ldviewable.mbw;
+package org.apache.stanbol.commons.viewable.mbw;
import java.io.IOException;
import java.io.OutputStream;
@@ -32,7 +32,7 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
import org.apache.stanbol.commons.ldpathtemplate.LdRenderer;
-import org.apache.stanbol.commons.ldviewable.Viewable;
+import org.apache.stanbol.commons.viewable.Viewable;
@Component
@Service(ViewableWriter.class)
@@ -78,158 +78,3 @@ public class ViewableWriter implements M
}
}
-
-
-//TODO check if some frremarker config settings should be taken from there
-//public class FreemarkerViewProcessor implements ViewProcessor<Template> {
-//
-// private final Logger log = LoggerFactory.getLogger(getClass());
-//
-// protected Configuration freemarkerConfig;
-//
-// protected TemplateLoader templateLoader;
-//
-// @Context
-// protected ServletContext context;
-//
-// public FreemarkerViewProcessor(TemplateLoader templateLoader) {
-// this.templateLoader = templateLoader;
-// }
-//
-// /**
-// * @return extension for templates, ".ftl" by default; if we don't see this
-// * at the end of your view we'll append it so we can find the
-// * template resource
-// */
-// protected String getDefaultExtension() {
-// return ".ftl";
-// }
-//
-// /**
-// * Define additional variables to make available to the template.
-// *
-// * @param viewableVariables variables provided by whomever generated the
-// * viewable object; these are provided for reference only, there
-// * will be no effect if you modify this map
-// * @return new variables for the template context, which will override any
-// * defaults provided
-// */
-// protected Map<String, Object> getVariablesForTemplate(
-// final Map<String, Object> viewableVariables) {
-// return Collections.emptyMap();
-// }
-//
-// /**
-// * Catch any exception generated during template processing.
-// *
-// * @param t throwable caught
-// * @param templatePath path of template we're executing
-// * @param templateContext context use when evaluating this template
-// * @param out output stream from servlet container
-// * @throws IOException on any write errors, or if you want to rethrow
-// */
-// protected void onProcessException(final Throwable t,
-// final Template template, final Map<String, Object> templateContext,
-// final OutputStream out) throws IOException {
-// log.error("Error processing freemarker template @ "
-// + template.getName() + ": " + t.getMessage(), t);
-// out.write("<pre>".getBytes());
-// t.printStackTrace(new PrintStream(out));
-// out.write("</pre>".getBytes());
-// }
-//
-// /**
-// * Modify freemarker configuration after we've created it and applied any
-// * settings from 'freemarker.properties' on the classpath.
-// *
-// * @param config configuration we've created so far
-// * @param context servlet context used to create the configuration
-// */
-// protected void assignFreemarkerConfig(final Configuration config,
-// final ServletContext context) {
-// // TODO read those parameters from context instead of hardcoding them
-//
-// // don't always put a ',' in numbers (e.g., id=2000 vs id=2,000)
-// config.setNumberFormat("0");
-//
-// // don't look for list.en.ftl when list.ftl requested
-// config.setLocalizedLookup(false);
-//
-// // don't cache for more that 2s
-// config.setTemplateUpdateDelay(2);
-// config.setDefaultEncoding("utf-8");
-// config.setOutputEncoding("utf-8");
-// log.info("Assigned default freemarker configuration");
-// }
-//
-// protected Configuration getConfig() {
-// if (freemarkerConfig == null) {
-// // deferred initialization of the freemarker config to ensure that
-// // the injected ServletContext is fully functional
-// Configuration config = new Configuration();
-// config.setTemplateLoader(templateLoader);
-//
-// // TODO: make the usage of a freemaker properties file an explicit
-// // parameter declared in the servlet context instead of magic
-// // classloading auto-detect. That way the application could
-// // explicitly override the defaults
-// final InputStream fmProps = context.getResourceAsStream("freemarker.properties");
-// boolean loadDefaults = true;
-// if (fmProps != null) {
-// try {
-// config.setSettings(fmProps);
-// log.info("Assigned freemarker configuration from 'freemarker.properties'");
-// loadDefaults = false;
-// } catch (Throwable t) {
-// log.warn(
-// "Failed to load/assign freemarker.properties, will"
-// + " use default settings instead: "
-// + t.getMessage(), t);
-// }
-// }
-// if (loadDefaults) {
-// assignFreemarkerConfig(config, context);
-// }
-// freemarkerConfig = config;
-// }
-// return freemarkerConfig;
-// }
-//
-// public Template resolve(final String path) {
-// // accept both '/path/to/template' and '/path/to/template.ftl'
-// final String defaultExtension = getDefaultExtension();
-// final String filePath = path.endsWith(defaultExtension) ? path : path
-// + defaultExtension;
-// try {
-// return getConfig().getTemplate(filePath);
-// } catch (IOException e) {
-// log.error("Failed to load freemaker template: " + filePath);
-// return null;
-// }
-// }
-//
-// @SuppressWarnings("unchecked")
-// public void writeTo(Template template, Viewable viewable, OutputStream out)
-// throws IOException {
-// out.flush(); // send status + headers
-//
-// Object model = viewable.getModel();
-// final Map<String, Object> vars = new HashMap<String, Object>();
-// if (model instanceof Map<?, ?>) {
-// vars.putAll((Map<String, Object>) model);
-// } else {
-// vars.put("it", model);
-// }
-// // override custom variables if any
-// vars.putAll(getVariablesForTemplate(vars));
-//
-// final OutputStreamWriter writer = new OutputStreamWriter(out,"utf-8");
-// try {
-// template.process(vars, writer);
-// } catch (Throwable t) {
-// onProcessException(t, template, vars, out);
-// }
-// }
-//
-//}
-
Copied: stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/viewable/webfragment/LdViewableWebFragment.java (from r1414940, stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/ldviewable/webfragment/LdViewableWebFragment.java)
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/viewable/webfragment/LdViewableWebFragment.java?p2=stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/viewable/webfragment/LdViewableWebFragment.java&p1=stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/ldviewable/webfragment/LdViewableWebFragment.java&r1=1414940&r2=1415312&rev=1415312&view=diff
==============================================================================
--- stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/ldviewable/webfragment/LdViewableWebFragment.java (original)
+++ stanbol/trunk/commons/web/ldviewable/src/main/java/org/apache/stanbol/commons/viewable/webfragment/LdViewableWebFragment.java Thu Nov 29 18:36:05 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.stanbol.commons.ldviewable.webfragment;
+package org.apache.stanbol.commons.viewable.webfragment;
import java.util.ArrayList;
import java.util.HashSet;
@@ -26,8 +26,8 @@ import org.apache.felix.scr.annotations.
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.ldviewable.mbw.LdViewableWriter;
-import org.apache.stanbol.commons.ldviewable.mbw.ViewableWriter;
+import org.apache.stanbol.commons.viewable.mbw.LdViewableWriter;
+import org.apache.stanbol.commons.viewable.mbw.ViewableWriter;
import org.apache.stanbol.commons.web.base.LinkResource;
import org.apache.stanbol.commons.web.base.NavigationLink;
import org.apache.stanbol.commons.web.base.ScriptResource;
Modified: stanbol/trunk/commons/web/sparql/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/web/sparql/pom.xml?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/commons/web/sparql/pom.xml (original)
+++ stanbol/trunk/commons/web/sparql/pom.xml Thu Nov 29 18:36:05 2012
@@ -81,7 +81,7 @@
<!-- Jersey and servlet -->
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.ldviewable</artifactId>
+ <artifactId>org.apache.stanbol.commons.viewable</artifactId>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
Modified: stanbol/trunk/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/resource/SparqlEndpointResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/resource/SparqlEndpointResource.java?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/resource/SparqlEndpointResource.java (original)
+++ stanbol/trunk/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/resource/SparqlEndpointResource.java Thu Nov 29 18:36:05 2012
@@ -50,6 +50,7 @@ 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.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;
@@ -57,7 +58,6 @@ import org.osgi.framework.Constants;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
-import org.apache.stanbol.commons.ldviewable.Viewable;
/**
* This is the SPARQL endpoint which is used throughout the Stanbol. It uses {@link BundleContext} to retrive
Modified: stanbol/trunk/contenthub/web/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/contenthub/web/pom.xml?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/contenthub/web/pom.xml (original)
+++ stanbol/trunk/contenthub/web/pom.xml Thu Nov 29 18:36:05 2012
@@ -146,7 +146,7 @@
<!-- Jersey -->
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.ldviewable</artifactId>
+ <artifactId>org.apache.stanbol.commons.viewable</artifactId>
<version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: stanbol/trunk/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/ContentItemResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/ContentItemResource.java?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/ContentItemResource.java (original)
+++ stanbol/trunk/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/ContentItemResource.java Thu Nov 29 18:36:05 2012
@@ -77,6 +77,7 @@ import org.apache.clerezza.rdf.core.seri
import org.apache.clerezza.rdf.core.sparql.ParseException;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.stanbol.commons.indexedgraph.IndexedMGraph;
+import org.apache.stanbol.commons.viewable.Viewable;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
import org.apache.stanbol.enhancer.servicesapi.Blob;
import org.apache.stanbol.enhancer.servicesapi.ContentItem;
@@ -84,7 +85,6 @@ import org.apache.stanbol.enhancer.servi
import org.apache.stanbol.enhancer.servicesapi.helper.EnhancementEngineHelper;
import org.apache.stanbol.enhancer.servicesapi.rdf.Properties;
-import org.apache.stanbol.commons.ldviewable.Viewable;
public class ContentItemResource extends BaseStanbolResource {
Modified: stanbol/trunk/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/FeaturedSearchResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/FeaturedSearchResource.java?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/FeaturedSearchResource.java (original)
+++ stanbol/trunk/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/FeaturedSearchResource.java Thu Nov 29 18:36:05 2012
@@ -46,6 +46,7 @@ import org.apache.clerezza.rdf.core.UriR
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrServerException;
+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.contenthub.servicesapi.Constants;
@@ -63,7 +64,6 @@ import org.osgi.framework.InvalidSyntaxE
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.stanbol.commons.ldviewable.Viewable;
/**
* This class is the web resource which provides RESTful and HTTP interfaces for {@link FeaturedSearch}
Modified: stanbol/trunk/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/SemanticIndexManagerResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/SemanticIndexManagerResource.java?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/SemanticIndexManagerResource.java (original)
+++ stanbol/trunk/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/SemanticIndexManagerResource.java Thu Nov 29 18:36:05 2012
@@ -43,6 +43,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.ResponseBuilder;
import javax.ws.rs.core.Response.Status;
+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.contenthub.servicesapi.ldpath.LDPathException;
@@ -53,7 +54,6 @@ import org.apache.stanbol.contenthub.web
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.stanbol.commons.ldviewable.Viewable;
/**
* This class the the web resource to handle the RESTful requests and HTML view of the LDProgram management
Modified: stanbol/trunk/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/StoreResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/StoreResource.java?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/StoreResource.java (original)
+++ stanbol/trunk/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/StoreResource.java Thu Nov 29 18:36:05 2012
@@ -78,6 +78,7 @@ import org.apache.commons.io.IOUtils;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.params.ModifiableSolrParams;
+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.contenthub.search.featured.util.SolrContentItemConverter;
@@ -97,7 +98,6 @@ import org.osgi.framework.InvalidSyntaxE
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.stanbol.commons.ldviewable.Viewable;
/**
* Resource to provide a CRU[D] REST API for content items and there related enhancements.
Modified: stanbol/trunk/demos/webvie/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/demos/webvie/pom.xml?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/demos/webvie/pom.xml (original)
+++ stanbol/trunk/demos/webvie/pom.xml Thu Nov 29 18:36:05 2012
@@ -99,7 +99,7 @@
<!-- Jersey -->
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.ldviewable</artifactId>
+ <artifactId>org.apache.stanbol.commons.viewable</artifactId>
</dependency>
<!-- OSGi tax -->
Modified: stanbol/trunk/demos/webvie/src/main/java/org/apache/stanbol/commons/web/vie/resource/EnhancerVieRootResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/demos/webvie/src/main/java/org/apache/stanbol/commons/web/vie/resource/EnhancerVieRootResource.java?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/demos/webvie/src/main/java/org/apache/stanbol/commons/web/vie/resource/EnhancerVieRootResource.java (original)
+++ stanbol/trunk/demos/webvie/src/main/java/org/apache/stanbol/commons/web/vie/resource/EnhancerVieRootResource.java Thu Nov 29 18:36:05 2012
@@ -22,9 +22,9 @@ import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
+import org.apache.stanbol.commons.viewable.Viewable;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
-import org.apache.stanbol.commons.ldviewable.Viewable;
/**
* Adapter to add a VIE based interface for the Stanbol Enhancer
Modified: stanbol/trunk/enhancer/jersey/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/pom.xml?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/enhancer/jersey/pom.xml (original)
+++ stanbol/trunk/enhancer/jersey/pom.xml Thu Nov 29 18:36:05 2012
@@ -128,7 +128,7 @@
<!-- Jersey -->
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.ldviewable</artifactId>
+ <artifactId>org.apache.stanbol.commons.viewable</artifactId>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
Modified: stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerUiResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerUiResource.java?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerUiResource.java (original)
+++ stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerUiResource.java Thu Nov 29 18:36:05 2012
@@ -42,6 +42,7 @@ import org.apache.clerezza.rdf.core.NonL
import org.apache.clerezza.rdf.core.TripleCollection;
import org.apache.clerezza.rdf.core.serializedform.Serializer;
import org.apache.clerezza.rdf.core.sparql.QueryEngine;
+import org.apache.stanbol.commons.viewable.Viewable;
import org.apache.stanbol.commons.web.base.ContextHelper;
import org.apache.stanbol.enhancer.servicesapi.Chain;
import org.apache.stanbol.enhancer.servicesapi.ChainException;
@@ -54,7 +55,6 @@ import org.apache.stanbol.enhancer.servi
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.stanbol.commons.ldviewable.Viewable;
/**
* Abstract super class for all Enhancer endpoint that do also provide the
Modified: stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource.java?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource.java (original)
+++ stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource.java Thu Nov 29 18:36:05 2012
@@ -48,6 +48,7 @@ import javax.ws.rs.core.Response.Respons
import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
+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.enhancer.servicesapi.Chain;
@@ -55,7 +56,6 @@ import org.apache.stanbol.enhancer.servi
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
-import org.apache.stanbol.commons.ldviewable.Viewable;
@Path("/enhancer/chain")
public class ChainsRootResource extends BaseStanbolResource {
Modified: stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java (original)
+++ stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java Thu Nov 29 18:36:05 2012
@@ -81,6 +81,7 @@ import org.apache.clerezza.rdf.core.spar
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.commons.lang.StringUtils;
import org.apache.stanbol.commons.indexedgraph.IndexedMGraph;
+import org.apache.stanbol.commons.viewable.Viewable;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
import org.apache.stanbol.enhancer.servicesapi.Blob;
import org.apache.stanbol.enhancer.servicesapi.ContentItem;
@@ -96,7 +97,6 @@ import org.apache.stanbol.enhancer.servi
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.stanbol.commons.ldviewable.Viewable;
public class ContentItemResource extends BaseStanbolResource {
Modified: stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEngineResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEngineResource.java?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEngineResource.java (original)
+++ stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEngineResource.java Thu Nov 29 18:36:05 2012
@@ -43,7 +43,7 @@ import org.apache.stanbol.enhancer.servi
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
-import org.apache.stanbol.commons.ldviewable.Viewable;
+import org.apache.stanbol.commons.viewable.Viewable;
@Path("/enhancer/engine/{engineName}")
public class EnhancementEngineResource extends AbstractEnhancerResource {
Modified: stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEnginesRootResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEnginesRootResource.java?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEnginesRootResource.java (original)
+++ stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEnginesRootResource.java Thu Nov 29 18:36:05 2012
@@ -48,6 +48,7 @@ import javax.ws.rs.core.Response.Respons
import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
+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.enhancer.servicesapi.EnhancementEngine;
@@ -55,7 +56,6 @@ import org.apache.stanbol.enhancer.servi
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
-import org.apache.stanbol.commons.ldviewable.Viewable;
@Path("/enhancer/engine")
public class EnhancementEnginesRootResource extends BaseStanbolResource {
Modified: stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource.java?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource.java (original)
+++ stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource.java Thu Nov 29 18:36:05 2012
@@ -56,7 +56,7 @@ import org.apache.clerezza.rdf.core.spar
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.stanbol.enhancer.servicesapi.rdf.Enhancer;
-import org.apache.stanbol.commons.ldviewable.Viewable;
+import org.apache.stanbol.commons.viewable.Viewable;
/**
Modified: stanbol/trunk/enhancer/topic-web/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/topic-web/pom.xml?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/enhancer/topic-web/pom.xml (original)
+++ stanbol/trunk/enhancer/topic-web/pom.xml Thu Nov 29 18:36:05 2012
@@ -116,7 +116,7 @@
<!-- Jersey -->
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.ldviewable</artifactId>
+ <artifactId>org.apache.stanbol.commons.viewable</artifactId>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
Modified: stanbol/trunk/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicClassifierRootResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicClassifierRootResource.java?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicClassifierRootResource.java (original)
+++ stanbol/trunk/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicClassifierRootResource.java Thu Nov 29 18:36:05 2012
@@ -32,6 +32,7 @@ import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.ResponseBuilder;
+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.enhancer.topic.TopicClassifier;
@@ -41,7 +42,6 @@ import org.osgi.framework.ServiceReferen
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.stanbol.commons.ldviewable.Viewable;
@Path("/topic")
public class TopicClassifierRootResource extends BaseStanbolResource {
Modified: stanbol/trunk/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicModelResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicModelResource.java?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicModelResource.java (original)
+++ stanbol/trunk/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicModelResource.java Thu Nov 29 18:36:05 2012
@@ -42,6 +42,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.clerezza.rdf.core.Graph;
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.stanbol.commons.web.base.resource.BaseStanbolResource;
import org.apache.stanbol.enhancer.servicesapi.EnhancementEngine;
@@ -55,7 +56,6 @@ import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
-import org.apache.stanbol.commons.ldviewable.Viewable;
/**
* RESTful interface for classification models: register concept hierarchies, introspect model state and
Modified: stanbol/trunk/entityhub/jersey/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/jersey/pom.xml?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/entityhub/jersey/pom.xml (original)
+++ stanbol/trunk/entityhub/jersey/pom.xml Thu Nov 29 18:36:05 2012
@@ -165,7 +165,7 @@
<!-- Jersey and Freemarker -->
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.ldviewable</artifactId>
+ <artifactId>org.apache.stanbol.commons.viewable</artifactId>
</dependency>
<!-- imported via commons.web.base
Modified: stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/EntityhubRootResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/EntityhubRootResource.java?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/EntityhubRootResource.java (original)
+++ stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/EntityhubRootResource.java Thu Nov 29 18:36:05 2012
@@ -76,6 +76,7 @@ import javax.ws.rs.core.Response.Status;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
import org.apache.stanbol.commons.indexedgraph.IndexedMGraph;
+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.web.base.utils.MediaTypeUtil;
@@ -101,7 +102,6 @@ import org.slf4j.LoggerFactory;
import at.newmedialab.ldpath.exception.LDPathParseException;
import at.newmedialab.ldpath.model.programs.Program;
-import org.apache.stanbol.commons.ldviewable.Viewable;
@Path("/entityhub")
public class EntityhubRootResource extends BaseStanbolResource {
Modified: stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/ReferencedSiteRootResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/ReferencedSiteRootResource.java?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/ReferencedSiteRootResource.java (original)
+++ stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/ReferencedSiteRootResource.java Thu Nov 29 18:36:05 2012
@@ -80,6 +80,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
import org.apache.clerezza.rdf.ontologies.RDFS;
import org.apache.stanbol.commons.indexedgraph.IndexedMGraph;
+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.entityhub.core.query.QueryResultListImpl;
@@ -113,7 +114,6 @@ import at.newmedialab.ldpath.exception.L
import at.newmedialab.ldpath.model.programs.Program;
import com.hp.hpl.jena.reasoner.rulesys.builtins.GE;
-import org.apache.stanbol.commons.ldviewable.Viewable;
/**
* Resource to provide a REST API for the {@link SiteManager}
Modified: stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/SiteManagerRootResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/SiteManagerRootResource.java?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/SiteManagerRootResource.java (original)
+++ stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/SiteManagerRootResource.java Thu Nov 29 18:36:05 2012
@@ -63,6 +63,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
import org.apache.clerezza.rdf.ontologies.RDFS;
import org.apache.stanbol.commons.indexedgraph.IndexedMGraph;
+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.web.base.utils.MediaTypeUtil;
@@ -86,7 +87,6 @@ import org.slf4j.LoggerFactory;
import at.newmedialab.ldpath.exception.LDPathParseException;
import at.newmedialab.ldpath.model.programs.Program;
-import org.apache.stanbol.commons.ldviewable.Viewable;
/**
* Resource to provide a REST API for the {@link SiteManager}.
Modified: stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/BaseGoogleRefineReconcileResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/BaseGoogleRefineReconcileResource.java?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/BaseGoogleRefineReconcileResource.java (original)
+++ stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/BaseGoogleRefineReconcileResource.java Thu Nov 29 18:36:05 2012
@@ -46,6 +46,7 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.ResponseBuilder;
+import org.apache.stanbol.commons.viewable.Viewable;
import org.apache.stanbol.commons.web.base.CorsHelper;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
import org.apache.stanbol.commons.web.base.utils.MediaTypeUtil;
@@ -74,7 +75,6 @@ import org.codehaus.jettison.json.JSONOb
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.stanbol.commons.ldviewable.Viewable;
/**
* Implementation of the <a href="http://code.google.com/p/google-refine/wiki/ReconciliationServiceApi">
Modified: stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/utils/LDPathHelper.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/utils/LDPathHelper.java?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/utils/LDPathHelper.java (original)
+++ stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/utils/LDPathHelper.java Thu Nov 29 18:36:05 2012
@@ -40,6 +40,7 @@ import javax.ws.rs.core.Response.Status;
import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
import org.apache.stanbol.commons.indexedgraph.IndexedMGraph;
+import org.apache.stanbol.commons.viewable.Viewable;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
import org.apache.stanbol.commons.web.base.utils.MediaTypeUtil;
import org.apache.stanbol.entityhub.core.model.InMemoryValueFactory;
@@ -65,7 +66,6 @@ import at.newmedialab.ldpath.model.progr
import at.newmedialab.ldpath.model.selectors.PropertySelector;
import at.newmedialab.ldpath.model.transformers.DoubleTransformer;
-import org.apache.stanbol.commons.ldviewable.Viewable;
public class LDPathHelper {
private static final Logger log = LoggerFactory.getLogger(LDPathHelper.class);
Modified: stanbol/trunk/factstore/factstore/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/factstore/factstore/pom.xml?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/factstore/factstore/pom.xml (original)
+++ stanbol/trunk/factstore/factstore/pom.xml Thu Nov 29 18:36:05 2012
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.ldviewable</artifactId>
+ <artifactId>org.apache.stanbol.commons.viewable</artifactId>
<version>0.10.0-SNAPSHOT</version>
</dependency>
Modified: stanbol/trunk/factstore/factstore/src/main/java/org/apache/stanbol/factstore/web/resource/FactStoreRootResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/factstore/factstore/src/main/java/org/apache/stanbol/factstore/web/resource/FactStoreRootResource.java?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/factstore/factstore/src/main/java/org/apache/stanbol/factstore/web/resource/FactStoreRootResource.java (original)
+++ stanbol/trunk/factstore/factstore/src/main/java/org/apache/stanbol/factstore/web/resource/FactStoreRootResource.java Thu Nov 29 18:36:05 2012
@@ -23,7 +23,7 @@ import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.Response;
-import org.apache.stanbol.commons.ldviewable.Viewable;
+import org.apache.stanbol.commons.viewable.Viewable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: stanbol/trunk/factstore/factstore/src/main/java/org/apache/stanbol/factstore/web/resource/FactsResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/factstore/factstore/src/main/java/org/apache/stanbol/factstore/web/resource/FactsResource.java?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/factstore/factstore/src/main/java/org/apache/stanbol/factstore/web/resource/FactsResource.java (original)
+++ stanbol/trunk/factstore/factstore/src/main/java/org/apache/stanbol/factstore/web/resource/FactsResource.java Thu Nov 29 18:36:05 2012
@@ -46,6 +46,7 @@ import org.apache.stanbol.commons.jsonld
import org.apache.stanbol.commons.jsonld.JsonLdParser;
import org.apache.stanbol.commons.jsonld.JsonLdProfile;
import org.apache.stanbol.commons.jsonld.JsonLdProfileParser;
+import org.apache.stanbol.commons.viewable.Viewable;
import org.apache.stanbol.commons.web.base.ContextHelper;
import org.apache.stanbol.commons.web.base.CorsHelper;
import org.apache.stanbol.factstore.api.FactStore;
@@ -54,7 +55,6 @@ import org.apache.stanbol.factstore.mode
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.stanbol.commons.ldviewable.Viewable;
@Path("/factstore/facts")
public class FactsResource extends BaseFactStoreResource {
Modified: stanbol/trunk/integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/integration-tests/pom.xml?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/integration-tests/pom.xml (original)
+++ stanbol/trunk/integration-tests/pom.xml Thu Nov 29 18:36:05 2012
@@ -185,7 +185,7 @@
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.ldviewable</artifactId>
+ <artifactId>org.apache.stanbol.commons.viewable</artifactId>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
Modified: stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml (original)
+++ stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml Thu Nov 29 18:36:05 2012
@@ -457,7 +457,7 @@
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.ldviewable</artifactId>
+ <artifactId>org.apache.stanbol.commons.viewable</artifactId>
<version>0.10.0-SNAPSHOT</version>
</bundle>
</startLevel>
Modified: stanbol/trunk/ontologymanager/web/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/web/pom.xml?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/web/pom.xml (original)
+++ stanbol/trunk/ontologymanager/web/pom.xml Thu Nov 29 18:36:05 2012
@@ -143,7 +143,7 @@
<!-- specific deps for this project -->
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.ldviewable</artifactId>
+ <artifactId>org.apache.stanbol.commons.viewable</artifactId>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
Modified: stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntoNetRootResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntoNetRootResource.java?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntoNetRootResource.java (original)
+++ stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntoNetRootResource.java Thu Nov 29 18:36:05 2012
@@ -94,6 +94,7 @@ import org.apache.clerezza.rdf.ontologie
import org.apache.stanbol.commons.owl.util.OWL2Constants;
import org.apache.stanbol.commons.owl.util.OWLUtils;
import org.apache.stanbol.commons.owl.util.URIUtils;
+import org.apache.stanbol.commons.viewable.Viewable;
import org.apache.stanbol.commons.web.base.ContextHelper;
import org.apache.stanbol.ontologymanager.multiplexer.clerezza.collector.MGraphMultiplexer;
import org.apache.stanbol.ontologymanager.registry.api.RegistryContentException;
@@ -127,7 +128,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.sun.jersey.api.view.ImplicitProduces;
-import org.apache.stanbol.commons.ldviewable.Viewable;
import com.sun.jersey.multipart.BodyPart;
import com.sun.jersey.multipart.FormDataBodyPart;
import com.sun.jersey.multipart.FormDataMultiPart;
Modified: stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/RegistryManagerResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/RegistryManagerResource.java?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/RegistryManagerResource.java (original)
+++ stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/RegistryManagerResource.java Thu Nov 29 18:36:05 2012
@@ -34,6 +34,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.ResponseBuilder;
import javax.ws.rs.core.UriInfo;
+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.ontologymanager.registry.api.RegistryManager;
@@ -41,7 +42,6 @@ import org.apache.stanbol.ontologymanage
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.stanbol.commons.ldviewable.Viewable;
@Path("/ontonet/registry")
public class RegistryManagerResource extends BaseStanbolResource {
Modified: stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeManagerResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeManagerResource.java?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeManagerResource.java (original)
+++ stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeManagerResource.java Thu Nov 29 18:36:05 2012
@@ -47,6 +47,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.ResponseBuilder;
import org.apache.clerezza.rdf.core.access.TcManager;
+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.web.base.utils.MediaTypeUtil;
@@ -57,7 +58,6 @@ import org.semanticweb.owlapi.model.OWLO
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.stanbol.commons.ldviewable.Viewable;
/**
* The main Web resource of the KReS ontology manager. All the scopes, sessions and ontologies are accessible
Modified: stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java (original)
+++ stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java Thu Nov 29 18:36:05 2012
@@ -87,6 +87,7 @@ import org.apache.clerezza.rdf.core.seri
import org.apache.clerezza.rdf.core.serializedform.UnsupportedFormatException;
import org.apache.stanbol.commons.owl.util.OWLUtils;
import org.apache.stanbol.commons.owl.util.URIUtils;
+import org.apache.stanbol.commons.viewable.Viewable;
import org.apache.stanbol.commons.web.base.ContextHelper;
import org.apache.stanbol.ontologymanager.ontonet.api.scope.OntologyScope;
import org.apache.stanbol.ontologymanager.registry.api.RegistryManager;
@@ -118,7 +119,6 @@ import org.semanticweb.owlapi.model.OWLO
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.stanbol.commons.ldviewable.Viewable;
import com.sun.jersey.multipart.BodyPart;
import com.sun.jersey.multipart.FormDataBodyPart;
import com.sun.jersey.multipart.FormDataMultiPart;
Modified: stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionManagerResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionManagerResource.java?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionManagerResource.java (original)
+++ stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionManagerResource.java Thu Nov 29 18:36:05 2012
@@ -50,6 +50,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.ResponseBuilder;
import javax.ws.rs.core.UriInfo;
+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.web.base.utils.MediaTypeUtil;
@@ -67,7 +68,6 @@ import org.semanticweb.owlapi.model.OWLO
import org.semanticweb.owlapi.model.OWLOntologyCreationException;
import org.semanticweb.owlapi.model.OWLOntologyManager;
-import org.apache.stanbol.commons.ldviewable.Viewable;
@Path("/ontonet/session")
public class SessionManagerResource extends BaseStanbolResource {
Modified: stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java (original)
+++ stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java Thu Nov 29 18:36:05 2012
@@ -82,6 +82,7 @@ import org.apache.clerezza.rdf.core.Grap
import org.apache.clerezza.rdf.core.access.TcProvider;
import org.apache.clerezza.rdf.core.serializedform.Parser;
import org.apache.stanbol.commons.owl.util.OWLUtils;
+import org.apache.stanbol.commons.viewable.Viewable;
import org.apache.stanbol.commons.web.base.ContextHelper;
import org.apache.stanbol.ontologymanager.registry.api.RegistryManager;
import org.apache.stanbol.ontologymanager.registry.io.LibrarySource;
@@ -112,7 +113,6 @@ import org.semanticweb.owlapi.model.OWLO
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.stanbol.commons.ldviewable.Viewable;
import com.sun.jersey.multipart.BodyPart;
import com.sun.jersey.multipart.FormDataBodyPart;
import com.sun.jersey.multipart.FormDataMultiPart;
Modified: stanbol/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/parent/pom.xml?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/parent/pom.xml (original)
+++ stanbol/trunk/parent/pom.xml Thu Nov 29 18:36:05 2012
@@ -813,7 +813,7 @@
<!-- mFreemarker and LDPath Viewable -->
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.ldviewable</artifactId>
+ <artifactId>org.apache.stanbol.commons.viewable</artifactId>
<version>0.10.0-SNAPSHOT</version>
</dependency>
Modified: stanbol/trunk/reasoners/web/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/reasoners/web/pom.xml?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/reasoners/web/pom.xml (original)
+++ stanbol/trunk/reasoners/web/pom.xml Thu Nov 29 18:36:05 2012
@@ -158,7 +158,7 @@
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.ldviewable</artifactId>
+ <artifactId>org.apache.stanbol.commons.viewable</artifactId>
</dependency>
<!-- specific deps for this project -->
<dependency>
Modified: stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/JobsResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/JobsResource.java?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/JobsResource.java (original)
+++ stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/JobsResource.java Thu Nov 29 18:36:05 2012
@@ -36,6 +36,7 @@ import javax.ws.rs.core.Response.Respons
import javax.ws.rs.core.Response.Status;
import org.apache.stanbol.commons.jobs.api.JobManager;
+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.reasoners.web.utils.ReasoningServiceResult;
@@ -43,7 +44,6 @@ import org.apache.stanbol.reasoners.web.
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.stanbol.commons.ldviewable.Viewable;
/**
* Return the result of a reasoners background job
Modified: stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource.java?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource.java (original)
+++ stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource.java Thu Nov 29 18:36:05 2012
@@ -49,6 +49,7 @@ import javax.ws.rs.core.Response.Respons
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.stanbol.commons.jobs.api.JobManager;
+import org.apache.stanbol.commons.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;
@@ -79,7 +80,6 @@ import org.slf4j.LoggerFactory;
import com.sun.jersey.api.core.HttpContext;
import com.sun.jersey.api.core.HttpRequestContext;
-import org.apache.stanbol.commons.ldviewable.Viewable;
import com.sun.jersey.multipart.BodyPart;
import com.sun.jersey.multipart.FormDataBodyPart;
import com.sun.jersey.multipart.FormDataMultiPart;
Modified: stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServicesResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServicesResource.java?rev=1415312&r1=1415311&r2=1415312&view=diff
==============================================================================
--- stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServicesResource.java (original)
+++ stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServicesResource.java Thu Nov 29 18:36:05 2012
@@ -37,6 +37,7 @@ import javax.ws.rs.core.Response.Respons
import javax.ws.rs.core.Response.Status;
import javax.ws.rs.core.UriInfo;
+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.reasoners.servicesapi.ReasoningService;
@@ -46,7 +47,6 @@ import org.apache.stanbol.reasoners.serv
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.stanbol.commons.ldviewable.Viewable;
/**
* Home page of the /reasoners module