web service regeneration

haas-java-client/.settings/org.eclipse.core.resources.prefs

@@ -14,22 +14,16 @@ encoding//src/main/java/cz/it4i/fiji/haas_java_client/proxy/FileTransferWsLocato
 encoding//src/main/java/cz/it4i/fiji/haas_java_client/proxy/FileTransferWsSoap.java=UTF-8
 encoding//src/main/java/cz/it4i/fiji/haas_java_client/proxy/FileTransferWsSoap12Stub.java=UTF-8
 encoding//src/main/java/cz/it4i/fiji/haas_java_client/proxy/FileTransferWsSoapStub.java=UTF-8
-encoding//src/main/java/cz/it4i/fiji/haas_java_client/proxy/JobFileContentExt.java=UTF-8
 encoding//src/main/java/cz/it4i/fiji/haas_java_client/proxy/JobManagementWs.java=UTF-8
 encoding//src/main/java/cz/it4i/fiji/haas_java_client/proxy/JobManagementWsLocator.java=UTF-8
 encoding//src/main/java/cz/it4i/fiji/haas_java_client/proxy/JobManagementWsSoap.java=UTF-8
-encoding//src/main/java/cz/it4i/fiji/haas_java_client/proxy/JobManagementWsSoap12Stub.java=UTF-8
 encoding//src/main/java/cz/it4i/fiji/haas_java_client/proxy/JobManagementWsSoapStub.java=UTF-8
 encoding//src/main/java/cz/it4i/fiji/haas_java_client/proxy/JobPriorityExt.java=UTF-8
 encoding//src/main/java/cz/it4i/fiji/haas_java_client/proxy/JobSpecificationExt.java=UTF-8
 encoding//src/main/java/cz/it4i/fiji/haas_java_client/proxy/JobStateExt.java=UTF-8
 encoding//src/main/java/cz/it4i/fiji/haas_java_client/proxy/PasswordCredentialsExt.java=UTF-8
-encoding//src/main/java/cz/it4i/fiji/haas_java_client/proxy/ResourceLimitationExt.java=UTF-8
-encoding//src/main/java/cz/it4i/fiji/haas_java_client/proxy/ResourceUsageExt.java=UTF-8
 encoding//src/main/java/cz/it4i/fiji/haas_java_client/proxy/SubmittedJobInfoExt.java=UTF-8
 encoding//src/main/java/cz/it4i/fiji/haas_java_client/proxy/SubmittedTaskInfoExt.java=UTF-8
-encoding//src/main/java/cz/it4i/fiji/haas_java_client/proxy/SynchronizableFilesExt.java=UTF-8
-encoding//src/main/java/cz/it4i/fiji/haas_java_client/proxy/TaskFileOffsetExt.java=UTF-8
 encoding//src/main/java/cz/it4i/fiji/haas_java_client/proxy/TaskSpecificationExt.java=UTF-8
 encoding//src/main/java/cz/it4i/fiji/haas_java_client/proxy/TaskStateExt.java=UTF-8
 encoding//src/main/java/cz/it4i/fiji/haas_java_client/proxy/UserAndLimitationManagementWs.java=UTF-8

haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/HaaSClient.java

@@ -402,7 +402,7 @@ public class HaaSClient {
 
 	private JobManagementWsSoap getJobManagement() throws ServiceException {
 		if (jobManagement == null) {
-			jobManagement = new JobManagementWsLocator().getJobManagementWsSoap12();
+			jobManagement = new JobManagementWsLocator().getJobManagementWsSoap();
 		}
 		return jobManagement;
 	}

haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/proxy/JobManagementWs.java

@@ -13,9 +13,4 @@ public interface JobManagementWs extends javax.xml.rpc.Service {
     public cz.it4i.fiji.haas_java_client.proxy.JobManagementWsSoap getJobManagementWsSoap() throws javax.xml.rpc.ServiceException;
 
     public cz.it4i.fiji.haas_java_client.proxy.JobManagementWsSoap getJobManagementWsSoap(java.net.URL portAddress) throws javax.xml.rpc.ServiceException;
-    public java.lang.String getJobManagementWsSoap12Address();
-
-    public cz.it4i.fiji.haas_java_client.proxy.JobManagementWsSoap getJobManagementWsSoap12() throws javax.xml.rpc.ServiceException;
-
-    public cz.it4i.fiji.haas_java_client.proxy.JobManagementWsSoap getJobManagementWsSoap12(java.net.URL portAddress) throws javax.xml.rpc.ServiceException;
 }

haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/proxy/JobManagementWsLocator.java

@@ -22,7 +22,7 @@ public class JobManagementWsLocator extends org.apache.axis.client.Service imple
     }
 
     // Use to get a proxy class for JobManagementWsSoap
