Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata

Conflicts:
        
airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
        modules/distribution/server/src/main/assembly/bin-assembly.xml
        
modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java


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

Branch: refs/heads/master
Commit: 19f9ae7b878d0c2fe4f7d78bfae57f93131bfc63
Parents: 1da5054 cb94631
Author: msmemon <[email protected]>
Authored: Mon Oct 20 17:23:58 2014 +0200
Committer: msmemon <[email protected]>
Committed: Mon Oct 20 17:23:58 2014 +0200

----------------------------------------------------------------------
 .../airavata/api/server/AiravataAPIServer.java  |  167 ++-
 .../airavata/api/server/WorkflowServer.java     |    2 +-
 .../server/handler/AiravataServerHandler.java   |  490 ++++---
 .../AiravataExperimentStatusUpdator.java        |   39 +-
 .../listener/ExperimentStatusChangedEvent.java  |  128 +-
 .../api/server/util/RegistryInitUtil.java       |    4 +-
 .../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 +++++++++
 .../lib/airavata/workflowDataModel_types.cpp    |   86 +-
 .../lib/airavata/workflowDataModel_types.h      |   42 +-
 .../Airavata/Model/Messaging/Event/Types.php    | 1238 ++++++++++++++++++
 .../main/resources/lib/Airavata/Model/Types.php |  116 ++
 .../client/samples/CreateLaunchExperiment.java  |    4 +-
 .../tools/RegisterOGCEUS3Application.java       |  313 +++++
 .../org/apache/airavata/model/Workflow.java     |  429 +++++-
 .../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 ++
 .../workflowDataModel.thrift                    |    6 +-
 .../client/impl/ExecutionManagerImpl.java       |    6 +-
 .../client/tools/DocumentCreatorNew.java        |    6 +-
 .../client/tools/DocumentCreatorUtils.java      |    4 +
 .../catalog/data/impl/WorkflowCatalogImpl.java  |   78 +-
 .../catalog/data/model/Workflow.java            |   13 +
 .../catalog/data/model/WorkflowInput.java       |  127 ++
 .../catalog/data/model/WorkflowInput_PK.java    |   64 +
 .../catalog/data/model/WorkflowOutput.java      |   87 ++
 .../catalog/data/model/WorkflowOutput_PK.java   |   64 +
 .../data/resources/AbstractResource.java        |   20 +
 .../data/resources/WorkflowInputResource.java   |  412 ++++++
 .../data/resources/WorkflowOutputResource.java  |  377 ++++++
 .../data/resources/WorkflowResource.java        |   12 +
 .../catalog/data/util/AppCatalogJPAUtils.java   |   62 +-
 .../data/util/AppCatalogResourceType.java       |    4 +-
 .../data/util/AppCatalogThriftConversion.java   |   50 +-
 .../src/main/resources/META-INF/persistence.xml |    2 +
 .../src/main/resources/appcatalog-derby.sql     |   25 +
 .../src/main/resources/appcatalog-mysql.sql     |   27 +-
 modules/commons/utils/pom.xml                   |    5 +
 .../airavata/common/logger/AiravataLogger.java  |  677 ++++++++++
 .../common/logger/AiravataLoggerFactory.java    |   34 +
 .../common/logger/AiravataLoggerImpl.java       |  323 +++++
 .../airavata/common/utils/AiravataUtils.java    |    6 +
 .../apache/airavata/common/utils/Constants.java |    9 +-
 .../airavata/common/utils/ServerSettings.java   |   99 +-
 .../airavata/common/utils/ServiceUtils.java     |  186 +--
 .../airavata/common/utils/ThriftUtils.java      |   37 +
 .../common/utils/ApplicationSettingsTest.java   |   11 +-
 .../main/resources/airavata-client.properties   |    2 +-
 .../main/resources/airavata-server.properties   |  207 ++-
 .../server/src/main/resources/axis2.xml         |  533 --------
 .../server/src/main/resources/host.xml          |   86 --
 .../server/src/main/resources/log4j.properties  |    2 +
 .../basic/BasicAccessAuthenticator.java         |   15 +-
 .../session/ServletRequestHelper.java           |   19 +-
 .../main/resources/airavata-server.properties   |  286 ++--
 modules/distribution/server/pom.xml             |    5 +
 .../src/main/resources/bin/airavata-server.sh   |    5 +-
 .../server/src/main/resources/bin/api-server.sh |  118 ++
 .../src/main/resources/bin/gfac-server.sh       |  118 ++
 .../main/resources/bin/orchestrator-server.sh   |  118 ++
 .../src/main/resources/bin/workflow-server.sh   |  118 ++
 modules/gfac/airavata-gfac-service/pom.xml      |   10 +-
 .../airavata/gfac/server/GfacServerHandler.java |   49 +-
 .../gfac/client/GfacClientFactoryTest.java      |   13 +-
 modules/gfac/gfac-core/pom.xml                  |    5 +
 .../airavata/gfac/core/cpi/BetterGfacImpl.java  |  115 +-
 .../handler/AbstractRecoverableHandler.java     |   12 +
 .../core/monitor/AiravataJobStatusUpdator.java  |   42 +-
 .../core/monitor/AiravataTaskStatusUpdator.java |   73 +-
 .../AiravataWorkflowNodeStatusUpdator.java      |   44 +-
 .../gfac/core/monitor/ExperimentIdentity.java   |   72 +-
 .../airavata/gfac/core/monitor/JobIdentity.java |   78 +-
 .../airavata/gfac/core/monitor/MonitorID.java   |   17 +-
 .../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/GFacThreadPoolExecutor.java |    7 +
 .../airavata/gfac/core/utils/GFacUtils.java     |    7 +-
 .../gfac/core/utils/OutHandlerWorker.java       |    8 +-
 .../gsissh/handler/GSISSHOutputHandler.java     |   24 +-
 .../security/TokenizedMyProxyAuthInfo.java      |    5 +-
 .../gfac/gsissh/util/GFACGSISSHUtils.java       |  106 +-
 .../gfac/local/provider/impl/LocalProvider.java |   38 +-
 .../airavata/gfac/local/utils/InputUtils.java   |    7 +
 .../handlers/GridPullMonitorHandler.java        |    9 +-
 .../monitor/impl/pull/qstat/HPCPullMonitor.java |  138 +-
 .../monitor/impl/push/amqp/AMQPMonitor.java     |    8 +-
 .../impl/push/amqp/UnRegisterWorker.java        |    5 +-
 .../airavata/gfac/monitor/util/CommonUtils.java |   44 +-
 .../apache/airavata/job/AMQPMonitorTest.java    |    4 +-
 .../job/QstatMonitorTestWithMyProxyAuth.java    |    6 +-
 .../gfac/ssh/context/SSHAuthWrapper.java        |   50 +
 .../ssh/handler/AdvancedSCPInputHandler.java    |  201 ++-
 .../ssh/handler/AdvancedSCPOutputHandler.java   |   53 +-
 .../gfac/ssh/handler/SSHOutputHandler.java      |   17 +-
 .../gfac/ssh/security/TokenizedSSHAuthInfo.java |    3 +
 .../airavata/gfac/ssh/util/GFACSSHUtils.java    |   79 +-
 modules/integration-tests/pom.xml               |   22 +-
 .../apache/airavata/integration/BaseCaseIT.java |   17 +-
 .../airavata/integration/DataRetrievalIT.java   |    6 +-
 .../airavata/integration/SimpleEchoIT.java      |    2 +-
 .../integration/tools/DocumentCreatorNew.java   |  832 ++++++++++++
 .../integration/tools/DocumentCreatorUtils.java |  160 +++
 modules/messaging/core/pom.xml                  |   69 +
 .../airavata/messaging/core/Consumer.java       |   40 +
 .../airavata/messaging/core/MessageContext.java |   61 +
 .../airavata/messaging/core/MessageHandler.java |    9 +
 .../messaging/core/MessagingConstants.java      |   10 +
 .../airavata/messaging/core/Metadata.java       |   25 +
 .../airavata/messaging/core/Publisher.java      |   38 +
 .../messaging/core/PublisherFactory.java        |   50 +
 .../airavata/messaging/core/TestClient.java     |   75 ++
 .../messaging/core/impl/RabbitMQConsumer.java   |  255 ++++
 .../messaging/core/impl/RabbitMQProducer.java   |  195 +++
 .../messaging/core/impl/RabbitMQPublisher.java  |   99 ++
 modules/messaging/pom.xml                       |   41 +
 .../server/OrchestratorServerHandler.java       |   55 +-
 .../client/OrchestratorClientFactoryTest.java   |   12 +-
 .../client/sample/OrchestratorClientSample.java |   12 +-
 modules/orchestrator/orchestrator-core/pom.xml  |   10 +-
 .../core/impl/GFACEmbeddedJobSubmitter.java     |    2 +-
 .../core/impl/GFACServiceJobSubmitter.java      |   16 +-
 .../cpi/impl/AbstractOrchestrator.java          |    5 +-
 .../orchestrator/core/BaseOrchestratorTest.java |    6 +-
 .../registry/jpa/impl/ExperimentRegistry.java   |   23 +-
 .../registry/jpa/impl/GatewayRegistry.java      |    2 +-
 .../registry/jpa/impl/RegistryImpl.java         |   12 +-
 .../persistance/registry/jpa/impl/UserReg.java  |    2 +-
 .../resources/DataTransferDetailResource.java   |    2 +
 .../jpa/resources/ExperimentResource.java       |    2 +
 .../jpa/resources/JobDetailResource.java        |    2 +
 .../jpa/resources/TaskDetailResource.java       |    5 +-
 .../resources/WorkflowNodeDetailResource.java   |    2 +
 .../registry/cpi/CompositeIdentifier.java       |   12 +
 .../org/apache/airavata/server/ServerMain.java  |   26 +-
 .../workflow/engine/WorkflowEngineImpl.java     |   19 +-
 .../engine/interpretor/ExperimentTemplate.java  |   37 -
 .../interpretor/WorkflowExecutionTemplate.java  |   51 -
 .../engine/interpretor/WorkflowInterpreter.java |  146 ++-
 .../workflow/engine/util/InterpreterUtil.java   |   10 +
 .../workflow/engine/util/XBayaUtil.java         |   36 +-
 modules/xbaya-gui/pom.xml                       |   10 +-
 .../org/apache/airavata/xbaya/XBayaEngine.java  |   30 +-
 .../registry/ComponentRegistryLoader.java       |    4 +-
 .../airavata/xbaya/messaging/EventData.java     |  151 +++
 .../xbaya/messaging/EventDataListener.java      |   68 +
 .../xbaya/messaging/EventDataRepository.java    |  500 +++++++
 .../airavata/xbaya/messaging/Monitor.java       |  334 +++++
 .../xbaya/messaging/MonitorException.java       |   62 +
 .../xbaya/messaging/NotificationHandler.java    |   28 +
 .../airavata/xbaya/messaging/event/Event.java   |   84 ++
 .../xbaya/messaging/event/EventListener.java    |   35 +
 .../xbaya/messaging/event/EventProducer.java    |  105 ++
 .../xbaya/modifier/WorkflowModifier.java        |   98 +-
 .../org/apache/airavata/xbaya/ui/XBayaGUI.java  |   17 +-
 .../graph/ws/ServiceInteractionWindow.java      |    2 +-
 .../monitor/MonitorConfigurationWindow.java     |    2 +-
 .../xbaya/ui/dialogs/monitor/MonitorWindow.java |   54 +-
 .../ui/dialogs/registry/RegistryWindow.java     |    5 +
 .../ui/experiment/LaunchApplicationWindow.java  |    6 -
 .../WorkflowInterpreterLaunchWindow.java        |  260 ++--
 .../airavata/xbaya/ui/graph/ws/WSNodeGUI.java   |    2 +-
 .../airavata/xbaya/ui/menues/RunMenuItem.java   |   47 +-
 .../xbaya/ui/monitor/MonitorEventHandler.java   |  275 ++--
 .../xbaya/ui/monitor/MonitorStarter.java        |    4 +-
 .../airavata/xbaya/ui/views/MonitorPanel.java   |   18 +-
 .../apache/airavata/xbaya/util/XBayaUtil.java   |   10 +-
 .../airavata/xbaya/workflow/WorkflowClient.java |    2 +-
 .../airavata/xbaya/interpreter/Listener.java    |    3 +-
 pom.xml                                         |    1 +
 tools/gsissh/pom.xml                            |   12 +-
 .../java/com/jcraft/jsch/ExtendedSession.java   |    2 +
 .../com/jcraft/jsch/GSISSHIdentityFile.java     |    3 +-
 .../airavata/gsi/ssh/api/CommandExecutor.java   |   12 +-
 .../gsi/ssh/api/job/SlurmOutputParser.java      |    2 +-
 .../gsi/ssh/impl/GSISSHAbstractCluster.java     |   72 +-
 .../gsi/ssh/impl/StandardOutReader.java         |    3 -
 .../apache/airavata/gsi/ssh/util/SSHUtils.java  |    7 +-
 201 files changed, 19610 insertions(+), 3352 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/19f9ae7b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/airavata/blob/19f9ae7b/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 66501fb,a843447..090d1fb
