airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lah...@apache.org
Subject [2/2] git commit: merging changes
Date Wed, 08 Oct 2014 16:12:53 GMT
merging changes


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7de08711
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7de08711
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7de08711

Branch: refs/heads/master
Commit: 7de087118259a68e8c3ea30bfdf3a1568460cefc
Parents: 42219ba 57adb55
Author: lahiru <lahiru@apache.org>
Authored: Wed Oct 8 12:12:44 2014 -0400
Committer: lahiru <lahiru@apache.org>
Committed: Wed Oct 8 12:12:44 2014 -0400

----------------------------------------------------------------------
 .../AiravataExperimentStatusUpdator.java        |   39 +-
 .../listener/ExperimentStatusChangedEvent.java  |  128 +-
 .../lib/airavata/airavataDataModel_types.h      |    1 +
 .../lib/airavata/messagingEvents_constants.cpp  |   36 +
 .../lib/airavata/messagingEvents_constants.h    |   42 +
 .../lib/airavata/messagingEvents_types.cpp      | 1067 +++++++++++++++
 .../lib/airavata/messagingEvents_types.h        |  601 +++++++++
 .../Airavata/Model/Messaging/Event/Types.php    | 1238 ++++++++++++++++++
 .../client/samples/CreateLaunchExperiment.java  |   20 +-
 .../tools/RegisterOGCEUS3Application.java       |  313 +++++
 .../event/ExperimentStatusChangeEvent.java      |  504 +++++++
 .../model/messaging/event/JobIdentifier.java    |  684 ++++++++++
 .../messaging/event/JobStatusChangeEvent.java   |  509 +++++++
 .../event/JobStatusChangeRequestEvent.java      |  509 +++++++
 .../airavata/model/messaging/event/Message.java |  828 ++++++++++++
 .../model/messaging/event/MessageLevel.java     |   68 +
 .../model/messaging/event/MessageType.java      |   68 +
 .../model/messaging/event/TaskIdentifier.java   |  588 +++++++++
 .../messaging/event/TaskOutputChangeEvent.java  |  551 ++++++++
 .../messaging/event/TaskStatusChangeEvent.java  |  509 +++++++
 .../event/TaskStatusChangeRequestEvent.java     |  509 +++++++
 .../messaging/event/WorkflowIdentifier.java     |  492 +++++++
 .../event/WorkflowNodeStatusChangeEvent.java    |  509 +++++++
 .../event/messagingEventsConstants.java         |   56 +
 .../airavataDataModel.thrift                    |    1 +
 .../messagingEvents.thrift                      |  121 ++
 modules/commons/utils/pom.xml                   |    5 +
 .../airavata/common/utils/AiravataUtils.java    |    6 +
 .../airavata/common/utils/ServerSettings.java   |   12 +
 .../airavata/common/utils/ThriftUtils.java      |   37 +
 .../main/resources/airavata-server.properties   |    5 +
 modules/distribution/server/pom.xml             |    5 +
 .../server/src/main/assembly/bin-assembly.xml   |    1 +
 modules/gfac/gfac-core/pom.xml                  |    5 +
 .../airavata/gfac/core/cpi/BetterGfacImpl.java  |  127 +-
 .../core/monitor/AiravataJobStatusUpdator.java  |   40 +-
 .../core/monitor/AiravataTaskStatusUpdator.java |   65 +-
 .../AiravataWorkflowNodeStatusUpdator.java      |   44 +-
 .../gfac/core/monitor/ExperimentIdentity.java   |   72 +-
 .../airavata/gfac/core/monitor/JobIdentity.java |   78 +-
 .../gfac/core/monitor/TaskIdentity.java         |   76 +-
 .../gfac/core/monitor/WorkflowNodeIdentity.java |   74 +-
 .../state/GfacExperimentStateChangeRequest.java |   16 +-
 .../monitor/state/JobStatusChangeRequest.java   |  162 +--
 .../monitor/state/JobStatusChangedEvent.java    |  162 +--
 .../state/TaskOutputDataChangedEvent.java       |  128 +-
 .../monitor/state/TaskStatusChangeRequest.java  |  124 +-
 .../monitor/state/TaskStatusChangedEvent.java   |  124 +-
 .../state/WorkflowNodeStatusChangedEvent.java   |  128 +-
 .../gfac/core/utils/OutHandlerWorker.java       |    8 +-
 .../gfac/local/provider/impl/LocalProvider.java |   38 +-
 .../monitor/impl/pull/qstat/HPCPullMonitor.java |   26 +-
 .../monitor/impl/push/amqp/AMQPMonitor.java     |    8 +-
 .../impl/push/amqp/UnRegisterWorker.java        |    5 +-
 .../apache/airavata/job/AMQPMonitorTest.java    |    4 +-
 .../job/QstatMonitorTestWithMyProxyAuth.java    |    6 +-
 modules/messaging/core/pom.xml                  |   69 +
 .../airavata/messaging/core/MessageContext.java |   61 +
 .../airavata/messaging/core/Metadata.java       |   25 +
 .../airavata/messaging/core/Publisher.java      |   29 +
 .../messaging/core/PublisherFactory.java        |   50 +
 .../messaging/core/impl/RabbitMQProducer.java   |  195 +++
 .../messaging/core/impl/RabbitMQPublisher.java  |   99 ++
 modules/messaging/pom.xml                       |   41 +
 .../engine/interpretor/WorkflowInterpreter.java |   12 +-
 pom.xml                                         |    1 +
 66 files changed, 11352 insertions(+), 812 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/7de08711/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
