Updating Script REST API from Restlet to Spring MVC enabling this mod…

…ule to work with GeoServer's REST API.

src/community/pom.xml

@@ -201,7 +201,7 @@
         <module>spatialite</module>
         <module>jdbcconfig</module>
         <module>feature-aggregate</module>
-        <!-- <module>script</module> -->
+        <module>script</module>
         <module>wms-eo</module>
         <module>colormap</module>
         <module>mbtiles</module>

src/community/release/pom.xml

@@ -33,7 +33,7 @@
      <artifactId>gs-wps-download</artifactId>
      <version>${project.version}</version>
    </dependency>   
-   <!-- <dependency>
+   <dependency>
      <groupId>org.geoserver.script</groupId>
      <artifactId>gs-script-py</artifactId>
      <version>${project.version}</version>
@@ -47,7 +47,7 @@
      <groupId>org.geoserver.script</groupId>
      <artifactId>gs-script-groovy</artifactId>
      <version>${project.version}</version>
-   </dependency> -->
+   </dependency>
    <dependency>
      <groupId>org.geoserver.community</groupId>
      <artifactId>gs-jdbcconfig</artifactId>

src/community/script/bsh/src/test/resources/org/geoserver/script/bsh/main-helloWorld.bsh

@@ -1,4 +1,6 @@
-import org.restlet.data.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 run(request,response) {
-  response.setEntity("Hello World!", MediaType.TEXT_PLAIN);
+  response.setContentType("text/plain");
+  response.getWriter().write("Hello World!");
 }

src/community/script/core/src/main/java/org/geoserver/script/ScriptManager.java

@@ -36,6 +36,8 @@
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 /**
  * Facade for the scripting subsystem, providing methods for obtaining script context and managing
@@ -44,6 +46,7 @@
  * @author Justin Deoliveira, OpenGeo
  *
  */
+@Component
 public class ScriptManager implements InitializingBean {
 
     static Logger LOGGER = Logging.getLogger(ScriptManager.class);

src/community/script/core/src/main/java/org/geoserver/script/ScriptPlugin.java

@@ -5,15 +5,15 @@
  */
 package org.geoserver.script;
 
-import java.io.Serializable;
-
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineFactory;
-
 import org.geoserver.script.app.AppHook;
 import org.geoserver.script.function.FunctionHook;
 import org.geoserver.script.wfs.WfsTxHook;
 import org.geoserver.script.wps.WpsHook;
+import org.springframework.stereotype.Component;
+
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineFactory;
+import java.io.Serializable;
 
 /**
  * Base class for script plugins.
@@ -23,6 +23,7 @@
  * @author Justin Deoliveira, OpenGeo
  *
  */
+@Component
 public abstract class ScriptPlugin implements Serializable {
 
     String extension;

src/community/script/core/src/main/java/org/geoserver/script/app/AppHook.java

@@ -5,16 +5,14 @@
  */
 package org.geoserver.script.app;
 
-import java.io.IOException;
+import org.geoserver.script.ScriptHook;
+import org.geoserver.script.ScriptPlugin;
 
-import javax.script.Invocable;
 import javax.script.ScriptEngine;
 import javax.script.ScriptException;
-
-import org.geoserver.script.ScriptHook;
-import org.geoserver.script.ScriptPlugin;
-import org.restlet.data.Request;
-import org.restlet.data.Response;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 
 /**
  * Hook for "app" requests.
@@ -42,7 +40,7 @@ public AppHook(ScriptPlugin plugin) {
      * @param engine The script engine of the appropriate type.
      * 
      */
-    public void run(Request request, Response response, ScriptEngine engine) 
+    public void run(HttpServletRequest request, HttpServletResponse response, ScriptEngine engine)
         throws ScriptException, IOException {
         invoke(engine, "run", request, response);
     }