--- 
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
@@@ -52,57 -46,42 +52,59 @@@ 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_5d4d04d6-6b21-44cd-9855-f27359bc28ac";
 -    private static String wrfAppId = 
"WRF_2e57b355-be91-47b7-a2f4-44a7dd9e8093";
 -    private static String amberAppId = 
"Amber_df55a92b-a3af-48d8-8976-72cac88c7257";
++
 +    private static String echoAppId = 
"Echo_56c6e26c-ca77-45fe-91d1-58fa59676879";
 +    private static String wrfAppId = 
"WRF_5f097c9c-7066-49ec-aed7-4e39607b3adc";
 +    private static String amberAppId = 
"Amber_89906be6-5678-49a6-9d04-a0604fbdef2e";
  
      private static String localHost = "localhost";
      private static String trestlesHostName = "trestles.sdsc.xsede.org";
 +    private static String unicoreHostName = "fsd-cloud15.zam.kfa-juelich.de";
      private static String stampedeHostName = "stampede.tacc.xsede.org";
      private static String br2HostName = "bigred2.uits.iu.edu";
 -
 -    public static void main(String[] args) {
 -            try {
 +    
 + // unicore service endpoint url
 +    private static final String unicoreEndPointURL = 
"https://fsd-cloud15.zam.kfa-juelich.de:7000/INTEROP1/services/BESFactory?res=default_bes_factory";;
 +    
 +    
 +    public static void main(String[] args) throws Exception {
                  airavataClient = 
AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, 
THRIFT_SERVER_PORT);
                  System.out.println("API version is " + 
airavataClient.getAPIVersion());
 -//            registerApplications(); // run this only the first time
 -                for (int i = 0; i < 10; i++) {
 -//            final String expId = createExperimentForSSHHost(airavata);
 -                    final String expId = 
createEchoExperimentForTrestles(airavataClient);
 -//            final String expId = 
createEchoExperimentForStampede(airavataClient);
 -//            final String expId = 
createExperimentEchoForLocalHost(airavataClient);
 -//            final String expId = 
createExperimentWRFTrestles(airavataClient);
 -//            final String expId = createExperimentForBR2(airavataClient);
 -//            final String expId = 
createExperimentForBR2Amber(airavataClient);
 -//            final String expId = 
createExperimentWRFStampede(airavataClient);
 -//            final String expId = 
createExperimentForStampedeAmber(airavataClient);
 -//            final String expId = 
createExperimentForTrestlesAmber(airavataClient);
 -
 -            System.out.println("Experiment ID : " + expId);
 -//            updateExperiment(airavata, expId);
 -                    launchExperiment(airavataClient, expId);
 -            }
 -            } catch  (Exception e) {
 -                logger.error("Error while connecting with server", 
e.getMessage());
 -                e.printStackTrace();
 -            }
 +//                registerApplications(); // run this only the first time
 +                createAndLaunchExp();
 +    }
 +    
 +    private static String fsdResourceId;
 +    
 +    
 +    
 +    public static void createAndLaunchExp() {
 +      try {
 +        for (int i = 0; i < 2; i++) {
 +//    final String expId = createExperimentForSSHHost(airavata);
 +            final String expId = createEchoExperimentForFSD(airavataClient);
 +//    final String expId = createEchoExperimentForStampede(airavataClient);
 +//    final String expId = createExperimentEchoForLocalHost(airavataClient);
 +//    final String expId = createExperimentWRFTrestles(airavataClient);
 +//    final String expId = createExperimentForBR2(airavataClient);
 +//    final String expId = createExperimentForBR2Amber(airavataClient);
 +//    final String expId = createExperimentWRFStampede(airavataClient);
 +//    final String expId = createExperimentForStampedeAmber(airavataClient);
 +//    final String expId = createExperimentForTrestlesAmber(airavataClient);
 +
 +//    System.out.println("Experiment ID : " + expId);
 +//    updateExperiment(airavata, expId);
 +            launchExperiment(airavataClient, expId);
 +        }
 +    } catch (Exception e) {
 +        logger.error("Error while connecting with server", e.getMessage());
 +        e.printStackTrace();
-     }
 +
      }