-    private java.lang.String JobManagementWsSoap_address = "http://utepstorage.it4i.cz/HaasWsFiji/JobManagementWs.asmx";
+    private java.lang.String JobManagementWsSoap_address = "http://utepstorage.it4i.cz/HaasWsFiji/JobManagementWS.asmx";
 
     public java.lang.String getJobManagementWsSoapAddress() {
         return JobManagementWsSoap_address;
@@ -65,57 +65,10 @@ public class JobManagementWsLocator extends org.apache.axis.client.Service imple
         JobManagementWsSoap_address = address;
     }
 
-
-    // Use to get a proxy class for JobManagementWsSoap12
-    private java.lang.String JobManagementWsSoap12_address = "http://utepstorage.it4i.cz/HaasWsFiji/JobManagementWs.asmx";
-
-    public java.lang.String getJobManagementWsSoap12Address() {
-        return JobManagementWsSoap12_address;
-    }
-
-    // The WSDD service name defaults to the port name.
-    private java.lang.String JobManagementWsSoap12WSDDServiceName = "JobManagementWsSoap12";
-
-    public java.lang.String getJobManagementWsSoap12WSDDServiceName() {
-        return JobManagementWsSoap12WSDDServiceName;
-    }
-
-    public void setJobManagementWsSoap12WSDDServiceName(java.lang.String name) {
-        JobManagementWsSoap12WSDDServiceName = name;
-    }
-
-    public cz.it4i.fiji.haas_java_client.proxy.JobManagementWsSoap getJobManagementWsSoap12() throws javax.xml.rpc.ServiceException {
-       java.net.URL endpoint;
-        try {
-            endpoint = new java.net.URL(JobManagementWsSoap12_address);
-        }
-        catch (java.net.MalformedURLException e) {
-            throw new javax.xml.rpc.ServiceException(e);
-        }
-        return getJobManagementWsSoap12(endpoint);
-    }
-
-    public cz.it4i.fiji.haas_java_client.proxy.JobManagementWsSoap getJobManagementWsSoap12(java.net.URL portAddress) throws javax.xml.rpc.ServiceException {
-        try {
-            cz.it4i.fiji.haas_java_client.proxy.JobManagementWsSoap12Stub _stub = new cz.it4i.fiji.haas_java_client.proxy.JobManagementWsSoap12Stub(portAddress, this);
-            _stub.setPortName(getJobManagementWsSoap12WSDDServiceName());
-            return _stub;
-        }
-        catch (org.apache.axis.AxisFault e) {
-            return null;
-        }
-    }
-
-    public void setJobManagementWsSoap12EndpointAddress(java.lang.String address) {
-        JobManagementWsSoap12_address = address;
-    }
-
     /**
      * For the given interface, get the stub implementation.
      * If this service has no port for the given interface,
      * then ServiceException is thrown.
-     * This service has multiple ports for a given interface;
-     * the proxy implementation returned may be indeterminate.
      */
     public java.rmi.Remote getPort(Class serviceEndpointInterface) throws javax.xml.rpc.ServiceException {
         try {
@@ -124,11 +77,6 @@ public class JobManagementWsLocator extends org.apache.axis.client.Service imple
                 _stub.setPortName(getJobManagementWsSoapWSDDServiceName());
                 return _stub;
             }
-            if (cz.it4i.fiji.haas_java_client.proxy.JobManagementWsSoap.class.isAssignableFrom(serviceEndpointInterface)) {
-                cz.it4i.fiji.haas_java_client.proxy.JobManagementWsSoap12Stub _stub = new cz.it4i.fiji.haas_java_client.proxy.JobManagementWsSoap12Stub(new java.net.URL(JobManagementWsSoap12_address), this);
-                _stub.setPortName(getJobManagementWsSoap12WSDDServiceName());
-                return _stub;
-            }
         }
         catch (java.lang.Throwable t) {
             throw new javax.xml.rpc.ServiceException(t);
@@ -149,9 +97,6 @@ public class JobManagementWsLocator extends org.apache.axis.client.Service imple
         if ("JobManagementWsSoap".equals(inputPortName)) {
             return getJobManagementWsSoap();
         }
-        else if ("JobManagementWsSoap12".equals(inputPortName)) {
-            return getJobManagementWsSoap12();
-        }
         else  {
             java.rmi.Remote _stub = getPort(serviceEndpointInterface);
             ((org.apache.axis.client.Stub) _stub).setPortName(portName);
@@ -169,7 +114,6 @@ public class JobManagementWsLocator extends org.apache.axis.client.Service imple
         if (ports == null) {
             ports = new java.util.HashSet();
             ports.add(new javax.xml.namespace.QName("http://hpcaas.it4i.cz/", "JobManagementWsSoap"));
-            ports.add(new javax.xml.namespace.QName("http://hpcaas.it4i.cz/", "JobManagementWsSoap12"));
         }
         return ports.iterator();
     }
@@ -183,10 +127,6 @@ if ("JobManagementWsSoap".equals(portName)) {
             setJobManagementWsSoapEndpointAddress(address);
         }
         else 
-if ("JobManagementWsSoap12".equals(portName)) {
-            setJobManagementWsSoap12EndpointAddress(address);
-        }
-        else 
 { // Unknown Port Name
             throw new javax.xml.rpc.ServiceException(" Cannot set Endpoint Address for Unknown Port" + portName);
         }

haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/proxy/JobManagementWsSoap.java

@@ -11,6 +11,7 @@ public interface JobManagementWsSoap extends java.rmi.Remote {
     public cz.it4i.fiji.haas_java_client.proxy.SubmittedJobInfoExt createJob(cz.it4i.fiji.haas_java_client.proxy.JobSpecificationExt specification, java.lang.String sessionCode) throws java.rmi.RemoteException;
     public cz.it4i.fiji.haas_java_client.proxy.SubmittedJobInfoExt submitJob(long createdJobInfoId, java.lang.String sessionCode) throws java.rmi.RemoteException;
     public cz.it4i.fiji.haas_java_client.proxy.SubmittedJobInfoExt cancelJob(long submittedJobInfoId, java.lang.String sessionCode) throws java.rmi.RemoteException;
+    public void deleteJob(long submittedJobInfoId, java.lang.String sessionCode) throws java.rmi.RemoteException;
     public cz.it4i.fiji.haas_java_client.proxy.SubmittedJobInfoExt[] listJobsForCurrentUser(java.lang.String sessionCode) throws java.rmi.RemoteException;
     public cz.it4i.fiji.haas_java_client.proxy.SubmittedJobInfoExt getCurrentInfoForJob(long submittedJobInfoId, java.lang.String sessionCode) throws java.rmi.RemoteException;
 }

haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/proxy/JobManagementWsSoapProxy.java

@@ -62,6 +62,12 @@ public class JobManagementWsSoapProxy implements cz.it4i.fiji.haas_java_client.p
     return jobManagementWsSoap.cancelJob(submittedJobInfoId, sessionCode);
   }
   
