Author: reto
Date: Fri Feb 8 14:13:54 2013
New Revision: 1444021
URL: http://svn.apache.org/r1444021
Log:
STANBOL-914: replaced description-template with html description
Removed:
stanbol/trunk/cmsadapter/web/src/main/resources/templates/imports/
stanbol/trunk/commons/web/sparql/src/main/resources/templates/imports/sparqlDescription.ftl
stanbol/trunk/demos/webvie/src/main/resources/templates/imports/
stanbol/trunk/enhancer/jersey/src/main/resources/templates/imports/enginesDescription.ftl
stanbol/trunk/rules/web/src/main/resources/templates/imports/rulesDescription.ftl
Modified:
stanbol/trunk/cmsadapter/web/pom.xml
stanbol/trunk/cmsadapter/web/src/main/java/org/apache/stanbol/cmsadapter/web/CMSAdapterWebFragment.java
stanbol/trunk/commons/jobs/web/pom.xml
stanbol/trunk/commons/owl/pom.xml
stanbol/trunk/commons/security/usermanagement/pom.xml
stanbol/trunk/commons/solr/web/pom.xml
stanbol/trunk/commons/web/base.jersey/pom.xml
stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/NavigationLink.java
stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/resource/BaseStanbolResource.java
stanbol/trunk/commons/web/home/pom.xml
stanbol/trunk/commons/web/home/src/main/resources/templates/html/org/apache/stanbol/commons/web/home/resource/StanbolRootResource/index.ftl
stanbol/trunk/commons/web/sparql/pom.xml
stanbol/trunk/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/SparqlEndpointWebFragment.java
stanbol/trunk/commons/web/viewable/pom.xml
stanbol/trunk/contenthub/web/pom.xml
stanbol/trunk/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/fragment/ContenthubWebFragment.java
stanbol/trunk/demos/webvie/pom.xml
stanbol/trunk/demos/webvie/src/main/java/org/apache/stanbol/commons/web/vie/fragment/EnhancerVieWebFragment.java
stanbol/trunk/enhancement-engines/topic/web/pom.xml
stanbol/trunk/enhancement-engines/topic/web/src/main/java/org/apache/stanbol/enhancer/web/topic/fragment/TopicClassifierFragment.java
stanbol/trunk/enhancer/jersey/pom.xml
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerWebFragment.java
stanbol/trunk/entityhub/jersey/pom.xml
stanbol/trunk/ontologymanager/web/pom.xml
stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/OntologyManagerWebFragment.java
stanbol/trunk/reasoners/web/pom.xml
stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/ReasonersFragment.java
stanbol/trunk/rules/web/pom.xml
stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/RulesFragment.java
Modified: stanbol/trunk/cmsadapter/web/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/cmsadapter/web/pom.xml?rev=1444021&r1=1444020&r2=1444021&view=diff
==============================================================================
--- stanbol/trunk/cmsadapter/web/pom.xml (original)
+++ stanbol/trunk/cmsadapter/web/pom.xml Fri Feb 8 14:13:54 2013
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.base</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
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=1444021&r1=1444020&r2=1444021&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
Fri Feb 8 14:13:54 2013
@@ -48,14 +48,8 @@ public class CMSAdapterWebFragment imple
private static final String NAME = "cmsadapter";
- private static final String STATIC_RESOURCE_PATH =
"/org/apache/stanbol/cmsadapter/web/static";
+ private String htmlDescription = "This is the <strong>CMS
Adapter</strong> component of Apache Stanbol.";
- private BundleContext bundleContext;
-
- @Activate
- protected void activate(ComponentContext ctx) {
- this.bundleContext = ctx.getBundleContext();
- }
@Override
public String getName() {
@@ -99,7 +93,7 @@ public class CMSAdapterWebFragment imple
@Override
public List<NavigationLink> getNavigationLinks() {
List<NavigationLink> links = new ArrayList<NavigationLink>();
- links.add(new NavigationLink("cmsadapter", "/cmsadapter",
"/imports/cmsadapterDescription.ftl", 80));
+ links.add(new NavigationLink("cmsadapter", "/cmsadapter",
htmlDescription, 80));
return links;
}
Modified: stanbol/trunk/commons/jobs/web/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/jobs/web/pom.xml?rev=1444021&r1=1444020&r2=1444021&view=diff
==============================================================================
--- stanbol/trunk/commons/jobs/web/pom.xml (original)
+++ stanbol/trunk/commons/jobs/web/pom.xml Fri Feb 8 14:13:54 2013
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.base</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<!-- specific deps for this project -->
Modified: stanbol/trunk/commons/owl/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/owl/pom.xml?rev=1444021&r1=1444020&r2=1444021&view=diff
==============================================================================
--- stanbol/trunk/commons/owl/pom.xml (original)
+++ stanbol/trunk/commons/owl/pom.xml Fri Feb 8 14:13:54 2013
@@ -111,7 +111,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.base</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<!-- OWL deps -->
Modified: stanbol/trunk/commons/security/usermanagement/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/security/usermanagement/pom.xml?rev=1444021&r1=1444020&r2=1444021&view=diff
==============================================================================
--- stanbol/trunk/commons/security/usermanagement/pom.xml (original)
+++ stanbol/trunk/commons/security/usermanagement/pom.xml Fri Feb 8 14:13:54
2013
@@ -86,7 +86,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.base</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
Modified: stanbol/trunk/commons/solr/web/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/web/pom.xml?rev=1444021&r1=1444020&r2=1444021&view=diff
==============================================================================
--- stanbol/trunk/commons/solr/web/pom.xml (original)
+++ stanbol/trunk/commons/solr/web/pom.xml Fri Feb 8 14:13:54 2013
@@ -88,7 +88,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.base</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<!-- OSGI framework dependencies -->
Modified: stanbol/trunk/commons/web/base.jersey/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/web/base.jersey/pom.xml?rev=1444021&r1=1444020&r2=1444021&view=diff
==============================================================================
--- stanbol/trunk/commons/web/base.jersey/pom.xml (original)
+++ stanbol/trunk/commons/web/base.jersey/pom.xml Fri Feb 8 14:13:54 2013
@@ -99,7 +99,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.base</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<!-- Jersey -->
Modified:
stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/NavigationLink.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/NavigationLink.java?rev=1444021&r1=1444020&r2=1444021&view=diff
==============================================================================
---
stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/NavigationLink.java
(original)
+++
stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/NavigationLink.java
Fri Feb 8 14:13:54 2013
@@ -21,29 +21,29 @@ package org.apache.stanbol.commons.web.b
*/
public class NavigationLink implements Comparable<NavigationLink> {
- public final String label;
+ private final String label;
- public final String path;
+ private final String path;
- public final String descriptionTemplate;
+ private final int order;
- public final int order;
+ private final String htmlDescription;
public NavigationLink(String path, String label, int order) {
this.path = path;
this.label = label;
- this.descriptionTemplate = null;
this.order = order;
+ htmlDescription = null;
}
- public NavigationLink(String path, String label, String
descriptionTemplate, int order) {
- this.path = path;
+ public NavigationLink(String path, String label, String htmlDescription,
int order) {
+ this.path = path;
this.label = label;
- this.descriptionTemplate = descriptionTemplate;
this.order = order;
- }
+ this.htmlDescription = htmlDescription;
+ }
- @Override
+ @Override
public int compareTo(NavigationLink other) {
return order - other.order;
}
@@ -56,16 +56,48 @@ public class NavigationLink implements C
return path;
}
- public String getDescriptionTemplate() {
- return descriptionTemplate;
- }
public int getOrder() {
return order;
}
+
+ /**
+ * @return An English language description of the linked resource
+ */
+ public String getHtmlDescription() {
+ return htmlDescription;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((label == null) ? 0 :
label.hashCode());
+ result = prime * result + ((path == null) ? 0 :
path.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ NavigationLink other = (NavigationLink) obj;
+ if (label == null) {
+ if (other.label != null)
+ return false;
+ } else if (!label.equals(other.label))
+ return false;
+ if (path == null) {
+ if (other.path != null)
+ return false;
+ } else if (!path.equals(other.path))
+ return false;
+ return true;
+ }
- public boolean getHasDescriptionTemplate() {
- return descriptionTemplate != null;
- }
}
Modified:
stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/resource/BaseStanbolResource.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/resource/BaseStanbolResource.java?rev=1444021&r1=1444020&r2=1444021&view=diff
==============================================================================
---
stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/resource/BaseStanbolResource.java
(original)
+++
stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/resource/BaseStanbolResource.java
Fri Feb 8 14:13:54 2013
@@ -26,7 +26,6 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.UriBuilder;
import javax.ws.rs.core.UriInfo;
-import org.apache.commons.io.FilenameUtils;
import org.apache.stanbol.commons.web.base.LinkResource;
import org.apache.stanbol.commons.web.base.NavigationLink;
import org.apache.stanbol.commons.web.base.ScriptResource;
@@ -103,7 +102,7 @@ public class BaseStanbolResource {
public List<MenuItem> getMainMenuItems() {
List<MenuItem> items = new ArrayList<MenuItem>();
for (NavigationLink link : getNavigationLinks()) {
- items.add(new MenuItem(link.label, link.path, uriInfo));
+ items.add(new MenuItem(link.getLabel(), link.getPath(), uriInfo));
}
return items;
}
Modified: stanbol/trunk/commons/web/home/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/web/home/pom.xml?rev=1444021&r1=1444020&r2=1444021&view=diff
==============================================================================
--- stanbol/trunk/commons/web/home/pom.xml (original)
+++ stanbol/trunk/commons/web/home/pom.xml Fri Feb 8 14:13:54 2013
@@ -87,7 +87,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.base</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified:
stanbol/trunk/commons/web/home/src/main/resources/templates/html/org/apache/stanbol/commons/web/home/resource/StanbolRootResource/index.ftl
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/web/home/src/main/resources/templates/html/org/apache/stanbol/commons/web/home/resource/StanbolRootResource/index.ftl?rev=1444021&r1=1444020&r2=1444021&view=diff
==============================================================================
---
stanbol/trunk/commons/web/home/src/main/resources/templates/html/org/apache/stanbol/commons/web/home/resource/StanbolRootResource/index.ftl
(original)
+++
stanbol/trunk/commons/web/home/src/main/resources/templates/html/org/apache/stanbol/commons/web/home/resource/StanbolRootResource/index.ftl
Fri Feb 8 14:13:54 2013
@@ -32,9 +32,9 @@ view that documents the matching RESTful
<dl>
<#list it.navigationLinks as link>
- <#if link.hasDescriptionTemplate>
+ <#if link.htmlDescription??>
<dt><a href="${it.publicBaseUri}${link.path}">${link.label}</a><dt>
- <dd><#include "${link.descriptionTemplate}"></dd>
+ <dd>${link.htmlDescription }</dd>
</#if>
</#list>
Modified: stanbol/trunk/commons/web/sparql/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/web/sparql/pom.xml?rev=1444021&r1=1444020&r2=1444021&view=diff
==============================================================================
--- stanbol/trunk/commons/web/sparql/pom.xml (original)
+++ stanbol/trunk/commons/web/sparql/pom.xml Fri Feb 8 14:13:54 2013
@@ -74,7 +74,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.base</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<!-- Jersey and servlet -->
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=1444021&r1=1444020&r2=1444021&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
Fri Feb 8 14:13:54 2013
@@ -48,6 +48,11 @@ public class SparqlEndpointWebFragment i
private BundleContext bundleContext;
+ private String htmlDescription = "This is the <strong>SPARQL
endpoint</strong> for the Stanbol store."+
+ "<a
href=\"http://en.wikipedia.org/wiki/Sparql\";>SPARQL</a> is the"+
+ "standard query language the most commonly used to
provide interactive"+
+ "access to semantic knowledge bases.";
+
@Override
public String getName() {
return NAME;
@@ -83,7 +88,7 @@ public class SparqlEndpointWebFragment i
@Override
public List<NavigationLink> getNavigationLinks() {
List<NavigationLink> links = new ArrayList<NavigationLink>();
- links.add(new NavigationLink("sparql", "/sparql",
"/imports/sparqlDescription.ftl", 50));
+ links.add(new NavigationLink("sparql", "/sparql",
htmlDescription , 50));
return links;
}
Modified: stanbol/trunk/commons/web/viewable/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/web/viewable/pom.xml?rev=1444021&r1=1444020&r2=1444021&view=diff
==============================================================================
--- stanbol/trunk/commons/web/viewable/pom.xml (original)
+++ stanbol/trunk/commons/web/viewable/pom.xml Fri Feb 8 14:13:54 2013
@@ -95,7 +95,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.base</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
Modified: stanbol/trunk/contenthub/web/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/contenthub/web/pom.xml?rev=1444021&r1=1444020&r2=1444021&view=diff
==============================================================================
--- stanbol/trunk/contenthub/web/pom.xml (original)
+++ stanbol/trunk/contenthub/web/pom.xml Fri Feb 8 14:13:54 2013
@@ -94,7 +94,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.base</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
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=1444021&r1=1444020&r2=1444021&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
Fri Feb 8 14:13:54 2013
@@ -51,17 +51,18 @@ public class ContenthubWebFragment imple
private static final String NAME = "contenthub";
- private BundleContext bundleContext;
+ private static final String htmlDescription =
+ "This is a <strong>stateful interface</strong> to
submit content to <strong>"+
+ "analyze and store the results</strong> on the server.
It is then possible"+
+ "to browse the resulting enhanced content items. The
longer-term goal of this"+
+ "endpoint is to implement faceted semantic search of
the enhanced content items";
+
@Override
public String getName() {
return NAME;
}
- @Activate
- protected void activate(ComponentContext ctx) {
- this.bundleContext = ctx.getBundleContext();
- }
@Override
public Set<Class<?>> getJaxrsResourceClasses() {
@@ -111,7 +112,7 @@ public class ContenthubWebFragment imple
public List<NavigationLink> getNavigationLinks() {
List<NavigationLink> links = new ArrayList<NavigationLink>();
links.add(new NavigationLink("contenthub/contenthub/store",
- "/contenthub",
"/imports/contenthubDescription.ftl", 20));
+ "/contenthub", htmlDescription, 20));
return links;
}
}
Modified: stanbol/trunk/demos/webvie/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/demos/webvie/pom.xml?rev=1444021&r1=1444020&r2=1444021&view=diff
==============================================================================
--- stanbol/trunk/demos/webvie/pom.xml (original)
+++ stanbol/trunk/demos/webvie/pom.xml Fri Feb 8 14:13:54 2013
@@ -93,7 +93,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.base</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<!-- Jersey -->
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=1444021&r1=1444020&r2=1444021&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
Fri Feb 8 14:13:54 2013
@@ -45,20 +45,15 @@ import freemarker.cache.TemplateLoader;
public class EnhancerVieWebFragment implements WebFragment {
private static final String NAME = "enhancervie";
+ private static final String htmlDescription =
+ "This is a frontend to the enhancer featuring VIE.js";
- private BundleContext bundleContext;
-
@Override
public String getName() {
return NAME;
}
- @Activate
- protected void activate(ComponentContext ctx) {
- this.bundleContext = ctx.getBundleContext();
- }
-
@Override
public Set<Class<?>> getJaxrsResourceClasses() {
Set<Class<?>> classes = new HashSet<Class<?>>();
@@ -106,7 +101,7 @@ public class EnhancerVieWebFragment impl
@Override
public List<NavigationLink> getNavigationLinks() {
List<NavigationLink> links = new ArrayList<NavigationLink>();
- links.add(new NavigationLink("enhancervie", "/enhancer VIE",
"/imports/enhancervieDescription.ftl", 20));
+ links.add(new NavigationLink("enhancervie", "/enhancer VIE",
htmlDescription, 20));
return links;
}
Modified: stanbol/trunk/enhancement-engines/topic/web/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/topic/web/pom.xml?rev=1444021&r1=1444020&r2=1444021&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/topic/web/pom.xml (original)
+++ stanbol/trunk/enhancement-engines/topic/web/pom.xml Fri Feb 8 14:13:54 2013
@@ -100,7 +100,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.base</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
Modified:
stanbol/trunk/enhancement-engines/topic/web/src/main/java/org/apache/stanbol/enhancer/web/topic/fragment/TopicClassifierFragment.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/topic/web/src/main/java/org/apache/stanbol/enhancer/web/topic/fragment/TopicClassifierFragment.java?rev=1444021&r1=1444020&r2=1444021&view=diff
==============================================================================
---
stanbol/trunk/enhancement-engines/topic/web/src/main/java/org/apache/stanbol/enhancer/web/topic/fragment/TopicClassifierFragment.java
(original)
+++
stanbol/trunk/enhancement-engines/topic/web/src/main/java/org/apache/stanbol/enhancer/web/topic/fragment/TopicClassifierFragment.java
Fri Feb 8 14:13:54 2013
@@ -35,8 +35,6 @@ import org.apache.stanbol.enhancer.web.t
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
Modified: stanbol/trunk/enhancer/jersey/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/pom.xml?rev=1444021&r1=1444020&r2=1444021&view=diff
==============================================================================
--- stanbol/trunk/enhancer/jersey/pom.xml (original)
+++ stanbol/trunk/enhancer/jersey/pom.xml Fri Feb 8 14:13:54 2013
@@ -102,7 +102,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.base</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
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=1444021&r1=1444020&r2=1444021&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
Fri Feb 8 14:13:54 2013
@@ -24,7 +24,7 @@ import java.util.Set;
import org.apache.clerezza.rdf.core.serializedform.Serializer;
import org.apache.clerezza.rdf.core.sparql.QueryEngine;
-import org.apache.felix.scr.annotations.Activate;
+
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
@@ -42,11 +42,6 @@ import org.apache.stanbol.enhancer.jerse
import org.apache.stanbol.enhancer.jersey.resource.EnhancerRootResource;
import org.apache.stanbol.enhancer.jersey.writers.ContentItemWriter;
import org.apache.stanbol.enhancer.servicesapi.EnhancementJobManager;
-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
@@ -59,7 +54,12 @@ public class EnhancerWebFragment impleme
private static final String NAME = "enhancer";
- private BundleContext bundleContext;
+ private static final String htmlDescription =
+ "This is a <strong>stateless interface</strong> to
allow clients to submit"+
+ "content to <strong>analyze</strong> by the
<code>EnhancementEngine</code>s"+
+ "and get the resulting <strong>RDF
enhancements</strong> at once without"+
+ "storing anything on the server-side.";
+
@Reference
EnhancementJobManager jobManager;
@@ -77,10 +77,6 @@ public class EnhancerWebFragment impleme
return NAME;
}
- @Activate
- protected void activate(ComponentContext ctx) {
- this.bundleContext = ctx.getBundleContext();
- }
@Override
public Set<Class<?>> getJaxrsResourceClasses() {
@@ -124,7 +120,7 @@ public class EnhancerWebFragment impleme
@Override
public List<NavigationLink> getNavigationLinks() {
List<NavigationLink> links = new ArrayList<NavigationLink>();
- links.add(new NavigationLink("enhancer", "/enhancer",
"/imports/enginesDescription.ftl", 10));
+ links.add(new NavigationLink("enhancer", "/enhancer", htmlDescription,
10));
return links;
}
Modified: stanbol/trunk/entityhub/jersey/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/entityhub/jersey/pom.xml?rev=1444021&r1=1444020&r2=1444021&view=diff
==============================================================================
--- stanbol/trunk/entityhub/jersey/pom.xml (original)
+++ stanbol/trunk/entityhub/jersey/pom.xml Fri Feb 8 14:13:54 2013
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.base</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
Modified: stanbol/trunk/ontologymanager/web/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/web/pom.xml?rev=1444021&r1=1444020&r2=1444021&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/web/pom.xml (original)
+++ stanbol/trunk/ontologymanager/web/pom.xml Fri Feb 8 14:13:54 2013
@@ -99,7 +99,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.base</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
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=1444021&r1=1444020&r2=1444021&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
Fri Feb 8 14:13:54 2013
@@ -58,6 +58,10 @@ public class OntologyManagerWebFragment
private static final String NAME = "ontonet";
+ private static final String htmlDescription =
+ "A <strong>controlled environment</strong> for managing
Web ontologies, "+
+ "<strong>ontology networks</strong> and user sessions
that put them to use.";
+
private BundleContext bundleContext;
@Reference
@@ -124,7 +128,7 @@ public class OntologyManagerWebFragment
@Override
public List<NavigationLink> getNavigationLinks() {
List<NavigationLink> links = new ArrayList<NavigationLink>();
- links.add(new NavigationLink(NAME, "/" + NAME,
"/imports/ontonetDescription.ftl", 50));
+ links.add(new NavigationLink(NAME, "/" + NAME, htmlDescription, 50));
return links;
}
Modified: stanbol/trunk/reasoners/web/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/reasoners/web/pom.xml?rev=1444021&r1=1444020&r2=1444021&view=diff
==============================================================================
--- stanbol/trunk/reasoners/web/pom.xml (original)
+++ stanbol/trunk/reasoners/web/pom.xml Fri Feb 8 14:13:54 2013
@@ -91,7 +91,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.base</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
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=1444021&r1=1444020&r2=1444021&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
Fri Feb 8 14:13:54 2013
@@ -53,6 +53,11 @@ public class ReasonersFragment implement
private static final String NAME = "reasoners";
+ private static final String htmlDescription =
+ "The entry point to multiple <strong>reasoning
services</strong> that are used for"+
+ "obtaining unexpressed additional knowledge from the
explicit axioms in an ontology."+
+ "Multiple reasoning profiles are available, each with
its expressive power and computational cost.";
+
@Reference
ONManager onm;
@@ -98,7 +103,7 @@ public class ReasonersFragment implement
@Override
public List<NavigationLink> getNavigationLinks() {
List<NavigationLink> links = new ArrayList<NavigationLink>();
- links.add(new NavigationLink("reasoners", "/reasoners",
"/imports/reasonersDescription.ftl", 50));
+ links.add(new NavigationLink("reasoners", "/reasoners",
htmlDescription, 50));
return links;
}
Modified: stanbol/trunk/rules/web/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/rules/web/pom.xml?rev=1444021&r1=1444020&r2=1444021&view=diff
==============================================================================
--- stanbol/trunk/rules/web/pom.xml (original)
+++ stanbol/trunk/rules/web/pom.xml Fri Feb 8 14:13:54 2013
@@ -90,7 +90,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.base</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
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=1444021&r1=1444020&r2=1444021&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
Fri Feb 8 14:13:54 2013
@@ -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;
import org.apache.felix.scr.annotations.Service;
@@ -36,8 +35,6 @@ import org.apache.stanbol.rules.web.reso
import org.apache.stanbol.rules.web.writers.RecipeListWriter;
import org.apache.stanbol.rules.web.writers.RecipeWriter;
import org.apache.stanbol.rules.web.writers.RuleListWriter;
-import org.osgi.framework.BundleContext;
-import org.osgi.service.component.ComponentContext;
/**
@@ -53,7 +50,10 @@ public class RulesFragment implements We
private static final String NAME = "rules";
- private BundleContext bundleContext;
+ private static final String htmlDescription =
+ "This is the implementation of Stanbol Rules which can
be used both "+
+ "for <strong>reasoning</strong> and
<strong>refactoring</strong>";
+
@Reference
Refactorer refactorer;
@@ -66,11 +66,6 @@ public class RulesFragment implements We
return NAME;
}
- @Activate
- protected void activate(ComponentContext ctx) {
- this.bundleContext = ctx.getBundleContext();
- }
-
@Override
public Set<Class<?>> getJaxrsResourceClasses() {
Set<Class<?>> classes = new HashSet<Class<?>>();
@@ -108,7 +103,7 @@ public class RulesFragment implements We
@Override
public List<NavigationLink> getNavigationLinks() {
List<NavigationLink> links = new ArrayList<NavigationLink>();
- links.add(new NavigationLink("rules", "/rules",
"/imports/rulesDescription.ftl", 50));
+ links.add(new NavigationLink("rules", "/rules", htmlDescription, 50));
return links;
}