++ }
+ 
 +   
 +    
      public static void registerApplications() {
          RegisterSampleApplications registerSampleApplications = new 
RegisterSampleApplications(airavataClient);
  

http://git-wip-us.apache.org/repos/asf/airavata/blob/19f9ae7b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AbstractResource.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/airavata/blob/19f9ae7b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogJPAUtils.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/airavata/blob/19f9ae7b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogResourceType.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/airavata/blob/19f9ae7b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/airavata/blob/19f9ae7b/modules/app-catalog/app-catalog-data/src/main/resources/META-INF/persistence.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/airavata/blob/19f9ae7b/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/airavata/blob/19f9ae7b/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/airavata/blob/19f9ae7b/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 23c31c8,78880ff..4a5d6aa
--- 
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
@@@ -71,35 -56,19 +56,44 @@@ import org.apache.airavata.gfac.core.pr
  import org.apache.airavata.gfac.core.states.GfacExperimentState;
  import org.apache.airavata.gfac.core.states.GfacPluginState;
  import org.apache.airavata.gfac.core.utils.GFacUtils;
++
+ import org.apache.airavata.messaging.core.Publisher;
++
  import 
org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription;
  import 
org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription;
  import org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType;
  import org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType;
++
 +import 
org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription;
 +import org.apache.airavata.model.appcatalog.computeresource.JobManagerCommand;
 +import 
org.apache.airavata.model.appcatalog.computeresource.JobSubmissionInterface;
 +import org.apache.airavata.model.appcatalog.computeresource.LOCALSubmission;
 +import 
org.apache.airavata.model.appcatalog.computeresource.ResourceJobManager;
 +import org.apache.airavata.model.appcatalog.computeresource.SSHJobSubmission;
 +import 
org.apache.airavata.model.appcatalog.computeresource.UnicoreJobSubmission;
++
+ import org.apache.airavata.model.appcatalog.computeresource.*;
++
  import 
org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference;
+ import org.apache.airavata.model.messaging.event.*;
  import org.apache.airavata.model.workspace.experiment.*;
  import org.apache.airavata.registry.cpi.Registry;
  import org.apache.airavata.registry.cpi.RegistryModelType;
- import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
+ import org.apache.airavata.schemas.gfac.*;
  import org.apache.airavata.schemas.gfac.DataType;
++
 +import org.apache.airavata.schemas.gfac.GsisshHostType;
 +import org.apache.airavata.schemas.gfac.HostDescriptionType;
 +import org.apache.airavata.schemas.gfac.HpcApplicationDeploymentType;
 +import org.apache.airavata.schemas.gfac.InputParameterType;
 +import org.apache.airavata.schemas.gfac.JobTypeType;
 +import org.apache.airavata.schemas.gfac.OutputParameterType;
 +import org.apache.airavata.schemas.gfac.ParameterType;
 +import org.apache.airavata.schemas.gfac.ProjectAccountType;
 +import org.apache.airavata.schemas.gfac.QueueType;
 +import org.apache.airavata.schemas.gfac.SSHHostType;
 +import org.apache.airavata.schemas.gfac.ServiceDescriptionType;
 +import org.apache.airavata.schemas.gfac.UnicoreHostType;
  import org.apache.zookeeper.*;
  import org.apache.zookeeper.data.Stat;
  import org.slf4j.Logger;

http://git-wip-us.apache.org/repos/asf/airavata/blob/19f9ae7b/pom.xml
----------------------------------------------------------------------

Reply via email to