Merge branch 'master' of https://github.com/SciGaP/Airavata-PHP-Client-Samples
Conflicts:
client-samples/airavata-client-api-tester.php
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/427056b1
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/427056b1
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/427056b1
Branch: refs/heads/master
Commit: 427056b143d7d3f025b5d488e9452ec83f24116e
Parents: 222a14d c00a71a
Author: marpierc <[email protected]>
Authored: Wed May 21 17:15:02 2014 -0400
Committer: marpierc <[email protected]>
Committed: Wed May 21 17:15:02 2014 -0400
----------------------------------------------------------------------
client-samples/airavata-client-api-tester.php | 45 +++++++++++++++++++---
client-samples/createExperiment.php | 3 +-
2 files changed, 40 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/427056b1/client-samples/airavata-client-api-tester.php
----------------------------------------------------------------------
diff --cc client-samples/airavata-client-api-tester.php
index 8878943,2461904..1b93c0e
--- a/client-samples/airavata-client-api-tester.php
+++ b/client-samples/airavata-client-api-tester.php
@@@ -46,10 -44,23 +46,10 @@@ use Airavata\Model\Workspace\Experiment
use Airavata\Model\Workspace\Experiment\DataType;
use Airavata\Model\Workspace\Experiment\ExperimentState;
-/* buffered transport
-$socket = new TSocket('gw111.iu.xsede.org', 8930);
-$transport = new TBufferedTransport($socket, 1024, 1024);
-$protocol = new TBinaryProtocol($transport);
-$airavataclient = new AiravataClient($protocol);
-
-$transport->open();
-*/
-
-/* client factory
-$airavataClientFactory = new AiravataClientFactory(array('airavataServerHost'
=> "gw111.iu.xsede.org", 'airavataServerPort' => "8930"));
-$airavataclient = $airavataClientFactory->getAiravataClient();
-*/
/* this is the same as the factory */
- $transport = new TSocket(AIRAVATA_SERVER, AIRAVATA_PORT);
- $transport->setRecvTimeout(AIRAVATA_TIMEOUT);
+ $transport = new TSocket('gw127.iu.xsede.org', 8930);
+ $transport->setRecvTimeout(5000);
$protocol = new TBinaryProtocol($transport);
$transport->open();
http://git-wip-us.apache.org/repos/asf/airavata/blob/427056b1/client-samples/createExperiment.php
----------------------------------------------------------------------
