changed base64 encoder, added setmaxtime to submitecl so asynchronous

runs can run

Author: drealeed

pom.xml

@@ -126,6 +126,11 @@
 			<artifactId>junit</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+	<groupId>commons-codec</groupId>
+	<artifactId>commons-codec</artifactId>
+	<version>1.2</version>
+</dependency>
 	</dependencies>
 
 </project>

src/main/java/org/hpccsystems/javaecl/ECLSoap.java

@@ -6,7 +6,7 @@
 import java.net.*;
 import java.io.*;
 import java.util.*;
-import sun.misc.BASE64Encoder;
+import org.apache.commons.codec.binary.Base64; 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.ByteArrayInputStream;
@@ -64,7 +64,7 @@ public class ECLSoap {
     private String maxReturn = "";
     private String cluster = "";
     private boolean includeML = false;
-    
+    private int maxRunTime=300; //in seconds, 300 is server default;
     private String outputName = "";
 
     private String wuid = "";
@@ -73,6 +73,7 @@ public class ECLSoap {
 
     private int errorCount = 0;
     private int warningCount = 0;
+    private String errorText = "";
 
     private String user = "";
     private String pass = "";
@@ -239,6 +240,8 @@ public void setIncludeSALT(boolean includeSALT) {
 	 //end getters and setters
 
 
+	
+	
     public ECLSoap() {
     	if (System.getProperty("os.name").startsWith("Windows")) {
     		this.tempDir = System.getProperty("java.io.tmpdir");
@@ -249,7 +252,15 @@ public ECLSoap() {
 
         //System.out.println("OS Temp Dir is: " + tempDir);
     }
-    public String syntaxCheck(String ecl){
+    public String getErrorText() {
+		return errorText;
+	}
+
+	public void setErrorText(String errorText) {
+		this.errorText = errorText;
+	}
+
+	public String syntaxCheck(String ecl){
         String res = "";
         int test = 0;
         String inFile = this.outputName + "CheckSpoonEclCode.ecl";
@@ -324,6 +335,12 @@ public String syntaxCheck(String ecl){
 
             pb.redirectErrorStream(true); // merge stdout, stderr of process
             System.out.println(pb.command().toString());
+	    	boolean pathExists = (new File(eclccInstallDir)).exists();
+	    	if(!pathExists){
+	    		errorCount++;
+	    		res += "Unable to locate the ecl compiler, Check Global Variables\r\n";
+	    		errorText += "Unable to locate the ecl compiler, Check Global Variables\r\n";
+	    	}
             File path = new File(eclccInstallDir);
             pb.directory(path);
             Process p = pb.start();
@@ -333,6 +350,7 @@ public String syntaxCheck(String ecl){
             String line;
             while((line = br.readLine()) != null){
                 res += cleanError(line)+"\r\n";
+                errorText += cleanError(line)+"\r\n";
             }
 
             InputStream iError = p.getErrorStream();
@@ -342,6 +360,7 @@ public String syntaxCheck(String ecl){
             while((lineErr = brErr.readLine()) != null){
 
                 res += cleanError(lineErr)+"\r\n";
+                errorText += cleanError(lineErr)+"\r\n";
             }
 
             //deleteFile(this.tempDir+inFile);
@@ -388,7 +407,7 @@ public String cleanError(String in){
 	            	String ec = matcher.group();
 
 	            	try{
-	                 	this.errorCount = Integer.parseInt(ec);
+	                 	this.errorCount = Integer.parseInt(ec) + this.errorCount;
 	                }catch (Exception ee){
 
 	                }
@@ -415,7 +434,7 @@ public String cleanError(String in){
 	            	String wc = matcher.group();
 
 	            	try{
-	                	this.warningCount = Integer.parseInt(wc);
+	                	this.warningCount = Integer.parseInt(wc) + this.warningCount;
 	                }catch (Exception we){
 
 	                }
@@ -730,13 +749,16 @@ public void submitSoapCall(String wuid){
                   "<soapenv:Body>"+
                      "<WUSubmit xmlns=\"urn:hpccsystems:ws:wsworkunits\">"+
                         "<Wuid>" + wuid + "</Wuid>"+
+                        "<MaxRunTime>" + maxRunTime + "<MaxRunTime>" +
                         "<Cluster>" + this.cluster + "</Cluster>"+
                      "</WUSubmit>"+
                   "</soapenv:Body>"+
                "</soapenv:Envelope>";
 
         String path = "/WsWorkunits/WUSubmit";
         InputStream is2 = this.doSoap(xml, path);
+        
+        //need to check for errors here
     }
 
     /*
@@ -1139,7 +1161,7 @@ public InputStream doSoap(String xmldata, String path){
        URLConnection conn = null;
        boolean isError = false;
        boolean isSuccess = false;
-       
+      
        int errorCnt = 0;
        InputStream is = null;
        while(errorCnt < 5 && !isSuccess && !isLogonFail){
@@ -1167,8 +1189,7 @@ public InputStream doSoap(String xmldata, String path){
 	            if(!user.equals("")){
 	            	String authStr = user + ":" + pass;
 	            	//System.out.println("USER INFO: " + authStr);
-	            	BASE64Encoder encoder = new BASE64Encoder();
-	            	String encoded = encoder.encode(authStr.getBytes());
+	           	String encoded = new String(Base64.encodeBase64(authStr.getBytes()));
 
 
 	            	conn.setRequestProperty("Authorization","Basic "+encoded);
@@ -1266,7 +1287,12 @@ private String compileECL(String ecl){
 
            // System.out.println("_________________________ECLCC_______________________________");
 
-            
+            boolean pathExists = (new File(eclccInstallDir)).exists();
+	    	if(!pathExists){
+	    		errorCount++;
+	    		errorText += "Unable to locate the ecl compiler, Check Global Variables\r\n";
+	    	}
+	    	
             ArrayList<String> paramsAL = new ArrayList<String>();
             paramsAL.add(c);
             paramsAL.add("-E");
@@ -1322,9 +1348,9 @@ private String compileECL(String ecl){
            // System.out.println("+++++++++++++++++++++");
            // System.out.println("+++++++++++++++++++++");
            // System.out.println("+++++++++++++++++++++");
-            System.out.println("++++++++++Compile ECLSOAP+++++++++++");
-            System.out.println("+++++++++++++++++++++");
-            System.out.println(pb.command().toString());
+            //System.out.println("++++++++++Compile ECLSOAP+++++++++++");
+           // System.out.println("+++++++++++++++++++++");
+            //System.out.println(pb.command().toString());
             pb.redirectErrorStream(true); // merge stdout, stderr of process
 
             File path = new File(eclccInstallDir);
@@ -1337,7 +1363,7 @@ private String compileECL(String ecl){
             String lineErr;
             while((lineErr = brErr.readLine()) != null){
                 //System.out.println("#####"+lineErr);
-                
+                errorText += lineErr + "\r\n";
             }
 
             InputStream is = p.getInputStream();
@@ -1347,6 +1373,7 @@ private String compileECL(String ecl){
 
             while((line = br.readLine()) != null){
                 //System.out.println(line);
+            	
             }
 
 
@@ -1453,10 +1480,20 @@ public static void main(String[] args){
                    System.out.println(line);
                }
 
+               
+               
            }catch (Exception e){
                System.out.println(e.toString());
                e.printStackTrace();
            }
+    	   
+    	   ECLSoap es = new ECLSoap();
+    	   es.setCluster("mythor");
+    	   es.setHostname("10.239.227.6");
+    	   es.setEclccInstallDir(eclccInstallDir);
+    	   es.setJobName("test");
+    	   es.executeECL("output('hi');");
+    	   
     }
 
     /*
@@ -1499,7 +1536,15 @@ private static String openFile(String filePath){
         return fileData.toString();
     }
 
-    /*
+    public int getMaxRunTime() {
+		return maxRunTime;
+	}
+
+	public void setMaxRunTime(int maxRunTime) {
+		this.maxRunTime = maxRunTime;
+	}
+
+	/*
      * ECLAuthenticator
      * 
      * Hnadles the http authentication for the soap request