update WebService for current PSOATransRun

Author: tmitsi

PSOATransRun/src/main/java/org/ruleml/psoa/psoatransrun/PSOATransRun.java

@@ -107,7 +107,7 @@ else if (lang.equalsIgnoreCase("tptp"))
 		{
 			systemInstantiation = "[PSOA2TPTP,VampirePrime]";
 		}
-		return "PSOATransRun" + "1.4.2" + systemInstantiation;
+		return "PSOATransRun" + "1.4.3" + systemInstantiation;
 	}
 
 	/***

PSOATransRunWebService/manifest.yml

@@ -0,0 +1,8 @@
+---
+applications:
+ - name: psoademo
+   random-route: true
+   path: target/PSOATransRunWebService.war
+   memory: 256M
+   instances: 1
+   buildpack: liberty-for-java

PSOATransRunWebService/pom.xml

@@ -23,6 +23,21 @@
 			<version>1.1.1</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+		   <groupId>org.jboss.resteasy</groupId>
+		   <artifactId>resteasy-jaxb-provider</artifactId>
+		   <version>3.0.26.Final</version>
+		</dependency>
+		<dependency>
+		   <groupId>org.jboss.resteasy</groupId>
+		     <artifactId>resteasy-jaxrs</artifactId>
+		<version>3.0.26.Final</version>
+		</dependency>
+		<dependency>
+		   <groupId>org.jboss.resteasy</groupId>
+		   <artifactId>resteasy-jackson2-provider</artifactId>
+		   <version>3.0.26.Final</version>
+		</dependency>
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>

PSOATransRunWebService/src/main/java/org/ruleml/psoa/psoatransrun/restful/resources/Application.java

@@ -3,7 +3,9 @@
 import static org.ruleml.psoa.psoatransrun.utils.Collections.set;
 
 import java.util.Set;
+import javax.ws.rs.ApplicationPath;
 
+@ApplicationPath("/ws/*")
 public class Application extends javax.ws.rs.core.Application {
 	private Set<Object> singletons = set();
 	private Set<Class<?>> empty = set();

PSOATransRunWebService/src/main/webapp/index.html

@@ -165,7 +165,7 @@
 		});
 	});
 	$("#transQueryBtn").click(function() {
-		translate(null, encode(psoaQuery()), function(result) {
+		translate(encode(psoaKB()), encode(psoaQuery()), function(result) {
 			translatedQuery = result.query;
 			queryVariables = result.queryVars;
 			$("#transQuery").val(translatedQuery);
@@ -203,8 +203,9 @@ <h1>PSOATransRun</h1>
 			<textarea id="PSOAKB" rows="20" cols="80"></textarea><br/><br/>
 			<div>
 			Target Language: 
-			<input type="radio" name="translatorTarget" value="prolog" /> Prolog
+			<input type="radio" name="translatorTarget" value="prolog" disabled/> Prolog
 			<input type="radio" name="translatorTarget" value="tptp" checked="checked" /> TPTP <br/>
+			<small><small><em>Target language "Prolog" not implemented for PSOATransRun WebService</em></small></small><br/>
 			</div>
 			<div style="visibility:hidden">
 			<input type="radio" name="translatorType" value="Direct" /> Direct Translator