You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by an...@apache.org on 2012/04/02 14:22:22 UTC

svn commit: r1308316 - in /incubator/stanbol/trunk/rules/web/src/main: java/org/apache/stanbol/rules/web/resources/ java/org/apache/stanbol/rules/web/writers/ resources/org/apache/stanbol/rules/web/templates/org/apache/stanbol/rules/web/resources/Rules...

Author: anuzzolese
Date: Mon Apr  2 12:22:22 2012
New Revision: 1308316

URL: http://svn.apache.org/viewvc?rev=1308316&view=rev
Log:
[STANBOL-560] Patch proposed by Alberto Musetti. The patch proposes facilities for rendering recipes and rules in HTML Stanbol pages.

Added:
    incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RulesPrettyPrintResource.java
    incubator/stanbol/trunk/rules/web/src/main/resources/org/apache/stanbol/rules/web/templates/org/apache/stanbol/rules/web/resources/RulesResource/rules.ftl
Modified:
    incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RulesResource.java

Modified: incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RulesResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RulesResource.java?rev=1308316&r1=1308315&r2=1308316&view=diff
==============================================================================
--- incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RulesResource.java (original)
+++ incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RulesResource.java Mon Apr  2 12:22:22 2012
@@ -66,6 +66,7 @@ import org.apache.stanbol.rules.base.api
 import org.apache.stanbol.rules.base.api.util.RecipeList;
 import org.apache.stanbol.rules.base.api.util.RuleList;
 import org.apache.stanbol.rules.manager.RecipeImpl;
+import org.apache.stanbol.rules.web.writers.RulesPrettyPrintResource;
 import org.codehaus.jettison.json.JSONArray;
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
@@ -256,7 +257,7 @@ public class RulesResource extends BaseS
                 recipe = new RecipeImpl(recipe.getRecipeID(), recipe.getRecipeDescription(), ruleList);
             }
 
-            responseBuilder = Response.ok(new Viewable("rules", recipe.toString()));
+            responseBuilder = Response.ok(new Viewable("rules", new RulesPrettyPrintResource(servletContext,uriInfo,recipe)));
 
         } catch (NoSuchRecipeException e) {
             log.error(e.getMessage(), e);
@@ -268,7 +269,7 @@ public class RulesResource extends BaseS
             log.error(e.getMessage(), e);
             responseBuilder = Response.status(Status.NOT_FOUND);
         }
-
+        
         addCORSOrigin(servletContext, responseBuilder, headers);
         return responseBuilder.build();
     }

Added: incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RulesPrettyPrintResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RulesPrettyPrintResource.java?rev=1308316&view=auto
==============================================================================
--- incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RulesPrettyPrintResource.java (added)
+++ incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RulesPrettyPrintResource.java Mon Apr  2 12:22:22 2012
@@ -0,0 +1,23 @@
+package org.apache.stanbol.rules.web.writers;
+import javax.servlet.ServletContext;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.UriInfo;
+
+import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
+
+public class RulesPrettyPrintResource extends BaseStanbolResource {
+
+	private Object result;
+
+    public RulesPrettyPrintResource(@Context ServletContext servletContext, UriInfo uriInfo, Object result) {
+        this.result = result;
+        this.uriInfo = uriInfo;
+        this.servletContext = servletContext;
+    }
+
+    public Object getResult() {
+    	
+        return this.result;
+    }
+
+}

Added: incubator/stanbol/trunk/rules/web/src/main/resources/org/apache/stanbol/rules/web/templates/org/apache/stanbol/rules/web/resources/RulesResource/rules.ftl
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/web/src/main/resources/org/apache/stanbol/rules/web/templates/org/apache/stanbol/rules/web/resources/RulesResource/rules.ftl?rev=1308316&view=auto
==============================================================================
--- incubator/stanbol/trunk/rules/web/src/main/resources/org/apache/stanbol/rules/web/templates/org/apache/stanbol/rules/web/resources/RulesResource/rules.ftl (added)
+++ incubator/stanbol/trunk/rules/web/src/main/resources/org/apache/stanbol/rules/web/templates/org/apache/stanbol/rules/web/resources/RulesResource/rules.ftl Mon Apr  2 12:22:22 2012
@@ -0,0 +1,26 @@
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<#import "/imports/common.ftl" as common>
+<#escape x as x?html>
+<@common.page title="Apache Stanbol Rules" hasrestapi=false>
+ <div class="panel">
+<pre>
+${it.result}
+</pre>
+ </div>
+</...@common.page>
+</#escape>
\ No newline at end of file