Author: reto
Date: Wed Feb 13 19:58:37 2013
New Revision: 1445890
URL: http://svn.apache.org/r1445890
Log:
CLEREZZA-910: Reverted changes made by Rupert for which there was no consensus
Modified:
stanbol/trunk/commons/security/usermanagement/pom.xml
stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/WebConsolePlugin.java
Modified: stanbol/trunk/commons/security/usermanagement/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/security/usermanagement/pom.xml?rev=1445890&r1=1445889&r2=1445890&view=diff
==============================================================================
--- stanbol/trunk/commons/security/usermanagement/pom.xml (original)
+++ stanbol/trunk/commons/security/usermanagement/pom.xml Wed Feb 13 19:58:37
2013
@@ -108,6 +108,11 @@
<version>0.12.0-SNAPSHOT</version>
</dependency>
<dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.ldpathtemplate</artifactId>
+ <version>0.12.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-multipart</artifactId>
</dependency>
Modified:
stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/WebConsolePlugin.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/WebConsolePlugin.java?rev=1445890&r1=1445889&r2=1445890&view=diff
==============================================================================
---
stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/WebConsolePlugin.java
(original)
+++
stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/WebConsolePlugin.java
Wed Feb 13 19:58:37 2013
@@ -30,15 +30,10 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
-import org.apache.stanbol.commons.ldpath.clerezza.ClerezzaBackend;
+import org.apache.stanbol.commons.ldpathtemplate.LdRenderer;
import org.apache.stanbol.commons.usermanagement.resource.UserResource;
import org.osgi.framework.BundleContext;
-import at.newmedialab.ldpath.template.engine.TemplateEngine;
-
-import freemarker.cache.TemplateLoader;
-import freemarker.template.TemplateException;
-
@Component
@Service(Servlet.class)
@Properties({
@@ -54,18 +49,17 @@ public class WebConsolePlugin extends
@Reference
private UserResource userManager;
-
@Reference
- private TemplateLoader templateLoader;
- /**
- * The TemplateEngine used to render user information
- */
- private TemplateEngine<Resource> templateEngine;
-
+ private LdRenderer ldRenderer;
+
+ /*@Reference
+ private Serializer serializer;*/
+
public static final String NAME = "User Management";
public static final String LABEL = "usermanagement";
+ @Override
public String getLabel() {
return LABEL;
}
@@ -76,40 +70,28 @@ public class WebConsolePlugin extends
protected void renderContent(HttpServletRequest req,
HttpServletResponse response) throws ServletException,
IOException {
- try {
-
templateEngine.processFileTemplate(userManager.getUserType().getNode(),
-
"html/org/apache/stanbol/commons/usermanagement/webConsole.ftl",
response.getWriter());
- response.getWriter().flush();
- } catch (IOException e) {
- throw new RuntimeException(e);
- } catch (TemplateException e) {
- throw new RuntimeException(e);
- }
+
+ //TODO enhance LDPath template to support rdf:Lists and return
list
+ ldRenderer.render(userManager.getUserType(),
+
"html/org/apache/stanbol/commons/usermanagement/webConsole.ftl",
response.getWriter());
// serializer.serialize(System.out,
userManager.getUserType().getGraph(), SupportedFormat.TURTLE);
- // log me for debug!
+// log me for debug!
}
@Override
protected String[] getCssReferences() {
- String[] result = new String[] {
-
"usermanagement/res/static/user-management/styles/webconsole.css"
- };
+ String[] result = new String[1];
+ result[0] =
"usermanagement/res/static/user-management/styles/webconsole.css";
return result;
}
-
- @Override
- public void activate(BundleContext bundleContext) {
+
+ public void activateBundle(BundleContext bundleContext) {
super.activate(bundleContext);
- //use some getter to get the Graph that backups the UserManager
- //TODO: a direct getter for the graph would be nice to have
- templateEngine = new TemplateEngine<Resource>(
- new
ClerezzaBackend(userManager.getUserType().getGraph()));
- templateEngine.setTemplateLoader(templateLoader);
}
- @Override
+
public void deactivate() {
- templateEngine = null;
- super.deactivate();
+ super.deactivate();
+
}
/**
