Author: smarru
Date: Sun Aug 18 13:08:59 2013
New Revision: 1515098
URL: http://svn.apache.org/r1515098
Log:
removing dependence on legacy extreme lab amazon mapreduce client. This might
break EC2 funcationality within XBaya but should not effect Gfac ec2 provider.
Modified:
airavata/trunk/modules/distribution/airavata-client/pom.xml
airavata/trunk/modules/distribution/airavata-server/pom.xml
airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
airavata/trunk/modules/distribution/xbaya-gui/pom.xml
airavata/trunk/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml
airavata/trunk/modules/xbaya-gui/pom.xml
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/AmazonEC2InvokerWindow.java
Modified: airavata/trunk/modules/distribution/airavata-client/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-client/pom.xml?rev=1515098&r1=1515097&r2=1515098&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-client/pom.xml (original)
+++ airavata/trunk/modules/distribution/airavata-client/pom.xml Sun Aug 18
13:08:59 2013
@@ -186,11 +186,6 @@
<version>1.3.20</version>
</dependency>
<dependency>
- <groupId>amazon</groupId>
- <artifactId>MapReduce.Service.Client</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
<groupId>net.java.dev.jets3t</groupId>
<artifactId>jets3t</artifactId>
<version>0.8.0</version>
Modified: airavata/trunk/modules/distribution/airavata-server/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-server/pom.xml?rev=1515098&r1=1515097&r2=1515098&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-server/pom.xml (original)
+++ airavata/trunk/modules/distribution/airavata-server/pom.xml Sun Aug 18
13:08:59 2013
@@ -305,11 +305,6 @@
<version>1.3.20</version>
</dependency>
<dependency>
- <groupId>amazon</groupId>
- <artifactId>MapReduce.Service.Client</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
<groupId>net.java.dev.jets3t</groupId>
<artifactId>jets3t</artifactId>
<version>0.8.0</version>
Modified:
airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml?rev=1515098&r1=1515097&r2=1515098&view=diff
==============================================================================
---
airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
(original)
+++
airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
Sun Aug 18 13:08:59 2013
@@ -226,7 +226,6 @@
<include>lead-security:cryptix-asn1</include>
<include>org.apache.xmlbeans:xmlbeans</include>
<include>com.amazonaws:aws-java-sdk</include>
- <include>amazon:MapReduce.Service.Client</include>
<include>net.java.dev.jets3t:jets3t</include>
<include>globus:transfer-api-client</include>
<include>org.apache.airavata:airavata-registry-api</include>
Modified: airavata/trunk/modules/distribution/xbaya-gui/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/xbaya-gui/pom.xml?rev=1515098&r1=1515097&r2=1515098&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/xbaya-gui/pom.xml (original)
+++ airavata/trunk/modules/distribution/xbaya-gui/pom.xml Sun Aug 18 13:08:59
2013
@@ -318,11 +318,6 @@
<version>1.3.20</version>
</dependency>
<dependency>
- <groupId>amazon</groupId>
- <artifactId>MapReduce.Service.Client</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
<groupId>net.java.dev.jets3t</groupId>
<artifactId>jets3t</artifactId>
<version>0.8.0</version>
Modified:
airavata/trunk/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml?rev=1515098&r1=1515097&r2=1515098&view=diff
==============================================================================
---
airavata/trunk/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml
(original)
+++
airavata/trunk/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml
Sun Aug 18 13:08:59 2013
@@ -108,7 +108,6 @@
<include>org.python:jython:jar</include>
<include>org.apache.xmlbeans:xmlbeans</include>
<include>com.amazonaws:aws-java-sdk</include>
- <include>amazon:MapReduce.Service.Client</include>
<include>net.java.dev.jets3t:jets3t</include>
<include>globus:transfer-api-client</include>
<include>org.apache.airavata:airavata-registry-api</include>
Modified: airavata/trunk/modules/xbaya-gui/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/pom.xml?rev=1515098&r1=1515097&r2=1515098&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/pom.xml (original)
+++ airavata/trunk/modules/xbaya-gui/pom.xml Sun Aug 18 13:08:59 2013
@@ -182,11 +182,6 @@
<version>1.3.20</version>
</dependency>
<dependency>
- <groupId>amazon</groupId>
- <artifactId>MapReduce.Service.Client</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
<groupId>net.java.dev.jets3t</groupId>
<artifactId>jets3t</artifactId>
<version>0.8.0</version>
Modified:
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/AmazonEC2InvokerWindow.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/AmazonEC2InvokerWindow.java?rev=1515098&r1=1515097&r2=1515098&view=diff
==============================================================================
---
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/AmazonEC2InvokerWindow.java
(original)
+++
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/amazon/AmazonEC2InvokerWindow.java
Sun Aug 18 13:08:59 2013
@@ -21,11 +21,11 @@
package org.apache.airavata.xbaya.ui.dialogs.amazon;
-import
edu.indiana.extreme.amazonec2webservice.AmazonEC2WebserviceCallbackHandler;
-import edu.indiana.extreme.amazonec2webservice.AmazonEC2WebserviceStub;
-import
edu.indiana.extreme.amazonec2webservice.AmazonEC2WebserviceStub.JobStatusResponse;
-import
edu.indiana.extreme.amazonec2webservice.AmazonEC2WebserviceStub.JobSubmissionReceipt;
-import
edu.indiana.extreme.amazonec2webservice.AmazonEC2WebserviceStub.JobSubmitOperation;
+//import
edu.indiana.extreme.amazonec2webservice.AmazonEC2WebserviceCallbackHandler;
+//import edu.indiana.extreme.amazonec2webservice.AmazonEC2WebserviceStub;
+//import
edu.indiana.extreme.amazonec2webservice.AmazonEC2WebserviceStub.JobStatusResponse;
+//import
edu.indiana.extreme.amazonec2webservice.AmazonEC2WebserviceStub.JobSubmissionReceipt;
+//import
edu.indiana.extreme.amazonec2webservice.AmazonEC2WebserviceStub.JobSubmitOperation;
import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.ui.dialogs.XBayaDialog;
@@ -159,26 +159,26 @@ public class AmazonEC2InvokerWindow {
* Deploy Work Flow to Amazon EC2
*/
protected void execute() {
- try {
- AmazonEC2WebserviceStub stub = new AmazonEC2WebserviceStub();
- JobSubmitOperation jobInfo = new JobSubmitOperation();
- jobInfo.setAccessKeyID(this.accessKeyIDTextField.getText());
-
jobInfo.setSecretAccessKey(this.secretAccessKeyTextField.getText());
- jobInfo.setKeyPairName(this.keyPairNameTextField.getText());
- jobInfo.setNumOfInstances(this.numOfInstancesTextField.getText());
- jobInfo.setJobFlowName(this.jobFlowNameTextField.getText());
-
jobInfo.setLogLocationOnS3(this.logLocationOnS3TextField.getText());
-
jobInfo.setInputLocationOnS3(this.inputLocationOnS3TextField.getText());
-
jobInfo.setOutputLocationOnS3(this.outputLocationOnS3TextField.getText());
-
jobInfo.setJarFilePathOnS3(this.jarFilePathOnS3TextField.getText());
- jobInfo.setMainClassName(this.mainClassNameTextField.getText());
- stub.startjobSubmitOperation(jobInfo, new MyHandler());
- this.hide();
- } catch (AxisFault e) {
- e.printStackTrace();
- } catch (RemoteException e) {
- e.printStackTrace();
- }
+// try {
+// AmazonEC2WebserviceStub stub = new AmazonEC2WebserviceStub();
+// JobSubmitOperation jobInfo = new JobSubmitOperation();
+// jobInfo.setAccessKeyID(this.accessKeyIDTextField.getText());
+//
jobInfo.setSecretAccessKey(this.secretAccessKeyTextField.getText());
+// jobInfo.setKeyPairName(this.keyPairNameTextField.getText());
+//
jobInfo.setNumOfInstances(this.numOfInstancesTextField.getText());
+// jobInfo.setJobFlowName(this.jobFlowNameTextField.getText());
+//
jobInfo.setLogLocationOnS3(this.logLocationOnS3TextField.getText());
+//
jobInfo.setInputLocationOnS3(this.inputLocationOnS3TextField.getText());
+//
jobInfo.setOutputLocationOnS3(this.outputLocationOnS3TextField.getText());
+//
jobInfo.setJarFilePathOnS3(this.jarFilePathOnS3TextField.getText());
+// jobInfo.setMainClassName(this.mainClassNameTextField.getText());
+// stub.startjobSubmitOperation(jobInfo, new MyHandler());
+// this.hide();
+// } catch (AxisFault e) {
+// e.printStackTrace();
+// } catch (RemoteException e) {
+// e.printStackTrace();
+// }
}
/**
@@ -195,28 +195,28 @@ public class AmazonEC2InvokerWindow {
this.dialog.show();
}
- class MyHandler extends AmazonEC2WebserviceCallbackHandler {
+// class MyHandler extends AmazonEC2WebserviceCallbackHandler {
+//
+// @Override
+// public void receiveResultjobSubmitOperation(JobSubmissionReceipt
result) {
+// JOptionPane.showMessageDialog(null, "Job Submitted, ID: " +
result.getJobFlowID(), "",
+// JOptionPane.INFORMATION_MESSAGE);
+// }
+//
+// @Override
+// public void receiveErrorjobSubmitOperation(java.lang.Exception e) {
+// JOptionPane.showMessageDialog(null, "Job Submit Failed!", "",
JOptionPane.ERROR_MESSAGE);
+// }
+//
+// @Override
+// public void receiveResultjobStatus(JobStatusResponse result) {
+// System.out.println("In call back, response is: " +
result.getStatus());
+// }
+//
+// @Override
+// public void receiveErrorjobStatus(java.lang.Exception e) {
+// throw new WorkflowRuntimeException(e);
+// }
- @Override
- public void receiveResultjobSubmitOperation(JobSubmissionReceipt
result) {
- JOptionPane.showMessageDialog(null, "Job Submitted, ID: " +
result.getJobFlowID(), "",
- JOptionPane.INFORMATION_MESSAGE);
- }
-
- @Override
- public void receiveErrorjobSubmitOperation(java.lang.Exception e) {
- JOptionPane.showMessageDialog(null, "Job Submit Failed!", "",
JOptionPane.ERROR_MESSAGE);
- }
-
- @Override
- public void receiveResultjobStatus(JobStatusResponse result) {
- System.out.println("In call back, response is: " +
result.getStatus());
- }
-
- @Override
- public void receiveErrorjobStatus(java.lang.Exception e) {
- throw new WorkflowRuntimeException(e);
- }
-
- }
+// }
}
\ No newline at end of file
