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/12/10 16:40:12 UTC
svn commit: r1419530 - in /stanbol/trunk:
cmsadapter/web/src/main/java/org/apache/stanbol/cmsadapter/web/
commons/jobs/web/src/main/java/org/apache/stanbol/commons/jobs/web/
commons/owl/src/main/java/org/apache/stanbol/commons/owl/web/
commons/security...
Author: reto
Date: Mon Dec 10 15:40:04 2012
New Revision: 1419530
URL: http://svn.apache.org/viewvc?rev=1419530&view=rev
Log:
STANBOL-834 removed getStaticResourceClassPath from webfargments
Modified:
stanbol/trunk/cmsadapter/web/src/main/java/org/apache/stanbol/cmsadapter/web/CMSAdapterWebFragment.java
stanbol/trunk/commons/jobs/web/src/main/java/org/apache/stanbol/commons/jobs/web/JobsFragment.java
stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/web/OWLFragment.java
stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/webfragment/UserManagementWebFragment.java
stanbol/trunk/commons/web/base.jersey/src/main/java/org/apache/stanbol/commons/web/base/jersey/JerseyEndpoint.java
stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/WebFragment.java
stanbol/trunk/commons/web/home/src/main/java/org/apache/stanbol/commons/web/home/HomeWebFragment.java
stanbol/trunk/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/SparqlEndpointWebFragment.java
stanbol/trunk/commons/web/viewable/src/main/java/org/apache/stanbol/commons/viewable/webfragment/LdViewableWebFragment.java
stanbol/trunk/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/fragment/ContenthubWebFragment.java
stanbol/trunk/contrib/reengineer/web/pom.xml
stanbol/trunk/contrib/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/ReengineerFragment.java
stanbol/trunk/contrib/store/web/src/main/java/org/apache/stanbol/ontologymanager/store/rest/StoreWebFragment.java
stanbol/trunk/demos/crawler/src/main/java/org/apache/stanbol/demos/crawler/web/fragment/CrawlerWebFragment.java
stanbol/trunk/demos/integritycheck/src/main/java/org/apache/stanbol/demos/integritycheck/IntegrityCheckFragment.java
stanbol/trunk/demos/webvie/src/main/java/org/apache/stanbol/commons/web/vie/fragment/EnhancerVieWebFragment.java
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerWebFragment.java
stanbol/trunk/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/fragment/TopicClassifierFragment.java
stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/fragment/EntityhubWebFragment.java
stanbol/trunk/factstore/factstore/src/main/java/org/apache/stanbol/factstore/web/FactStoreWebFragment.java
stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/OntologyManagerWebFragment.java
stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/ReasonersFragment.java
stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/RulesFragment.java
Modified: stanbol/trunk/cmsadapter/web/src/main/java/org/apache/stanbol/cmsadapter/web/CMSAdapterWebFragment.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/cmsadapter/web/src/main/java/org/apache/stanbol/cmsadapter/web/CMSAdapterWebFragment.java?rev=1419530&r1=1419529&r2=1419530&view=diff
==============================================================================
--- stanbol/trunk/cmsadapter/web/src/main/java/org/apache/stanbol/cmsadapter/web/CMSAdapterWebFragment.java (original)
+++ stanbol/trunk/cmsadapter/web/src/main/java/org/apache/stanbol/cmsadapter/web/CMSAdapterWebFragment.java Mon Dec 10 15:40:04 2012
@@ -20,7 +20,6 @@ import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Service;
@@ -40,8 +39,6 @@ import org.osgi.service.component.Compon
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import freemarker.cache.ClassTemplateLoader;
-import freemarker.cache.TemplateLoader;
@Component(immediate = true, metatype = true)
@Service
@@ -66,11 +63,6 @@ public class CMSAdapterWebFragment imple
}
@Override
- public String getStaticResourceClassPath() {
- return STATIC_RESOURCE_PATH;
- }
-
- @Override
public Set<Class<?>> getJaxrsResourceClasses() {
Set<Class<?>> classes = new HashSet<Class<?>>();
classes.add(BridgeDefinitionsResource.class);
Modified: stanbol/trunk/commons/jobs/web/src/main/java/org/apache/stanbol/commons/jobs/web/JobsFragment.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/jobs/web/src/main/java/org/apache/stanbol/commons/jobs/web/JobsFragment.java?rev=1419530&r1=1419529&r2=1419530&view=diff
==============================================================================
--- stanbol/trunk/commons/jobs/web/src/main/java/org/apache/stanbol/commons/jobs/web/JobsFragment.java (original)
+++ stanbol/trunk/commons/jobs/web/src/main/java/org/apache/stanbol/commons/jobs/web/JobsFragment.java Mon Dec 10 15:40:04 2012
@@ -33,8 +33,6 @@ import org.apache.stanbol.commons.web.ba
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext;
-import freemarker.cache.ClassTemplateLoader;
-import freemarker.cache.TemplateLoader;
@Component(immediate = true, metatype = true)
@Service(WebFragment.class)
@@ -51,11 +49,6 @@ public class JobsFragment implements Web
}
@Override
- public String getStaticResourceClassPath() {
- return STATIC_RESOURCE_PATH;
- }
-
- @Override
public Set<Class<?>> getJaxrsResourceClasses() {
Set<Class<?>> classes = new HashSet<Class<?>>();
classes.add(JobsResource.class);
Modified: stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/web/OWLFragment.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/web/OWLFragment.java?rev=1419530&r1=1419529&r2=1419530&view=diff
==============================================================================
--- stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/web/OWLFragment.java (original)
+++ stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/web/OWLFragment.java Mon Dec 10 15:40:04 2012
@@ -32,8 +32,6 @@ import org.apache.stanbol.commons.web.ba
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext;
-import freemarker.cache.ClassTemplateLoader;
-import freemarker.cache.TemplateLoader;
/**
* Implementation of WebFragment for the OWL API.
@@ -48,8 +46,6 @@ public class OWLFragment implements WebF
private static final String NAME = "owl";
- private static final String STATIC_RESOURCE_PATH = "/org/apache/stanbol/owl/web/static";
-
private BundleContext bundleContext;
@@ -63,10 +59,6 @@ public class OWLFragment implements WebF
this.bundleContext = ctx.getBundleContext();
}
- @Override
- public String getStaticResourceClassPath() {
- return STATIC_RESOURCE_PATH;
- }
@Override
public Set<Class<?>> getJaxrsResourceClasses() {
Modified: stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/webfragment/UserManagementWebFragment.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/webfragment/UserManagementWebFragment.java?rev=1419530&r1=1419529&r2=1419530&view=diff
==============================================================================
--- stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/webfragment/UserManagementWebFragment.java (original)
+++ stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/webfragment/UserManagementWebFragment.java Mon Dec 10 15:40:04 2012
@@ -34,8 +34,6 @@ import org.apache.stanbol.commons.web.ba
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext;
-import freemarker.cache.ClassTemplateLoader;
-import freemarker.cache.TemplateLoader;
/**
* Statsically define the list of available resources and providers to be
@@ -50,8 +48,6 @@ public class UserManagementWebFragment i
private static final String NAME = "user-management";
- private static final String STATIC_RESOURCE_PATH = "/org/apache/stanbol/commons/usermanagement/webfragment";
-
private BundleContext bundleContext;
@Override
@@ -77,11 +73,6 @@ public class UserManagementWebFragment i
return instances;
}
- @Override
- public String getStaticResourceClassPath() {
- return STATIC_RESOURCE_PATH;
- }
-
@Override
public List<LinkResource> getLinkResources() {
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=1419530&r1=1419529&r2=1419530&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 Mon Dec 10 15:40:04 2012
@@ -181,16 +181,6 @@ public class JerseyEndpoint {
navigationLinks.addAll(fragment.getNavigationLinks());
app.contributeClasses(fragment.getJaxrsResourceClasses());
app.contributeSingletons(fragment.getJaxrsResourceSingletons());
- String staticPath = fragment.getStaticResourceClassPath();
- if (staticPath != null) {
- String resourceAlias = (applicationAlias.endsWith("/") ? applicationAlias.substring(0,
- applicationAlias.length() - 1) : applicationAlias)
- + staticUrlRoot
- + '/'
- + fragment.getName();
- httpService.registerResources(resourceAlias, staticPath, new BundleHttpContext(fragment));
- registeredAliases.add(resourceAlias);
- }
}
Collections.sort(linkResources);
Collections.sort(scriptResources);
Modified: stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/WebFragment.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/WebFragment.java?rev=1419530&r1=1419529&r2=1419530&view=diff
==============================================================================
--- stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/WebFragment.java (original)
+++ stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/WebFragment.java Mon Dec 10 15:40:04 2012
@@ -38,14 +38,6 @@ public interface WebFragment {
String getName();
/**
- * Java package name that is the classloading root of the static resources of the fragment to be published
- * by the OSGi HttpService under {@code /static-url-root/fragment-name/}
- * <p>
- * Note: this package should be exported by the bundle.
- */
- String getStaticResourceClassPath();
-
- /**
* Set of JAX-RS resources provided as classes.
* <p>
* Note: those classes should be visible: use the Export-Package bundle declaration to export their
Modified: stanbol/trunk/commons/web/home/src/main/java/org/apache/stanbol/commons/web/home/HomeWebFragment.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/web/home/src/main/java/org/apache/stanbol/commons/web/home/HomeWebFragment.java?rev=1419530&r1=1419529&r2=1419530&view=diff
==============================================================================
--- stanbol/trunk/commons/web/home/src/main/java/org/apache/stanbol/commons/web/home/HomeWebFragment.java (original)
+++ stanbol/trunk/commons/web/home/src/main/java/org/apache/stanbol/commons/web/home/HomeWebFragment.java Mon Dec 10 15:40:04 2012
@@ -74,11 +74,6 @@ public class HomeWebFragment implements
}
@Override
- public String getStaticResourceClassPath() {
- return STATIC_RESOURCE_PATH;
- }
-
- @Override
public List<LinkResource> getLinkResources() {
List<LinkResource> resources = new ArrayList<LinkResource>();
resources.add(new LinkResource("stylesheet", "style/stanbol.css", this, 0));
Modified: stanbol/trunk/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/SparqlEndpointWebFragment.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/SparqlEndpointWebFragment.java?rev=1419530&r1=1419529&r2=1419530&view=diff
==============================================================================
--- stanbol/trunk/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/SparqlEndpointWebFragment.java (original)
+++ stanbol/trunk/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/SparqlEndpointWebFragment.java Mon Dec 10 15:40:04 2012
@@ -34,8 +34,6 @@ import org.apache.stanbol.commons.web.sp
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext;
-import freemarker.cache.ClassTemplateLoader;
-import freemarker.cache.TemplateLoader;
/**
* Statically define the list of available resources and providers to be contributed to the the Stanbol JAX-RS
@@ -73,11 +71,6 @@ public class SparqlEndpointWebFragment i
}
@Override
- public String getStaticResourceClassPath() {
- return null;
- }
-
- @Override
public List<LinkResource> getLinkResources() {
return Collections.emptyList();
}
Modified: stanbol/trunk/commons/web/viewable/src/main/java/org/apache/stanbol/commons/viewable/webfragment/LdViewableWebFragment.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/web/viewable/src/main/java/org/apache/stanbol/commons/viewable/webfragment/LdViewableWebFragment.java?rev=1419530&r1=1419529&r2=1419530&view=diff
==============================================================================
--- stanbol/trunk/commons/web/viewable/src/main/java/org/apache/stanbol/commons/viewable/webfragment/LdViewableWebFragment.java (original)
+++ stanbol/trunk/commons/web/viewable/src/main/java/org/apache/stanbol/commons/viewable/webfragment/LdViewableWebFragment.java Mon Dec 10 15:40:04 2012
@@ -35,8 +35,6 @@ import org.apache.stanbol.commons.web.ba
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext;
-import freemarker.cache.ClassTemplateLoader;
-import freemarker.cache.TemplateLoader;
/**
* Statically define the list of available resources and providers to be
@@ -81,11 +79,6 @@ public class LdViewableWebFragment imple
}
@Override
- public String getStaticResourceClassPath() {
- return "foobar";
- }
-
- @Override
public List<LinkResource> getLinkResources() {
List<LinkResource> resources = new ArrayList<LinkResource>();
return resources;
Modified: stanbol/trunk/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/fragment/ContenthubWebFragment.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/fragment/ContenthubWebFragment.java?rev=1419530&r1=1419529&r2=1419530&view=diff
==============================================================================
--- stanbol/trunk/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/fragment/ContenthubWebFragment.java (original)
+++ stanbol/trunk/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/fragment/ContenthubWebFragment.java Mon Dec 10 15:40:04 2012
@@ -40,9 +40,6 @@ import org.apache.stanbol.contenthub.web
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext;
-import freemarker.cache.ClassTemplateLoader;
-import freemarker.cache.TemplateLoader;
-
/**
* Statically define the list of available resources and providers to be
* contributed to the the Stanbol JAX-RS Endpoint.
@@ -53,8 +50,6 @@ public class ContenthubWebFragment imple
private static final String NAME = "contenthub";
- private static final String TEMPLATE_PATH = "/org/apache/stanbol/contenthub/web/templates";
- private static final String STATIC_RESOURCE_PATH = "/org/apache/stanbol/contenthub/web/static";
private BundleContext bundleContext;
@@ -89,11 +84,6 @@ public class ContenthubWebFragment imple
}
@Override
- public String getStaticResourceClassPath() {
- return STATIC_RESOURCE_PATH;
- }
-
- @Override
public List<LinkResource> getLinkResources() {
List<LinkResource> resources = new ArrayList<LinkResource>();
resources.add(new LinkResource("stylesheet", "style/contenthub.css",
Modified: stanbol/trunk/contrib/reengineer/web/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/contrib/reengineer/web/pom.xml?rev=1419530&r1=1419529&r2=1419530&view=diff
==============================================================================
--- stanbol/trunk/contrib/reengineer/web/pom.xml (original)
+++ stanbol/trunk/contrib/reengineer/web/pom.xml Mon Dec 10 15:40:04 2012
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.base</artifactId>
- <version>0.9.0-incubating</version>
+ <version>0.10.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
Modified: stanbol/trunk/contrib/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/ReengineerFragment.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/contrib/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/ReengineerFragment.java?rev=1419530&r1=1419529&r2=1419530&view=diff
==============================================================================
--- stanbol/trunk/contrib/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/ReengineerFragment.java (original)
+++ stanbol/trunk/contrib/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/ReengineerFragment.java Mon Dec 10 15:40:04 2012
@@ -37,9 +37,6 @@ import org.apache.stanbol.reengineer.web
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext;
-import freemarker.cache.ClassTemplateLoader;
-import freemarker.cache.TemplateLoader;
-
/**
* Implementation of WebFragment for the Stanbol Reengineer end-point.
@@ -54,10 +51,6 @@ public class ReengineerFragment implemen
private static final String NAME = "reengineer";
- private static final String STATIC_RESOURCE_PATH = "/org/apache/stanbol/reengineer/web/static";
-
- private static final String TEMPLATE_PATH = "/org/apache/stanbol/reengineer/web/templates";
-
private BundleContext bundleContext;
@Reference
@@ -112,16 +105,6 @@ public class ReengineerFragment implemen
return resources;
}
- @Override
- public String getStaticResourceClassPath() {
- return STATIC_RESOURCE_PATH;
- }
-
- @Override
- public TemplateLoader getTemplateLoader() {
- return new ClassTemplateLoader(getClass(), TEMPLATE_PATH);
- }
-
@Activate
protected void activate(ComponentContext ctx) {
this.bundleContext = ctx.getBundleContext();
Modified: stanbol/trunk/contrib/store/web/src/main/java/org/apache/stanbol/ontologymanager/store/rest/StoreWebFragment.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/contrib/store/web/src/main/java/org/apache/stanbol/ontologymanager/store/rest/StoreWebFragment.java?rev=1419530&r1=1419529&r2=1419530&view=diff
==============================================================================
--- stanbol/trunk/contrib/store/web/src/main/java/org/apache/stanbol/ontologymanager/store/rest/StoreWebFragment.java (original)
+++ stanbol/trunk/contrib/store/web/src/main/java/org/apache/stanbol/ontologymanager/store/rest/StoreWebFragment.java Mon Dec 10 15:40:04 2012
@@ -63,10 +63,7 @@ import freemarker.cache.TemplateLoader;
public class StoreWebFragment implements WebFragment {
private static final Logger log = LoggerFactory.getLogger(StoreWebFragment.class);
private static final String NAME = "ontology";
-
- private static final String TEMPLATE_PATH = "/org/apache/stanbol/commons/web/ontologymanager/store/templates";
- private static final String STATIC_RESOURCE_PATH = "/org/apache/stanbol/commons/web/ontologymanager/store/static";
-
+
private BundleContext bundleContext;
@Override
@@ -119,15 +116,6 @@ public class StoreWebFragment implements
return singletons;
}
- @Override
- public String getStaticResourceClassPath() {
- return STATIC_RESOURCE_PATH;
- }
-
- @Override
- public TemplateLoader getTemplateLoader() {
- return new ClassTemplateLoader(getClass(), TEMPLATE_PATH);
- }
@Override
public List<LinkResource> getLinkResources() {
Modified: stanbol/trunk/demos/crawler/src/main/java/org/apache/stanbol/demos/crawler/web/fragment/CrawlerWebFragment.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/demos/crawler/src/main/java/org/apache/stanbol/demos/crawler/web/fragment/CrawlerWebFragment.java?rev=1419530&r1=1419529&r2=1419530&view=diff
==============================================================================
--- stanbol/trunk/demos/crawler/src/main/java/org/apache/stanbol/demos/crawler/web/fragment/CrawlerWebFragment.java (original)
+++ stanbol/trunk/demos/crawler/src/main/java/org/apache/stanbol/demos/crawler/web/fragment/CrawlerWebFragment.java Mon Dec 10 15:40:04 2012
@@ -33,9 +33,6 @@ public class CrawlerWebFragment implemen
private static final String NAME = "crawler";
- private static final String TEMPLATE_PATH = "/org/apache/stanbol/demos/crawler/web/templates";
- private static final String STATIC_RESOURCE_PATH = "/org/apache/stanbol/demos/crawler/web/static";
-
private BundleContext bundleContext;
@Activate
@@ -48,10 +45,6 @@ public class CrawlerWebFragment implemen
return NAME;
}
- @Override
- public String getStaticResourceClassPath() {
- return STATIC_RESOURCE_PATH;
- }
@Override
public Set<Class<?>> getJaxrsResourceClasses() {
@@ -66,11 +59,6 @@ public class CrawlerWebFragment implemen
}
@Override
- public TemplateLoader getTemplateLoader() {
- return new ClassTemplateLoader(getClass(), TEMPLATE_PATH);
- }
-
- @Override
public List<LinkResource> getLinkResources() {
List<LinkResource> resources = new ArrayList<LinkResource>();
resources.add(new LinkResource("stylesheet", "style/contenthub.css",
Modified: stanbol/trunk/demos/integritycheck/src/main/java/org/apache/stanbol/demos/integritycheck/IntegrityCheckFragment.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/demos/integritycheck/src/main/java/org/apache/stanbol/demos/integritycheck/IntegrityCheckFragment.java?rev=1419530&r1=1419529&r2=1419530&view=diff
==============================================================================
--- stanbol/trunk/demos/integritycheck/src/main/java/org/apache/stanbol/demos/integritycheck/IntegrityCheckFragment.java (original)
+++ stanbol/trunk/demos/integritycheck/src/main/java/org/apache/stanbol/demos/integritycheck/IntegrityCheckFragment.java Mon Dec 10 15:40:04 2012
@@ -30,10 +30,6 @@ import freemarker.cache.TemplateLoader;
public class IntegrityCheckFragment implements WebFragment{
public static final String NAME = "integritycheck";
- public static final String STATIC_RESOURCE_PATH = "/org/apache/stanbol/demos/integritycheck/static";
-
- public static final String TEMPLATE_PATH = "/org/apache/stanbol/demos/integritycheck/templates";
-
private BundleContext bundleContext;
@Activate
@@ -46,10 +42,6 @@ public class IntegrityCheckFragment impl
return NAME;
}
- @Override
- public String getStaticResourceClassPath() {
- return STATIC_RESOURCE_PATH;
- }
@Override
public Set<Class<?>> getJaxrsResourceClasses() {
Modified: stanbol/trunk/demos/webvie/src/main/java/org/apache/stanbol/commons/web/vie/fragment/EnhancerVieWebFragment.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/demos/webvie/src/main/java/org/apache/stanbol/commons/web/vie/fragment/EnhancerVieWebFragment.java?rev=1419530&r1=1419529&r2=1419530&view=diff
==============================================================================
--- stanbol/trunk/demos/webvie/src/main/java/org/apache/stanbol/commons/web/vie/fragment/EnhancerVieWebFragment.java (original)
+++ stanbol/trunk/demos/webvie/src/main/java/org/apache/stanbol/commons/web/vie/fragment/EnhancerVieWebFragment.java Mon Dec 10 15:40:04 2012
@@ -46,8 +46,6 @@ public class EnhancerVieWebFragment impl
private static final String NAME = "enhancervie";
- private static final String STATIC_RESOURCE_PATH = "/org/apache/stanbol/commons/web/vie/static";
-
private BundleContext bundleContext;
@@ -73,10 +71,7 @@ public class EnhancerVieWebFragment impl
return Collections.emptySet();
}
- @Override
- public String getStaticResourceClassPath() {
- return STATIC_RESOURCE_PATH;
- }
+
@Override
public List<LinkResource> getLinkResources() {
Modified: stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerWebFragment.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerWebFragment.java?rev=1419530&r1=1419529&r2=1419530&view=diff
==============================================================================
--- stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerWebFragment.java (original)
+++ stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerWebFragment.java Mon Dec 10 15:40:04 2012
@@ -58,8 +58,6 @@ public class EnhancerWebFragment impleme
private static final String NAME = "enhancer";
- private static final String STATIC_RESOURCE_PATH = "/org/apache/stanbol/enhancer/jersey/static";
-
private BundleContext bundleContext;
@@ -105,10 +103,6 @@ public class EnhancerWebFragment impleme
return Collections.emptySet();
}
- @Override
- public String getStaticResourceClassPath() {
- return STATIC_RESOURCE_PATH;
- }
@Override
Modified: stanbol/trunk/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/fragment/TopicClassifierFragment.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/fragment/TopicClassifierFragment.java?rev=1419530&r1=1419529&r2=1419530&view=diff
==============================================================================
--- stanbol/trunk/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/fragment/TopicClassifierFragment.java (original)
+++ stanbol/trunk/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/fragment/TopicClassifierFragment.java Mon Dec 10 15:40:04 2012
@@ -44,10 +44,6 @@ public class TopicClassifierFragment imp
public static final String NAME = "topic";
- public static final String STATIC_RESOURCE_PATH = "/org/apache/stanbol/enhancer/web/topic/static";
-
- public static final String TEMPLATE_PATH = "/org/apache/stanbol/enhancer/web/topic/templates";
-
protected BundleContext bundleContext;
@Override
@@ -56,11 +52,6 @@ public class TopicClassifierFragment imp
}
@Override
- public String getStaticResourceClassPath() {
- return STATIC_RESOURCE_PATH;
- }
-
- @Override
public Set<Class<?>> getJaxrsResourceClasses() {
Set<Class<?>> classes = new HashSet<Class<?>>();
classes.add(TopicClassifierRootResource.class);
Modified: stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/fragment/EntityhubWebFragment.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/fragment/EntityhubWebFragment.java?rev=1419530&r1=1419529&r2=1419530&view=diff
==============================================================================
--- stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/fragment/EntityhubWebFragment.java (original)
+++ stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/fragment/EntityhubWebFragment.java Mon Dec 10 15:40:04 2012
@@ -21,7 +21,6 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
@@ -52,8 +51,6 @@ public class EntityhubWebFragment implem
private static final String NAME = "entityhub";
- private static final String STATIC_RESOURCE_PATH = "/org/apache/stanbol/entityhub/jersey/static";
-
// private static final String TEMPLATE_PATH = "/org/apache/stanbol/entityhub/jersey/templates";
/**
@@ -134,9 +131,6 @@ public class EntityhubWebFragment implem
return Collections.emptyList();
}
- @Override
- public String getStaticResourceClassPath() {
- return STATIC_RESOURCE_PATH;
- }
+
}
Modified: stanbol/trunk/factstore/factstore/src/main/java/org/apache/stanbol/factstore/web/FactStoreWebFragment.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/factstore/factstore/src/main/java/org/apache/stanbol/factstore/web/FactStoreWebFragment.java?rev=1419530&r1=1419529&r2=1419530&view=diff
==============================================================================
--- stanbol/trunk/factstore/factstore/src/main/java/org/apache/stanbol/factstore/web/FactStoreWebFragment.java (original)
+++ stanbol/trunk/factstore/factstore/src/main/java/org/apache/stanbol/factstore/web/FactStoreWebFragment.java Mon Dec 10 15:40:04 2012
@@ -21,7 +21,6 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
@@ -48,8 +47,6 @@ import org.osgi.service.component.Compon
public class FactStoreWebFragment implements WebFragment {
public static final String NAME = "factstore";
-
- private static final String STATIC_RESOURCE_PATH = "/org/apache/stanbol/factstore/web/static";
private BundleContext bundleContext;
@@ -104,10 +101,6 @@ public class FactStoreWebFragment implem
return scripts;
}
- @Override
- public String getStaticResourceClassPath() {
- return STATIC_RESOURCE_PATH;
- }
}
Modified: stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/OntologyManagerWebFragment.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/OntologyManagerWebFragment.java?rev=1419530&r1=1419529&r2=1419530&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/OntologyManagerWebFragment.java (original)
+++ stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/OntologyManagerWebFragment.java Mon Dec 10 15:40:04 2012
@@ -21,7 +21,6 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
@@ -45,8 +44,6 @@ import org.apache.stanbol.ontologymanage
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext;
-import freemarker.cache.ClassTemplateLoader;
-import freemarker.cache.TemplateLoader;
/**
* Implementation of WebFragment for the Stanbol Ontology Manager endpoint.
@@ -61,8 +58,6 @@ public class OntologyManagerWebFragment
private static final String NAME = "ontonet";
- private static final String STATIC_RESOURCE_PATH = "/org/apache/stanbol/ontologymanager/web/static";
-
private BundleContext bundleContext;
@Reference
@@ -145,9 +140,5 @@ public class OntologyManagerWebFragment
return resources;
}
- @Override
- public String getStaticResourceClassPath() {
- return STATIC_RESOURCE_PATH;
- }
}
Modified: stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/ReasonersFragment.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/ReasonersFragment.java?rev=1419530&r1=1419529&r2=1419530&view=diff
==============================================================================
--- stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/ReasonersFragment.java (original)
+++ stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/ReasonersFragment.java Mon Dec 10 15:40:04 2012
@@ -21,7 +21,6 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
@@ -40,8 +39,6 @@ import org.apache.stanbol.rules.base.api
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext;
-import freemarker.cache.ClassTemplateLoader;
-import freemarker.cache.TemplateLoader;
/**
* Implementation of WebFragment for the Stanbol Reasoner end-point.
@@ -56,8 +53,6 @@ public class ReasonersFragment implement
private static final String NAME = "reasoners";
- private static final String STATIC_RESOURCE_PATH = "/org/apache/stanbol/reasoners/web/static";
-
@Reference
ONManager onm;
@@ -117,11 +112,6 @@ public class ReasonersFragment implement
return Collections.emptyList();
}
- @Override
- public String getStaticResourceClassPath() {
- return STATIC_RESOURCE_PATH;
- }
-
@Activate
protected void activate(ComponentContext ctx) {
this.bundleContext = ctx.getBundleContext();
Modified: stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/RulesFragment.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/RulesFragment.java?rev=1419530&r1=1419529&r2=1419530&view=diff
==============================================================================
--- stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/RulesFragment.java (original)
+++ stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/RulesFragment.java Mon Dec 10 15:40:04 2012
@@ -21,7 +21,6 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
@@ -40,8 +39,6 @@ import org.apache.stanbol.rules.web.writ
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext;
-import freemarker.cache.ClassTemplateLoader;
-import freemarker.cache.TemplateLoader;
/**
* Implementation of WebFragment for the Stanbol Rules end-point.
@@ -56,8 +53,6 @@ public class RulesFragment implements We
private static final String NAME = "rules";
- private static final String STATIC_RESOURCE_PATH = "/org/apache/stanbol/rules/web/static";
-
private BundleContext bundleContext;
@Reference
@@ -96,11 +91,6 @@ public class RulesFragment implements We
}
@Override
- public String getStaticResourceClassPath() {
- return STATIC_RESOURCE_PATH;
- }
-
- @Override
public List<LinkResource> getLinkResources() {
List<LinkResource> resources = new ArrayList<LinkResource>();
resources.add(new LinkResource("stylesheet", "css/rules.css", this, 10));