----------------------------------------------------------------------
diff --cc airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
index 7b7557f,140d631..6caf110
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
@@@ -46,9 -46,9 +46,9 @@@ public class CreateLaunchExperiment 
      private static final String DEFAULT_USER = "default.registry.user";
      private static final String DEFAULT_GATEWAY = "default.registry.gateway";
      private static Airavata.Client airavataClient;
-     private static String echoAppId = "Echo_8d137226-e59e-4a23-a1ce-385b670ae116";
 -    private static String echoAppId = "Echo_ab621572-8830-48dd-a785-0e49ee155f4f";
 -    private static String wrfAppId = "WRF_afd45537-fd4e-4a57-9cc4-bfc3cc17afa9";
 -    private static String amberAppId = "Amber_44c4e886-87e8-49b3-ac2b-1c336d67c160";
++    private static String echoAppId = "Echo_9bc4ca80-632e-4d6e-8696-45268fce8732";
 +    private static String wrfAppId = "WRF_15ae6599-a48f-4134-95b8-98e109ac6f88";
-     private static String amberAppId = "Amber_ecb03042-4269-4e90-9cf9-99588b183123";
++    private static String amberAppId = "Amber_a7b18a3a-31b3-4dc7-8faf-7c3144f14201";
  
      private static String localHost = "localhost";
      private static String trestlesHostName = "trestles.sdsc.xsede.org";
@@@ -59,15 -59,11 +59,11 @@@
              try {
                  airavataClient = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST,
THRIFT_SERVER_PORT);
                  System.out.println("API version is " + airavataClient.getAPIVersion());
--//            registerApplications(); // run this only the first time
-                 int requestCount = 0;
-                 while(true){
-                 for (int i = 0; i < 20; i++) {
 -                for (int i = 0; i < 10; i++) {
++            registerApplications(); // run this only the first time
++//                for (int i = 0; i < 1; i++) {
  //            final String expId = createExperimentForSSHHost(airavata);
 -                    final String expId = createEchoExperimentForTrestles(airavataClient);
 +//                    final String expId = createEchoExperimentForTrestles(airavataClient);
-                     final String expId = createEchoExperimentForStampede(airavataClient);
-                     requestCount++;
-                     System.out.println("Sending request:"+requestCount);
+ //            final String expId = createEchoExperimentForStampede(airavataClient);
  //            final String expId = createExperimentEchoForLocalHost(airavataClient);
  //            final String expId = createExperimentWRFTrestles(airavataClient);
  //            final String expId = createExperimentForBR2(airavataClient);
@@@ -76,12 -72,10 +72,10 @@@
  //            final String expId = createExperimentForStampedeAmber(airavataClient);
  //            final String expId = createExperimentForTrestlesAmber(airavataClient);
  
 -            System.out.println("Experiment ID : " + expId);
 +//            System.out.println("Experiment ID : " + expId);
  //            updateExperiment(airavata, expId);
--                    launchExperiment(airavataClient, expId);
--                }
-                     Thread.sleep(300000);
-                 }
++//                    launchExperiment(airavataClient, expId);
++//                }
              } catch (Exception e) {
                  logger.error("Error while connecting with server", e.getMessage());
                  e.printStackTrace();

http://git-wip-us.apache.org/repos/asf/airavata/blob/7de08711/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
----------------------------------------------------------------------
diff --cc modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
index 8ac35cc,109320c..78880ff
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
@@@ -19,17 -19,7 +19,14 @@@
   *
  */
  package org.apache.airavata.gfac.core.cpi;
--
 +import java.io.File;
 +import java.io.IOException;
 +import java.net.URL;
 +import java.util.ArrayList;
 +import java.util.List;
 +import java.util.Properties;
- 
 +import javax.xml.parsers.ParserConfigurationException;
 +import javax.xml.xpath.XPathExpressionException;
- 
  import org.airavata.appcatalog.cpi.AppCatalog;
  import org.apache.aiaravata.application.catalog.data.impl.AppCatalogFactory;
  import org.apache.airavata.common.exception.ApplicationSettingsException;

http://git-wip-us.apache.org/repos/asf/airavata/blob/7de08711/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java
----------------------------------------------------------------------
diff --cc modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java
index ab508f9,15c6380..4e4227f
--- a/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java
+++ b/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java
@@@ -28,9 -28,6 +28,8 @@@ import org.apache.airavata.common.utils
  import org.apache.airavata.commons.gfac.type.HostDescription;
  import org.apache.airavata.gfac.core.cpi.GFac;
  import org.apache.airavata.gfac.core.monitor.MonitorID;
- import org.apache.airavata.gfac.core.monitor.state.JobStatusChangeRequest;
 +import org.apache.airavata.gfac.core.utils.GFacThreadPoolExecutor;
 +import org.apache.airavata.gfac.core.utils.OutHandlerWorker;
  import org.apache.airavata.gfac.monitor.HostMonitorData;
  import org.apache.airavata.gfac.monitor.UserMonitorData;
  import org.apache.airavata.gfac.monitor.core.PullMonitor;


Mime
View raw message