You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2014/04/17 15:11:21 UTC
[1/2] git commit: Fixing the test cases to stop threads properly
Repository: airavata
Updated Branches:
refs/heads/master eeb2c0dc4 -> 9edda85fa
Fixing the test cases to stop threads properly
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/603897c6
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/603897c6
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/603897c6
Branch: refs/heads/master
Commit: 603897c636e7029607ae8c1141150a7b4f2c74a0
Parents: 3330060
Author: lahiru <la...@apache.org>
Authored: Thu Apr 17 09:08:14 2014 -0400
Committer: lahiru <la...@apache.org>
Committed: Thu Apr 17 09:08:14 2014 -0400
----------------------------------------------------------------------
.../airavata/job/monitor/MonitorManager.java | 26 ++++++++++++++++
.../airavata/job/monitor/AMQPMonitorTest.java | 5 +++-
.../QstatMonitorTestWithMyProxyAuth.java | 15 ++++++++++
.../client/sample/OrchestratorClientSample.java | 6 ++--
.../apache/airavata/job/AMQPMonitorTest.java | 31 ++++++++++++++++----
.../job/QstatMonitorTestWithMyProxyAuth.java | 26 ++++++++++++----
6 files changed, 95 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/603897c6/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/job/monitor/MonitorManager.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/job/monitor/MonitorManager.java b/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/job/monitor/MonitorManager.java
index 45b7230..8c916ef 100644
--- a/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/job/monitor/MonitorManager.java
+++ b/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/job/monitor/MonitorManager.java
@@ -217,6 +217,32 @@ public class MonitorManager {
}
}
+ /**
+ * This method should be invoked before adding any elements to monitorQueue
+ * In this method we assume that we give higher preference to Push
+ * Monitorig mechanism if there's any configured, otherwise Pull
+ * monitoring will be launched.
+ * Ex: If there's a reasource which doesn't support Push, we have
+ * to live with Pull MOnitoring.
+ *
+ * @throws AiravataMonitorException
+ */
+ public void stopMonitor() throws AiravataMonitorException {
+ //no push monitor is configured so we launch pull monitor
+ int index = 0;
+ if(localJobMonitor != null){
+ (new Thread(localJobMonitor)).stop();
+ }
+
+ for (PullMonitor monitor : pullMonitors) {
+ (new Thread(monitor)).stop();
+ }
+
+ //todo fix this
+ for (PushMonitor monitor : pushMonitors) {
+ (new Thread(monitor)).stop();
+ }
+ }
/* getter setters for the private variables */
public List<PullMonitor> getPullMonitors() {
http://git-wip-us.apache.org/repos/asf/airavata/blob/603897c6/modules/gfac/gfac-monitor/src/test/java/org/apache/airavata/job/monitor/AMQPMonitorTest.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-monitor/src/test/java/org/apache/airavata/job/monitor/AMQPMonitorTest.java b/modules/gfac/gfac-monitor/src/test/java/org/apache/airavata/job/monitor/AMQPMonitorTest.java
index 43ec28b..65ab8d0 100644
--- a/modules/gfac/gfac-monitor/src/test/java/org/apache/airavata/job/monitor/AMQPMonitorTest.java
+++ b/modules/gfac/gfac-monitor/src/test/java/org/apache/airavata/job/monitor/AMQPMonitorTest.java
@@ -49,6 +49,8 @@ public class AMQPMonitorTest {
private String pbsFilePath;
private String workingDirectory;
private HostDescription hostDescription;
+ private String proxyFilePath;
+
@Before
public void setUp() throws Exception {
@@ -61,6 +63,7 @@ public class AMQPMonitorTest {
myProxyPassword = System.getProperty("myproxy.password");
workingDirectory = System.getProperty("gsi.working.directory");
certificateLocation = System.getProperty("trusted.cert.location");
+ proxyFilePath = System.getProperty("proxy.file.path");
System.setProperty("connection.name", "xsede");
if (myProxyUserName == null || myProxyPassword == null || workingDirectory == null) {
System.out.println(">>>>>> Please run tests with my proxy user name and password. " +
@@ -71,7 +74,7 @@ public class AMQPMonitorTest {
monitorManager = new MonitorManager();
AMQPMonitor amqpMonitor = new
AMQPMonitor(monitorManager.getMonitorPublisher(),
- monitorManager.getPushQueue(), monitorManager.getFinishQueue(),"/Users/lahirugunathilake/Downloads/x509up_u503876","xsede",
+ monitorManager.getPushQueue(), monitorManager.getFinishQueue(),proxyFilePath,"xsede",
Arrays.asList("info1.dyn.teragrid.org,info2.dyn.teragrid.org".split(",")));
try {
monitorManager.addPushMonitor(amqpMonitor);
http://git-wip-us.apache.org/repos/asf/airavata/blob/603897c6/modules/gfac/gfac-monitor/src/test/java/org/apache/airavata/job/monitor/QstatMonitorTestWithMyProxyAuth.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-monitor/src/test/java/org/apache/airavata/job/monitor/QstatMonitorTestWithMyProxyAuth.java b/modules/gfac/gfac-monitor/src/test/java/org/apache/airavata/job/monitor/QstatMonitorTestWithMyProxyAuth.java
index 53abae3..f8360ba 100644
--- a/modules/gfac/gfac-monitor/src/test/java/org/apache/airavata/job/monitor/QstatMonitorTestWithMyProxyAuth.java
+++ b/modules/gfac/gfac-monitor/src/test/java/org/apache/airavata/job/monitor/QstatMonitorTestWithMyProxyAuth.java
@@ -20,6 +20,7 @@
*/
package org.apache.airavata.job.monitor;
+import com.google.common.eventbus.Subscribe;
import org.apache.airavata.commons.gfac.type.HostDescription;
import org.apache.airavata.gsi.ssh.api.Cluster;
import org.apache.airavata.gsi.ssh.api.SSHApiException;
@@ -31,8 +32,10 @@ import org.apache.airavata.gsi.ssh.impl.authentication.MyProxyAuthenticationInfo
import org.apache.airavata.gsi.ssh.util.CommonUtils;
import org.apache.airavata.job.monitor.exception.AiravataMonitorException;
import org.apache.airavata.job.monitor.impl.pull.qstat.QstatMonitor;
+import org.apache.airavata.job.monitor.state.JobStatus;
import org.apache.airavata.persistance.registry.jpa.impl.RegistryFactory;
import org.apache.airavata.schemas.gfac.GsisshHostType;
+import org.junit.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@ -71,6 +74,8 @@ public class QstatMonitorTestWithMyProxyAuth {
monitorManager = new MonitorManager(RegistryFactory.getLoggingRegistry());
QstatMonitor qstatMonitor = new
QstatMonitor(monitorManager.getPullQueue(), monitorManager.getMonitorPublisher());
+
+ monitorManager.getMonitorPublisher().registerListener(this);
try {
monitorManager.addPullMonitor(qstatMonitor);
monitorManager.launchMonitor();
@@ -147,4 +152,14 @@ public class QstatMonitorTestWithMyProxyAuth {
e.printStackTrace();
}
}
+
+ @Subscribe
+ public void testCaseShutDown(JobStatus status) {
+ Assert.assertNotNull(status.getState());
+ try {
+ monitorManager.stopMonitor();
+ } catch (AiravataMonitorException e) {
+ e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/603897c6/modules/orchestrator/orchestrator-client-sdks/src/main/java/org/apache/airavata/orchestrator/client/sample/OrchestratorClientSample.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-client-sdks/src/main/java/org/apache/airavata/orchestrator/client/sample/OrchestratorClientSample.java b/modules/orchestrator/orchestrator-client-sdks/src/main/java/org/apache/airavata/orchestrator/client/sample/OrchestratorClientSample.java
index 3a5fc55..abde87a 100644
--- a/modules/orchestrator/orchestrator-client-sdks/src/main/java/org/apache/airavata/orchestrator/client/sample/OrchestratorClientSample.java
+++ b/modules/orchestrator/orchestrator-client-sdks/src/main/java/org/apache/airavata/orchestrator/client/sample/OrchestratorClientSample.java
@@ -116,13 +116,13 @@ public class OrchestratorClientSample {
try {
expId = (String) registry.add(ParentDataType.EXPERIMENT, simpleExperiment);
} catch (Exception e) {
- e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ e.printStackTrace();
}
try {
orchestratorClient.launchExperiment(expId);
} catch (TException e) {
- e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ e.printStackTrace();
}
}
};
@@ -130,7 +130,7 @@ public class OrchestratorClientSample {
try {
thread.join();
} catch (InterruptedException e) {
- e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ e.printStackTrace();
}
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/603897c6/tools/job-monitor/src/test/java/org/apache/airavata/job/AMQPMonitorTest.java
----------------------------------------------------------------------
diff --git a/tools/job-monitor/src/test/java/org/apache/airavata/job/AMQPMonitorTest.java b/tools/job-monitor/src/test/java/org/apache/airavata/job/AMQPMonitorTest.java
index 0452c35..aa42a9d 100644
--- a/tools/job-monitor/src/test/java/org/apache/airavata/job/AMQPMonitorTest.java
+++ b/tools/job-monitor/src/test/java/org/apache/airavata/job/AMQPMonitorTest.java
@@ -21,6 +21,7 @@
package org.apache.airavata.job;
import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
import org.apache.airavata.commons.gfac.type.HostDescription;
import org.apache.airavata.gsi.ssh.api.Cluster;
import org.apache.airavata.gsi.ssh.api.SSHApiException;
@@ -34,10 +35,13 @@ import org.apache.airavata.job.monitor.UserMonitorData;
import org.apache.airavata.job.monitor.event.MonitorPublisher;
import org.apache.airavata.job.monitor.exception.AiravataMonitorException;
import org.apache.airavata.job.monitor.impl.push.amqp.AMQPMonitor;
+import org.apache.airavata.job.monitor.state.JobStatus;
import org.apache.airavata.schemas.gfac.GsisshHostType;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import javax.validation.constraints.AssertTrue;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
@@ -58,6 +62,7 @@ public class AMQPMonitorTest {
private BlockingQueue<MonitorID> finishQueue;
private BlockingQueue<MonitorID> pushQueue;
private Thread pushThread;
+ private String proxyFilePath;
@Before
public void setUp() throws Exception {
// System.setProperty("myproxy.username", "ogce");
@@ -65,10 +70,12 @@ public class AMQPMonitorTest {
// System.setProperty("basedir", "/Users/lahirugunathilake/work/airavata/sandbox/gsissh");
// System.setProperty("gsi.working.directory", "/home/ogce");
// System.setProperty("trusted.cert.location", "/Users/lahirugunathilake/Downloads/certificates");
+// System.setProperty("proxy.file.path", "/Users/lahirugunathilake/Downloads/x509up_u503876");
myProxyUserName = System.getProperty("myproxy.username");
myProxyPassword = System.getProperty("myproxy.password");
workingDirectory = System.getProperty("gsi.working.directory");
certificateLocation = System.getProperty("trusted.cert.location");
+ proxyFilePath = System.getProperty("proxy.file.path");
System.setProperty("connection.name", "xsede");
if (myProxyUserName == null || myProxyPassword == null || workingDirectory == null) {
System.out.println(">>>>>> Please run tests with my proxy user name and password. " +
@@ -80,9 +87,10 @@ public class AMQPMonitorTest {
pushQueue = new LinkedBlockingQueue<MonitorID>();
finishQueue = new LinkedBlockingQueue<MonitorID>();
+
AMQPMonitor amqpMonitor = new
AMQPMonitor(monitorPublisher,
- pushQueue, finishQueue,"/Users/lahirugunathilake/Downloads/x509up_u503876","xsede",
+ pushQueue, finishQueue,proxyFilePath,"xsede",
Arrays.asList("info1.dyn.teragrid.org,info2.dyn.teragrid.org".split(",")));
try {
pushThread = (new Thread(amqpMonitor));
@@ -147,12 +155,25 @@ public class AMQPMonitorTest {
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
}
try {
- pushThread.join(5000);
- Iterator<MonitorID> iterator = pushQueue.iterator();
- MonitorID next = iterator.next();
- org.junit.Assert.assertNotNull(next.getStatus());
+ pushThread.join();
} catch (InterruptedException e) {
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
}
+ class InnerClassAMQP{
+ @Subscribe
+ private void getStatus(JobStatus status){
+ Assert.assertNotNull(status);
+ pushThread.interrupt();
+ }
+ }
+ monitorPublisher.registerListener(new InnerClassAMQP());
+// try {
+// pushThread.join(5000);
+// Iterator<MonitorID> iterator = pushQueue.iterator();
+// MonitorID next = iterator.next();
+// org.junit.Assert.assertNotNull(next.getStatus());
+// } catch (Exception e) {
+// e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+// }
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/603897c6/tools/job-monitor/src/test/java/org/apache/airavata/job/QstatMonitorTestWithMyProxyAuth.java
----------------------------------------------------------------------
diff --git a/tools/job-monitor/src/test/java/org/apache/airavata/job/QstatMonitorTestWithMyProxyAuth.java b/tools/job-monitor/src/test/java/org/apache/airavata/job/QstatMonitorTestWithMyProxyAuth.java
index af429a3..c086c65 100644
--- a/tools/job-monitor/src/test/java/org/apache/airavata/job/QstatMonitorTestWithMyProxyAuth.java
+++ b/tools/job-monitor/src/test/java/org/apache/airavata/job/QstatMonitorTestWithMyProxyAuth.java
@@ -21,6 +21,7 @@
package org.apache.airavata.job;
import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
import org.apache.airavata.commons.gfac.type.HostDescription;
import org.apache.airavata.gsi.ssh.api.Cluster;
import org.apache.airavata.gsi.ssh.api.SSHApiException;
@@ -34,7 +35,9 @@ import org.apache.airavata.job.monitor.MonitorID;
import org.apache.airavata.job.monitor.UserMonitorData;
import org.apache.airavata.job.monitor.event.MonitorPublisher;
import org.apache.airavata.job.monitor.impl.pull.qstat.QstatMonitor;
+import org.apache.airavata.job.monitor.state.JobStatus;
import org.apache.airavata.schemas.gfac.GsisshHostType;
+import org.junit.Assert;
import org.testng.annotations.Test;
import java.io.File;
@@ -73,6 +76,16 @@ public class QstatMonitorTestWithMyProxyAuth {
}
monitorPublisher = new MonitorPublisher(new EventBus());
+ class InnerClassQstat {
+
+ @Subscribe
+ private void getStatus(JobStatus status) {
+ Assert.assertNotNull(status);
+ System.out.println(status.getState().toString());
+ monitorThread.interrupt();
+ }
+ }
+ monitorPublisher.registerListener(this);
pullQueue = new LinkedBlockingQueue<UserMonitorData>();
QstatMonitor qstatMonitor = new
QstatMonitor(pullQueue, monitorPublisher);
@@ -140,13 +153,16 @@ public class QstatMonitorTestWithMyProxyAuth {
}
}
try {
- monitorThread.join(5000);
- Iterator<UserMonitorData> iterator = pullQueue.iterator();
- UserMonitorData next = iterator.next();
- MonitorID monitorID = next.getHostMonitorData().get(0).getMonitorIDs().get(0);
- org.junit.Assert.assertNotNull(monitorID.getStatus());
+
+ monitorThread.join();
} catch (Exception e) {
e.printStackTrace();
}
}
+
+ @Subscribe
+ public void testCaseShutDown(JobStatus status) {
+ Assert.assertNotNull(status.getState());
+ monitorThread.stop();
+ }
}
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by la...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/9edda85f
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/9edda85f
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/9edda85f
Branch: refs/heads/master
Commit: 9edda85fa19b2cdb919b8762faf2715945346e76
Parents: 603897c eeb2c0d
Author: lahiru <la...@apache.org>
Authored: Thu Apr 17 09:10:12 2014 -0400
Committer: lahiru <la...@apache.org>
Committed: Thu Apr 17 09:10:12 2014 -0400
----------------------------------------------------------------------
README | 4 -
.../airavata-cpp-sdk/README | 7 -
.../airavata-stubs/Airavata.cpp | 6268 ------------------
.../airavata-cpp-sdk/airavata-stubs/Airavata.h | 2714 --------
.../airavata-stubs/Airavata_server.skeleton.cpp | 129 -
.../airavata-stubs/airavataAPI_constants.cpp | 19 -
.../airavata-stubs/airavataAPI_constants.h | 25 -
.../airavata-stubs/airavataAPI_types.cpp | 13 -
.../airavata-stubs/airavataAPI_types.h | 26 -
.../airavataDataModel_constants.cpp | 17 -
.../airavataDataModel_constants.h | 24 -
.../airavata-stubs/airavataDataModel_types.cpp | 13 -
.../airavata-stubs/airavataDataModel_types.h | 23 -
.../airavata-stubs/airavataErrors_constants.cpp | 17 -
.../airavata-stubs/airavataErrors_constants.h | 24 -
.../airavata-stubs/airavataErrors_types.cpp | 511 --
.../airavata-stubs/airavataErrors_types.h | 341 -
.../experimentModel_constants.cpp | 23 -
.../airavata-stubs/experimentModel_constants.h | 27 -
.../airavata-stubs/experimentModel_types.cpp | 2867 --------
.../airavata-stubs/experimentModel_types.h | 1801 -----
.../airavata-stubs/workspaceModel_constants.cpp | 17 -
.../airavata-stubs/workspaceModel_constants.h | 24 -
.../airavata-stubs/workspaceModel_types.cpp | 464 --
.../airavata-stubs/workspaceModel_types.h | 273 -
.../airavata-cpp-sdk/pom.xml | 114 +
.../src/main/assembly/bin-assembly.xml | 63 +
.../airavata-cpp-sdk/src/main/resources/INSTALL | 31 +
.../airavata-cpp-sdk/src/main/resources/LICENSE | 2272 +++++++
.../airavata-cpp-sdk/src/main/resources/NOTICE | 163 +
.../airavata-cpp-sdk/src/main/resources/README | 7 +
.../src/main/resources/lib/Airavata.cpp | 6268 ++++++++++++++++++
.../src/main/resources/lib/Airavata.h | 2714 ++++++++
.../resources/lib/Airavata_server.skeleton.cpp | 129 +
.../resources/lib/airavataAPI_constants.cpp | 19 +
.../main/resources/lib/airavataAPI_constants.h | 25 +
.../main/resources/lib/airavataAPI_types.cpp | 13 +
.../src/main/resources/lib/airavataAPI_types.h | 26 +
.../lib/airavataDataModel_constants.cpp | 17 +
.../resources/lib/airavataDataModel_constants.h | 24 +
.../resources/lib/airavataDataModel_types.cpp | 13 +
.../resources/lib/airavataDataModel_types.h | 23 +
.../resources/lib/airavataErrors_constants.cpp | 17 +
.../resources/lib/airavataErrors_constants.h | 24 +
.../main/resources/lib/airavataErrors_types.cpp | 511 ++
.../main/resources/lib/airavataErrors_types.h | 341 +
.../resources/lib/experimentModel_constants.cpp | 23 +
.../resources/lib/experimentModel_constants.h | 27 +
.../resources/lib/experimentModel_types.cpp | 2867 ++++++++
.../main/resources/lib/experimentModel_types.h | 1801 +++++
.../resources/lib/workspaceModel_constants.cpp | 17 +
.../resources/lib/workspaceModel_constants.h | 24 +
.../main/resources/lib/workspaceModel_types.cpp | 464 ++
.../main/resources/lib/workspaceModel_types.h | 273 +
.../airavata-php-sdk/README | 5 -
.../client-samples/GetAiravataVersion.php | 18 -
.../client-samples/airavata-client-sample.php | 93 -
.../lib/Airavata/API/Airavata.php | 4849 --------------
.../lib/Airavata/API/Error/Types.php | 583 --
.../airavata-php-sdk/lib/Airavata/API/Types.php | 22 -
.../lib/Airavata/Model/Types.php | 20 -
.../Model/Workspace/Experiment/Types.php | 3670 ----------
.../lib/Airavata/Model/Workspace/Types.php | 568 --
.../lib/AiravataClientFactory.php | 45 -
.../airavata-php-sdk/lib/Thrift/Base/TBase.php | 367 -
.../Thrift/ClassLoader/ThriftClassLoader.php | 223 -
.../Thrift/Exception/TApplicationException.php | 72 -
.../lib/Thrift/Exception/TException.php | 369 --
.../lib/Thrift/Exception/TProtocolException.php | 48 -
.../Thrift/Exception/TTransportException.php | 41 -
.../Thrift/Factory/TBinaryProtocolFactory.php | 43 -
.../Thrift/Factory/TCompactProtocolFactory.php | 39 -
.../lib/Thrift/Factory/TJSONProtocolFactory.php | 41 -
.../lib/Thrift/Factory/TProtocolFactory.php | 35 -
.../lib/Thrift/Factory/TStringFuncFactory.php | 63 -
.../lib/Thrift/Factory/TTransportFactory.php | 16 -
.../lib/Thrift/Protocol/JSON/BaseContext.php | 39 -
.../lib/Thrift/Protocol/JSON/ListContext.php | 52 -
.../Thrift/Protocol/JSON/LookaheadReader.php | 54 -
.../lib/Thrift/Protocol/JSON/PairContext.php | 60 -
.../lib/Thrift/Protocol/TBinaryProtocol.php | 396 --
.../Protocol/TBinaryProtocolAccelerated.php | 47 -
.../lib/Thrift/Protocol/TCompactProtocol.php | 669 --
.../lib/Thrift/Protocol/TJSONProtocol.php | 694 --
.../lib/Thrift/Protocol/TProtocol.php | 340 -
.../lib/Thrift/Serializer/TBinarySerializer.php | 73 -
.../lib/Thrift/Server/TForkingServer.php | 119 -
.../lib/Thrift/Server/TServer.php | 101 -
.../lib/Thrift/Server/TServerSocket.php | 98 -
.../lib/Thrift/Server/TServerTransport.php | 54 -
.../lib/Thrift/Server/TSimpleServer.php | 57 -
.../lib/Thrift/StringFunc/Core.php | 38 -
.../lib/Thrift/StringFunc/Mbstring.php | 45 -
.../lib/Thrift/StringFunc/TStringFunc.php | 27 -
.../airavata-php-sdk/lib/Thrift/Thrift.php | 789 ---
.../lib/Thrift/Transport/TBufferedTransport.php | 165 -
.../lib/Thrift/Transport/TFramedTransport.php | 183 -
.../lib/Thrift/Transport/THttpClient.php | 221 -
.../lib/Thrift/Transport/TMemoryBuffer.php | 89 -
.../lib/Thrift/Transport/TNullTransport.php | 50 -
.../lib/Thrift/Transport/TPhpStream.php | 114 -
.../lib/Thrift/Transport/TSocket.php | 326 -
.../lib/Thrift/Transport/TSocketPool.php | 295 -
.../lib/Thrift/Transport/TTransport.php | 93 -
.../lib/Thrift/Type/TMessageType.php | 33 -
.../airavata-php-sdk/lib/Thrift/Type/TType.php | 46 -
.../airavata-php-sdk/lib/Thrift/autoload.php | 51 -
.../airavata-php-sdk/pom.xml | 114 +
.../src/main/assembly/bin-assembly.xml | 63 +
.../airavata-php-sdk/src/main/resources/INSTALL | 31 +
.../airavata-php-sdk/src/main/resources/LICENSE | 2272 +++++++
.../airavata-php-sdk/src/main/resources/NOTICE | 163 +
.../airavata-php-sdk/src/main/resources/README | 5 +
.../resources/lib/Airavata/API/Airavata.php | 4849 ++++++++++++++
.../resources/lib/Airavata/API/Error/Types.php | 583 ++
.../main/resources/lib/Airavata/API/Types.php | 22 +
.../main/resources/lib/Airavata/Model/Types.php | 20 +
.../Model/Workspace/Experiment/Types.php | 3670 ++++++++++
.../lib/Airavata/Model/Workspace/Types.php | 568 ++
.../resources/lib/AiravataClientFactory.php | 45 +
.../main/resources/lib/Thrift/Base/TBase.php | 367 +
.../Thrift/ClassLoader/ThriftClassLoader.php | 223 +
.../Thrift/Exception/TApplicationException.php | 72 +
.../lib/Thrift/Exception/TException.php | 369 ++
.../lib/Thrift/Exception/TProtocolException.php | 48 +
.../Thrift/Exception/TTransportException.php | 41 +
.../Thrift/Factory/TBinaryProtocolFactory.php | 43 +
.../Thrift/Factory/TCompactProtocolFactory.php | 39 +
.../lib/Thrift/Factory/TJSONProtocolFactory.php | 41 +
.../lib/Thrift/Factory/TProtocolFactory.php | 35 +
.../lib/Thrift/Factory/TStringFuncFactory.php | 63 +
.../lib/Thrift/Factory/TTransportFactory.php | 16 +
.../lib/Thrift/Protocol/JSON/BaseContext.php | 39 +
.../lib/Thrift/Protocol/JSON/ListContext.php | 52 +
.../Thrift/Protocol/JSON/LookaheadReader.php | 54 +
.../lib/Thrift/Protocol/JSON/PairContext.php | 60 +
.../lib/Thrift/Protocol/TBinaryProtocol.php | 396 ++
.../Protocol/TBinaryProtocolAccelerated.php | 47 +
.../lib/Thrift/Protocol/TCompactProtocol.php | 669 ++
.../lib/Thrift/Protocol/TJSONProtocol.php | 694 ++
.../resources/lib/Thrift/Protocol/TProtocol.php | 340 +
.../lib/Thrift/Serializer/TBinarySerializer.php | 73 +
.../lib/Thrift/Server/TForkingServer.php | 119 +
.../resources/lib/Thrift/Server/TServer.php | 101 +
.../lib/Thrift/Server/TServerSocket.php | 98 +
.../lib/Thrift/Server/TServerTransport.php | 54 +
.../lib/Thrift/Server/TSimpleServer.php | 57 +
.../resources/lib/Thrift/StringFunc/Core.php | 38 +
.../lib/Thrift/StringFunc/Mbstring.php | 45 +
.../lib/Thrift/StringFunc/TStringFunc.php | 27 +
.../src/main/resources/lib/Thrift/Thrift.php | 789 +++
.../lib/Thrift/Transport/TBufferedTransport.php | 165 +
.../lib/Thrift/Transport/TFramedTransport.php | 183 +
.../lib/Thrift/Transport/THttpClient.php | 221 +
.../lib/Thrift/Transport/TMemoryBuffer.php | 89 +
.../lib/Thrift/Transport/TNullTransport.php | 50 +
.../lib/Thrift/Transport/TPhpStream.php | 114 +
.../resources/lib/Thrift/Transport/TSocket.php | 326 +
.../lib/Thrift/Transport/TSocketPool.php | 295 +
.../lib/Thrift/Transport/TTransport.php | 93 +
.../resources/lib/Thrift/Type/TMessageType.php | 33 +
.../main/resources/lib/Thrift/Type/TType.php | 46 +
.../src/main/resources/lib/Thrift/autoload.php | 51 +
.../resources/samples/GetAiravataVersion.php | 18 +
.../samples/airavata-client-sample.php | 93 +
airavata-api/airavata-client-sdks/pom.xml | 4 +-
modules/distribution/airavata-client/pom.xml | 387 --
.../src/main/assembly/bin-assembly.xml | 159 -
.../src/main/assembly/src-assembly.xml | 75 -
.../airavata-client/src/main/resources/INSTALL | 31 -
.../airavata-client/src/main/resources/LICENSE | 2272 -------
.../airavata-client/src/main/resources/NOTICE | 163 -
.../airavata-client/src/main/resources/README | 91 -
modules/distribution/airavata-server/pom.xml | 580 --
.../src/main/assembly/bin-assembly.xml | 287 -
.../src/main/assembly/src-assembly.xml | 75 -
.../airavata-server/src/main/resources/INSTALL | 55 -
.../airavata-server/src/main/resources/LICENSE | 2387 -------
.../airavata-server/src/main/resources/NOTICE | 163 -
.../airavata-server/src/main/resources/README | 121 -
.../src/main/resources/bin/airavata-server.bat | 55 -
.../src/main/resources/bin/airavata-server.sh | 115 -
.../src/main/resources/bin/data.sql | 141 -
.../src/main/resources/bin/derby.sh | 23 -
.../src/main/resources/bin/logo.txt | 34 -
.../src/main/resources/bin/setenv.bat | 43 -
.../src/main/resources/bin/setenv.sh | 77 -
.../src/main/resources/bin/startNetworkServer | 189 -
modules/distribution/client/java/pom.xml | 396 ++
.../java/src/main/assembly/bin-assembly.xml | 161 +
.../java/src/main/assembly/src-assembly.xml | 75 +
.../client/java/src/main/resources/INSTALL | 31 +
.../client/java/src/main/resources/LICENSE | 2272 +++++++
.../client/java/src/main/resources/NOTICE | 163 +
.../client/java/src/main/resources/README | 91 +
modules/distribution/client/pom.xml | 39 +
modules/distribution/pom.xml | 4 +-
modules/distribution/release/pom.xml | 42 +-
modules/distribution/server/pom.xml | 580 ++
.../server/src/main/assembly/bin-assembly.xml | 287 +
.../server/src/main/assembly/src-assembly.xml | 75 +
.../server/src/main/resources/INSTALL | 55 +
.../server/src/main/resources/LICENSE | 2387 +++++++
.../server/src/main/resources/NOTICE | 163 +
.../server/src/main/resources/README | 121 +
.../src/main/resources/bin/airavata-server.bat | 55 +
.../src/main/resources/bin/airavata-server.sh | 115 +
.../server/src/main/resources/bin/data.sql | 141 +
.../server/src/main/resources/bin/derby.sh | 23 +
.../server/src/main/resources/bin/logo.txt | 34 +
.../server/src/main/resources/bin/setenv.bat | 43 +
.../server/src/main/resources/bin/setenv.sh | 77 +
.../src/main/resources/bin/startNetworkServer | 189 +
modules/integration-tests/pom.xml | 96 -
.../apache/airavata/integration/BaseCaseIT.java | 35 +-
samples/java-client/experiment/README | 24 +
samples/java-client/experiment/build.xml | 51 +
samples/java-client/experiment/pom.xml | 153 +
.../airavata/api/samples/ExperimentSample.java | 105 +
samples/java-client/pom.xml | 28 +
220 files changed, 45585 insertions(+), 39973 deletions(-)
----------------------------------------------------------------------