From 04a861da104e879e696efed8515f72ed2f13b6c7 Mon Sep 17 00:00:00 2001 From: Jim Ewald Date: Wed, 5 Jun 2019 16:10:56 -0700 Subject: [PATCH 1/2] Disable library REST stub function. --- .../server/blocklyprop/rest/RestCompile.java | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/parallax/server/blocklyprop/rest/RestCompile.java b/src/main/java/com/parallax/server/blocklyprop/rest/RestCompile.java index 8a3c3ec5..8f3457c2 100644 --- a/src/main/java/com/parallax/server/blocklyprop/rest/RestCompile.java +++ b/src/main/java/com/parallax/server/blocklyprop/rest/RestCompile.java @@ -26,20 +26,15 @@ import com.parallax.client.cloudsession.exceptions.UserBlockedException; import com.parallax.server.blocklyprop.rest.typewrappers.CompileActionTypeWrapper; import com.parallax.server.blocklyprop.services.impl.SecurityServiceImpl; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; import org.apache.commons.configuration.Configuration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.servlet.http.HttpServletRequest; +import javax.ws.rs.*; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.Response.Status; + /** * * @author Michel @@ -72,12 +67,22 @@ public void setConfiguration(Configuration configuration) { @Name("compile") @Produces("text/plain") public Response get(@QueryParam("test") String testString) { - LOG.info("REST:/rest/compile/ Get request received"); - return Response.ok("Hello " + testString).build(); } +/* + @GET + @Detail("Get Simple Libraries version") + @Name("version") + @Produces("text/plain") + public Response version() { + LOG.info("REST:/rest/compile/ Get request received"); + return Response.ok("v0.0.0").build(); + } +*/ + + @POST @Path("/spin/{action}") @Detail("Spin compile") From 6439a947b38d89f499661bbfd99539779c371717 Mon Sep 17 00:00:00 2001 From: Jim Ewald Date: Wed, 5 Jun 2019 16:16:26 -0700 Subject: [PATCH 2/2] Adding back the javascript fix --- src/main/webapp/WEB-INF/servlet/index.jsp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/WEB-INF/servlet/index.jsp b/src/main/webapp/WEB-INF/servlet/index.jsp index 2973256f..ab06fed9 100644 --- a/src/main/webapp/WEB-INF/servlet/index.jsp +++ b/src/main/webapp/WEB-INF/servlet/index.jsp @@ -46,9 +46,9 @@ " /> " /> BlocklyProp - - - + + + <%@ include file="/WEB-INF/includes/pageparts/menu.jsp"%> @@ -78,7 +78,7 @@ <%@ include file="/WEB-INF/includes/pageparts/project-login-dialog.jsp"%> - + <%@ include file="/WEB-INF/includes/pageparts/footer.jsp"%>