+  public void deleteJob(long submittedJobInfoId, java.lang.String sessionCode) throws java.rmi.RemoteException{
+    if (jobManagementWsSoap == null)
+      _initJobManagementWsSoapProxy();
+    jobManagementWsSoap.deleteJob(submittedJobInfoId, sessionCode);
+  }
+  
   public cz.it4i.fiji.haas_java_client.proxy.SubmittedJobInfoExt[] listJobsForCurrentUser(java.lang.String sessionCode) throws java.rmi.RemoteException{
     if (jobManagementWsSoap == null)
       _initJobManagementWsSoapProxy();

haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/proxy/JobManagementWsSoapStub.java

@@ -16,7 +16,7 @@ public class JobManagementWsSoapStub extends org.apache.axis.client.Stub impleme
     static org.apache.axis.description.OperationDesc [] _operations;
 
     static {
-        _operations = new org.apache.axis.description.OperationDesc[5];
+        _operations = new org.apache.axis.description.OperationDesc[6];
         _initOperationDesc1();
     }
 
@@ -66,6 +66,18 @@ public class JobManagementWsSoapStub extends org.apache.axis.client.Stub impleme
         oper.setUse(org.apache.axis.constants.Use.LITERAL);
         _operations[2] = oper;
 
+        oper = new org.apache.axis.description.OperationDesc();
+        oper.setName("DeleteJob");
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://hpcaas.it4i.cz/", "submittedJobInfoId"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "long"), long.class, false, false);
+        oper.addParameter(param);
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://hpcaas.it4i.cz/", "sessionCode"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
+        param.setOmittable(true);
+        oper.addParameter(param);
+        oper.setReturnType(org.apache.axis.encoding.XMLType.AXIS_VOID);
+        oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
+        oper.setUse(org.apache.axis.constants.Use.LITERAL);
+        _operations[3] = oper;
+
         oper = new org.apache.axis.description.OperationDesc();
         oper.setName("ListJobsForCurrentUser");
         param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://hpcaas.it4i.cz/", "sessionCode"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
@@ -78,7 +90,7 @@ public class JobManagementWsSoapStub extends org.apache.axis.client.Stub impleme
         param.setItemQName(new javax.xml.namespace.QName("http://hpcaas.it4i.cz/", "SubmittedJobInfoExt"));
         oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
         oper.setUse(org.apache.axis.constants.Use.LITERAL);
-        _operations[3] = oper;
+        _operations[4] = oper;
 
         oper = new org.apache.axis.description.OperationDesc();
         oper.setName("GetCurrentInfoForJob");
@@ -92,7 +104,7 @@ public class JobManagementWsSoapStub extends org.apache.axis.client.Stub impleme
         oper.setReturnQName(new javax.xml.namespace.QName("http://hpcaas.it4i.cz/", "GetCurrentInfoForJobResult"));
         oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
         oper.setUse(org.apache.axis.constants.Use.LITERAL);
-        _operations[4] = oper;
+        _operations[5] = oper;
 
     }
 
@@ -440,13 +452,40 @@ public class JobManagementWsSoapStub extends org.apache.axis.client.Stub impleme
 }
     }
 
-    public cz.it4i.fiji.haas_java_client.proxy.SubmittedJobInfoExt[] listJobsForCurrentUser(java.lang.String sessionCode) throws java.rmi.RemoteException {
+    public void deleteJob(long submittedJobInfoId, java.lang.String sessionCode) throws java.rmi.RemoteException {
         if (super.cachedEndpoint == null) {
             throw new org.apache.axis.NoEndPointException();
         }
         org.apache.axis.client.Call _call = createCall();
         _call.setOperation(_operations[3]);
         _call.setUseSOAPAction(true);
+        _call.setSOAPActionURI("http://hpcaas.it4i.cz/DeleteJob");
+        _call.setEncodingStyle(null);
+        _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE);
+        _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE);
+        _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
+        _call.setOperationName(new javax.xml.namespace.QName("http://hpcaas.it4i.cz/", "DeleteJob"));
+
+        setRequestHeaders(_call);
+        setAttachments(_call);
+ try {        java.lang.Object _resp = _call.invoke(new java.lang.Object[] {new java.lang.Long(submittedJobInfoId), sessionCode});
+
+        if (_resp instanceof java.rmi.RemoteException) {
+            throw (java.rmi.RemoteException)_resp;
+        }
+        extractAttachments(_call);
+  } catch (org.apache.axis.AxisFault axisFaultException) {
+  throw axisFaultException;
+}
+    }
+
+    public cz.it4i.fiji.haas_java_client.proxy.SubmittedJobInfoExt[] listJobsForCurrentUser(java.lang.String sessionCode) throws java.rmi.RemoteException {
+        if (super.cachedEndpoint == null) {
+            throw new org.apache.axis.NoEndPointException();
+        }
+        org.apache.axis.client.Call _call = createCall();
+        _call.setOperation(_operations[4]);
+        _call.setUseSOAPAction(true);
         _call.setSOAPActionURI("http://hpcaas.it4i.cz/ListJobsForCurrentUser");
         _call.setEncodingStyle(null);
         _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE);
@@ -479,7 +518,7 @@ public class JobManagementWsSoapStub extends org.apache.axis.client.Stub impleme
             throw new org.apache.axis.NoEndPointException();
         }
         org.apache.axis.client.Call _call = createCall();
-        _call.setOperation(_operations[4]);
+        _call.setOperation(_operations[5]);
         _call.setUseSOAPAction(true);
         _call.setSOAPActionURI("http://hpcaas.it4i.cz/GetCurrentInfoForJob");
         _call.setEncodingStyle(null);