airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject [9/9] git commit: retiring previous registry API - AIRAVATA-1234
Date Fri, 22 Aug 2014 19:01:38 GMT
retiring previous registry API - AIRAVATA-1234


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

Branch: refs/heads/master
Commit: f72637f211f5defca1bd7bee22fb3633c9f84808
Parents: 208e9f4
Author: Chathuri Wimalasena <kamalasini@gmail.com>
Authored: Fri Aug 22 14:54:47 2014 -0400
Committer: Chathuri Wimalasena <kamalasini@gmail.com>
Committed: Fri Aug 22 14:54:47 2014 -0400

----------------------------------------------------------------------
 .../java-client-samples/pom.xml                 |   17 +-
 .../client/samples/CreateLaunchExperiment.java  |   34 +-
 .../samples/CreateLaunchExperimentUS3.java      |   80 +-
 .../samples/TestCreateLaunchExperiment.java     |   54 +-
 .../airavata/client/AiravataAPIFactory.java     |    5 +-
 .../apache/airavata/client/AiravataClient.java  |   82 +-
 .../client/tools/DocumentCreatorNew.java        |   34 +-
 .../client/airavata/AiravataClientTest.java     |   16 +-
 .../main/resources/airavata-client.properties   |    2 +-
 .../main/resources/airavata-server.properties   |    2 +-
 modules/distribution/client/java/pom.xml        |   10 -
 .../java/src/main/assembly/bin-assembly.xml     |    2 -
 modules/distribution/server/pom.xml             |   10 -
 .../server/src/main/assembly/bin-assembly.xml   |    2 -
 modules/gfac/airavata-gfac-service/pom.xml      |   25 +
 .../airavata/gfac/server/GfacServerHandler.java |   27 +-
 .../airavata/gfac/client/util/Initialize.java   |    9 +-
 .../gfac/bes/provider/impl/BESProvider.java     |   88 +-
 modules/gfac/gfac-core/pom.xml                  |   10 -
 .../apache/airavata/gfac/GFacConfiguration.java |   16 +-
 .../org/apache/airavata/gfac/Scheduler.java     |   10 -
 .../airavata/gfac/core/cpi/BetterGfacImpl.java  |   34 +-
 .../apache/airavata/gfac/core/cpi/GFacImpl.java | 1356 +++++----
 .../gfac/core/handler/AbstractHandler.java      |    4 +-
 .../handler/AbstractRecoverableHandler.java     |    4 +-
 .../core/handler/AppDescriptorCheckHandler.java |    5 -
 .../gfac/core/provider/AbstractProvider.java    |    3 +-
 .../provider/AbstractRecoverableProvider.java   |    3 +-
 .../airavata/gfac/core/utils/GFacUtils.java     |  303 +-
 .../apache/airavata/job/GFacConfigXmlTest.java  |   10 +-
 modules/gfac/gfac-ec2/pom.xml                   |    5 -
 .../apache/airavata/gfac/ec2/EC2Provider.java   |   18 +-
 .../airavata/gfac/ec2/EC2ProviderTest.java      |    6 +-
 .../impl/GramProviderTestWithMyProxyAuth.java   |    6 +-
 .../gsissh/provider/impl/GSISSHProvider.java    |    5 +-
 .../impl/GSISSHProviderTestWithMyProxyAuth.java |    6 +-
 .../gfac/services/impl/LocalProviderTest.java   |    2 +-
 modules/gfac/gfac-monitor/pom.xml               |   10 -
 .../handlers/GridPullMonitorHandler.java        |    5 +-
 .../handlers/GridPushMonitorHandler.java        |    4 +-
 .../gfac/ssh/provider/impl/SSHProvider.java     |    3 +-
 .../services/impl/BigRed2TestWithSSHAuth.java   |    6 +-
 .../impl/SSHProviderTestWithSSHAuth.java        |    6 +-
 .../integration/AbstractIntegrationTest.java    |   11 -
 .../apache/airavata/integration/BaseCaseIT.java |   96 +-
 .../airavata/integration/DataRetrievalIT.java   |   24 +-
 .../airavata/integration/ForEachCaseIT.java     |  114 +-
 .../integration/PasswordCallbackImpl.java       |   78 +-
 .../WorkflowIntegrationTestBase.java            |  314 +-
 .../integration/WorkflowSamplesCaseIT.java      |  152 +-
 .../server/OrchestratorServerHandler.java       |   38 +-
 .../client/OrchestratorClientFactoryTest.java   |   26 +-
 .../orchestrator/client/util/Initialize.java    |    7 +-
 modules/orchestrator/orchestrator-core/pom.xml  |   10 +-
 .../core/OrchestratorConfiguration.java         |   12 -
 .../core/context/OrchestratorContext.java       |   11 -
 .../core/impl/GFACEmbeddedJobSubmitter.java     |    6 +-
 .../core/impl/GFACServiceJobSubmitter.java      |    2 -
 .../core/utils/OrchestratorUtils.java           |   25 +-
 .../cpi/impl/AbstractOrchestrator.java          |   98 +-
 .../cpi/impl/SimpleOrchestratorImpl.java        |   10 +-
 .../orchestrator/core/BaseOrchestratorTest.java |   38 +-
 .../orchestrator/core/NewOrchestratorTest.java  |   21 -
 .../orchestrator/core/util/Initialize.java      |    9 +-
 modules/registry/airavata-jpa-registry/pom.xml  |    5 -
 .../registry/jpa/JPAResourceAccessor.java       |   49 -
 .../registry/jpa/impl/AiravataJPARegistry.java  | 2838 ------------------
 ...avataRegistryConnectionDataProviderImpl.java |   42 -
 .../jpa/resources/ExperimentDataRetriever.java  |  543 ----
 .../registry/jpa/resources/UserResource.java    |    7 +-
 .../registry/jpa/AbstractResourceTest.java      |    2 +-
 .../registry/jpa/util/Initialize.java           |    9 +-
 modules/registry/pom.xml                        |    1 -
 modules/registry/registry-api/pom.xml           |   80 -
 .../registry/api/AiravataExperiment.java        |   73 -
 .../registry/api/AiravataRegistry2.java         |   65 -
 .../AiravataRegistryConnectionDataProvider.java |   29 -
 .../registry/api/AiravataRegistryFactory.java   |  140 -
 .../registry/api/AiravataSubRegistry.java       |   97 -
 .../airavata/registry/api/AiravataUser.java     |   48 -
 .../registry/api/ConfigurationRegistry.java     |   59 -
 .../registry/api/CredentialRegistry.java        |   69 -
 .../airavata/registry/api/DataRegistry.java     |   50 -
 .../registry/api/DescriptorRegistry.java        |   74 -
 .../airavata/registry/api/ExecutionErrors.java  |   33 -
 .../apache/airavata/registry/api/Gateway.java   |   47 -
 .../registry/api/OrchestratorRegistry.java      |  120 -
 .../airavata/registry/api/PasswordCallback.java |   25 -
 .../airavata/registry/api/ProjectsRegistry.java |   50 -
 .../registry/api/ProvenanceRegistry.java        |  528 ----
 .../registry/api/PublishedWorkflowRegistry.java |   45 -
 .../airavata/registry/api/ResourceMetadata.java |   70 -
 .../airavata/registry/api/UserRegistry.java     |   39 -
 .../registry/api/UserWorkflowRegistry.java      |   43 -
 .../airavata/registry/api/WorkspaceProject.java |   95 -
 .../AiravataRegUninitializedException.java      |   32 -
 .../DeploymentDescriptionRetrieveException.java |   35 -
 .../GatewayNotRegisteredException.java          |   32 -
 .../HostDescriptionRetrieveException.java       |   33 -
 .../RegAPIVersionIncompatibleException.java     |   39 -
 .../RegAccessorInstantiateException.java        |   32 -
 .../exception/RegAccessorInvalidException.java  |   32 -
 .../exception/RegAccessorNotFoundException.java |   32 -
 .../RegAccessorUndefinedException.java          |   40 -
 .../registry/api/exception/RegException.java    |   39 -
 .../exception/RegistrySettingsException.java    |   37 -
 .../RegistrySettingsLoadException.java          |   38 -
 .../ServiceDescriptionRetrieveException.java    |   35 -
 .../UnimplementedRegOperationException.java     |   32 -
 .../UnknownRegConnectionDataException.java      |   36 -
 .../UnspecifiedRegistrySettingsException.java   |   30 -
 .../DescriptorAlreadyExistsException.java       |   34 -
 .../DescriptorDoesNotExistsException.java       |   34 -
 .../gateway/InsufficientDataException.java      |   34 -
 .../gateway/MalformedDescriptorException.java   |   34 -
 ...PublishedWorkflowAlreadyExistsException.java |   34 -
 ...PublishedWorkflowDoesNotExistsException.java |   34 -
 .../ApplicationJobAlreadyExistsException.java   |   34 -
 .../ApplicationJobDoesNotExistsException.java   |   34 -
 .../ExperimentAlreadyExistsException.java       |   34 -
 .../ExperimentDoesNotExistsException.java       |   34 -
 .../worker/ExperimentLazyLoadedException.java   |   34 -
 .../InvalidApplicationJobIDException.java       |   34 -
 .../UserWorkflowAlreadyExistsException.java     |   34 -
 .../UserWorkflowDoesNotExistsException.java     |   34 -
 .../WorkflowInstanceAlreadyExistsException.java |   34 -
 .../WorkflowInstanceDoesNotExistsException.java |   34 -
 ...kflowInstanceNodeAlreadyExistsException.java |   34 -
 ...kflowInstanceNodeDoesNotExistsException.java |   34 -
 .../WorkspaceProjectAlreadyExistsException.java |   34 -
 .../WorkspaceProjectDoesNotExistsException.java |   34 -
 .../registry/api/impl/ExperimentDataImpl.java   |  221 --
 .../api/impl/WorkflowExecutionDataImpl.java     |  182 --
 .../api/orchestrator/OrchestratorData.java      |  113 -
 .../orchestrator/impl/OrchestratorDataImpl.java |  112 -
 .../registry/api/util/RegistryConstants.java    |   36 -
 .../registry/api/util/RegistrySettings.java     |  127 -
 .../registry/api/util/RegistryUtils.java        |  124 -
 .../registry/api/util/WebServiceUtil.java       |  202 --
 .../registry/api/workflow/ApplicationJob.java   |  295 --
 .../workflow/ApplicationJobExecutionError.java  |   67 -
 .../api/workflow/ApplicationJobStatusData.java  |   63 -
 .../registry/api/workflow/ExecutionError.java   |  103 -
 .../registry/api/workflow/ExperimentData.java   |  123 -
 .../api/workflow/ExperimentExecutionError.java  |   40 -
 .../api/workflow/ExperimentMetadata.java        |   49 -
 .../registry/api/workflow/ExperimentName.java   |   49 -
 .../registry/api/workflow/ExperimentUser.java   |   48 -
 .../registry/api/workflow/InputData.java        |   34 -
 .../api/workflow/NodeExecutionData.java         |  236 --
 .../api/workflow/NodeExecutionError.java        |   58 -
 .../api/workflow/NodeExecutionStatus.java       |   78 -
 .../registry/api/workflow/OutputData.java       |   34 -
 .../api/workflow/WorkflowExecution.java         |   69 -
 .../api/workflow/WorkflowExecutionData.java     |  118 -
 .../api/workflow/WorkflowExecutionError.java    |   49 -
 .../api/workflow/WorkflowExecutionStatus.java   |  128 -
 .../registry/api/workflow/WorkflowIOData.java   |   58 -
 .../api/workflow/WorkflowInstanceNode.java      |   67 -
 .../workflow/WorkflowInstanceNodePortData.java  |   89 -
 .../api/workflow/WorkflowNodeGramData.java      |   83 -
 .../api/workflow/WorkflowNodeIOData.java        |  114 -
 .../registry/api/workflow/WorkflowNodeType.java |   84 -
 .../api/workflow/WorkflowRunTimeData.java       |   90 -
 modules/registry/registry-cpi/pom.xml           |    5 +
 .../registry/cpi/utils/RegistrySettings.java    |  127 +
 modules/test-suite/pom.xml                      |    6 -
 modules/workflow-model/workflow-engine/pom.xml  |   12 -
 .../WorkflowInterpreterConfiguration.java       |    2 -
 modules/ws-messenger/messagebox/pom.xml         |    5 -
 modules/ws-messenger/messagebroker/pom.xml      |    5 -
 modules/xbaya-gui/pom.xml                       |    5 -
 .../xbaya/registry/PasswordCallbackImpl.java    |   78 +-
 pom.xml                                         |    2 +-
 samples/java-client/experiment/pom.xml          |   22 -
 tools/registry-tool/pom.xml                     |    5 -
 176 files changed, 1838 insertions(+), 11829 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/airavata-api/airavata-client-sdks/java-client-samples/pom.xml
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/pom.xml b/airavata-api/airavata-client-sdks/java-client-samples/pom.xml
index d51d9f5..a475b29 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/pom.xml
+++ b/airavata-api/airavata-client-sdks/java-client-samples/pom.xml
@@ -8,7 +8,8 @@
     ANY ~ KIND, either express or implied. See the License for the specific language governing permissions and limitations under
     the License. -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -25,7 +26,7 @@
     <url>http://airavata.apache.org/</url>
 
     <dependencies>
-    
+
         <dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-data-models</artifactId>
@@ -43,11 +44,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-client-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-gfac-schema-utils</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -76,11 +72,16 @@
             <artifactId>mysql-connector-java</artifactId>
             <version>${mysql.connector.version}</version>
         </dependency>
-	<dependency>
+        <dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-client-configuration</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.airavata</groupId>
+            <artifactId>airavata-client-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 
 </project>

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
----------------------------------------------------------------------
diff --git 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
index 8cfe59b..7c03ce0 100644
--- 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
@@ -21,37 +21,23 @@
 
 package org.apache.airavata.client.samples;
 
-import org.airavata.appcatalog.cpi.AppCatalogException;
-import org.apache.airavata.model.error.*;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
-import org.apache.airavata.common.utils.ClientSettings;
-import org.apache.airavata.model.util.ProjectModelUtil;
-import org.apache.airavata.model.workspace.Project;
-import org.apache.airavata.model.workspace.experiment.*;
 import org.apache.airavata.api.Airavata;
 import org.apache.airavata.api.client.AiravataClientFactory;
-import org.apache.airavata.client.AiravataAPIFactory;
-import org.apache.airavata.client.api.AiravataAPI;
 import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
-import org.apache.airavata.client.tools.DocumentCreator;
 import org.apache.airavata.client.tools.DocumentCreatorNew;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.utils.AiravataUtils;
+import org.apache.airavata.model.error.*;
 import org.apache.airavata.model.util.ExperimentModelUtil;
-import org.apache.airavata.persistance.registry.jpa.model.ErrorDetail;
-import org.apache.airavata.schemas.gfac.InputParameterType;
-import org.apache.airavata.schemas.gfac.OutputParameterType;
-import org.apache.airavata.schemas.gfac.ParameterType;
-import org.apache.airavata.workflow.model.component.system.StreamSourceComponent;
+import org.apache.airavata.model.util.ProjectModelUtil;
+import org.apache.airavata.model.workspace.Project;
+import org.apache.airavata.model.workspace.experiment.*;
 import org.apache.thrift.TException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.xmlsoap.schemas.soap.encoding.*;
 
-import java.lang.String;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 public class CreateLaunchExperiment {
 
@@ -64,8 +50,8 @@ public class CreateLaunchExperiment {
     private static Airavata.Client client;
     private static String localHostAppId = "localhost_3b5962d3-5e7e-4a97-9d1f-25c5ec436ba5,SimpleEcho0_44c34394-ca27-4fa9-bb2d-87f95a02352a";
     private static String sshHostAppId;
-    private static String pbsEchoAppId = "trestles.sdsc.edu_03b34af0-f55d-4cb3-9bce-abba35d8b30d,SimpleEcho2_e8ca0bb2-d985-4775-884b-a27b29a33251";
-    private static String pbsWRFAppId = "trestles.sdsc.edu_42adfdf7-d7bc-474a-8905-6624817b22ef,WRF_24f50b3c-4f1e-4358-bb10-c6838b12e231";
+    private static String pbsEchoAppId = "trestles.sdsc.edu_b67c9b6a-3940-4ba1-ac67-4f5c42e60fb8,SimpleEcho2_4c9e76f3-eab0-4ccb-8630-b53f22646ebd";
+    private static String pbsWRFAppId = "trestles.sdsc.edu_c033c9b4-601e-4cd7-ac98-d7de33df0557,WRF_f1726a18-9aec-4077-91c2-93877df01972";
     private static String slurmAppId = "stampede.tacc.xsede.org_b2ef59cb-f626-4767-9ca0-601f94c42ba4,SimpleEcho3_b81c2559-a088-42a3-84ce-40119d874918";
     private static String sgeAppId;
     private static String br2EchoAppId = "bigred2_9c1e6be8-f7d8-4494-98f2-bf508790e8c6,SimpleEchoBR_149fd613-98e2-46e7-ac7c-4d393349469e";
@@ -253,17 +239,17 @@ public class CreateLaunchExperiment {
             DataObjectType input = new DataObjectType();
             input.setKey("WRF_Namelist");
             input.setType(DataType.URI);
-            input.setValue("/Users/lahirugunathilake/Downloads/wrf_sample_inputs/namelist.input");
+            input.setValue("/Users/chathuri/Downloads/wrf_sample_inputs/namelist.input");
 
             DataObjectType input1 = new DataObjectType();
             input1.setKey("WRF_Input_File");
             input1.setType(DataType.URI);
-            input1.setValue("/Users/lahirugunathilake/Downloads/wrf_sample_inputs/wrfinput_d01");
+            input1.setValue("/Users/chathuri/Downloads/wrf_sample_inputs/wrfinput_d01");
 
             DataObjectType input2 = new DataObjectType();
             input2.setKey("WRF_Boundary_File");
             input2.setType(DataType.URI);
-            input2.setValue("/Users/lahirugunathilake/Downloads/wrf_sample_inputs/wrfbdy_d01");
+            input2.setValue("/Users/chathuri/Downloads/wrf_sample_inputs/wrfbdy_d01");
 
             exInputs.add(input);
             exInputs.add(input1);

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java
index b8aebc8..43d21f5 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java
@@ -19,24 +19,13 @@
 
 package org.apache.airavata.client.samples;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 import org.apache.airavata.api.Airavata;
 import org.apache.airavata.api.client.AiravataClientFactory;
+import org.apache.airavata.common.utils.AiravataUtils;
 import org.apache.airavata.model.error.AiravataClientException;
 import org.apache.airavata.model.error.AiravataSystemException;
 import org.apache.airavata.model.error.ExperimentNotFoundException;
 import org.apache.airavata.model.error.InvalidRequestException;
-import org.apache.airavata.client.AiravataAPIFactory;
-import org.apache.airavata.client.api.AiravataAPI;
-import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
-import org.apache.airavata.client.tools.UltrascanDocumentCreator;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
-import org.apache.airavata.common.utils.AiravataUtils;
-import org.apache.airavata.common.utils.ClientSettings;
 import org.apache.airavata.model.util.ExperimentModelUtil;
 import org.apache.airavata.model.util.ProjectModelUtil;
 import org.apache.airavata.model.workspace.Project;
@@ -45,6 +34,11 @@ import org.apache.thrift.TException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 public class CreateLaunchExperimentUS3 {
 	
 	 //FIXME: Read from a config file
@@ -112,37 +106,37 @@ public class CreateLaunchExperimentUS3 {
             e.printStackTrace();
         }
     }
-    public static void addDescriptors() throws AiravataAPIInvocationException,ApplicationSettingsException  {
-        try {
-            UltrascanDocumentCreator documentCreator = new UltrascanDocumentCreator(getAiravataAPI());
-            documentCreator.createMPIPBSDocsTrestles();
-            documentCreator.createEchoPBSDocsforTestles();
-            documentCreator.createEchoSlurmDocsofStampede();
-            documentCreator.createMPISLURMDocsStampede();
-        } catch (AiravataAPIInvocationException e) {
-            logger.error("Unable to create airavata API", e.getMessage());
-            throw new AiravataAPIInvocationException(e);
-        } catch (ApplicationSettingsException e) {
-            logger.error("Unable to create airavata API", e.getMessage());
-            throw new ApplicationSettingsException(e.getMessage());
-        }
-    }
-
-    private static AiravataAPI getAiravataAPI() throws AiravataAPIInvocationException, ApplicationSettingsException {
-        AiravataAPI airavataAPI;
-        try {
-            String sysUser = ClientSettings.getSetting(DEFAULT_USER);
-            String gateway = ClientSettings.getSetting(DEFAULT_GATEWAY);
-            airavataAPI = AiravataAPIFactory.getAPI(gateway, sysUser);
-        } catch (AiravataAPIInvocationException e) {
-            logger.error("Unable to create airavata API", e.getMessage());
-            throw new AiravataAPIInvocationException(e);
-        } catch (ApplicationSettingsException e) {
-            logger.error("Unable to create airavata API", e.getMessage());
-            throw new ApplicationSettingsException(e.getMessage());
-        }
-        return airavataAPI;
-    }
+//    public static void addDescriptors() throws AiravataAPIInvocationException,ApplicationSettingsException  {
+//        try {
+//            UltrascanDocumentCreator documentCreator = new UltrascanDocumentCreator(getAiravataAPI());
+//            documentCreator.createMPIPBSDocsTrestles();
+//            documentCreator.createEchoPBSDocsforTestles();
+//            documentCreator.createEchoSlurmDocsofStampede();
+//            documentCreator.createMPISLURMDocsStampede();
+//        } catch (AiravataAPIInvocationException e) {
+//            logger.error("Unable to create airavata API", e.getMessage());
+//            throw new AiravataAPIInvocationException(e);
+//        } catch (ApplicationSettingsException e) {
+//            logger.error("Unable to create airavata API", e.getMessage());
+//            throw new ApplicationSettingsException(e.getMessage());
+//        }
+//    }
+
+//    private static AiravataAPI getAiravataAPI() throws AiravataAPIInvocationException, ApplicationSettingsException {
+//        AiravataAPI airavataAPI;
+//        try {
+//            String sysUser = ClientSettings.getSetting(DEFAULT_USER);
+//            String gateway = ClientSettings.getSetting(DEFAULT_GATEWAY);
+//            airavataAPI = AiravataAPIFactory.getAPI(gateway, sysUser);
+//        } catch (AiravataAPIInvocationException e) {
+//            logger.error("Unable to create airavata API", e.getMessage());
+//            throw new AiravataAPIInvocationException(e);
+//        } catch (ApplicationSettingsException e) {
+//            logger.error("Unable to create airavata API", e.getMessage());
+//            throw new ApplicationSettingsException(e.getMessage());
+//        }
+//        return airavataAPI;
+//    }
 
     public static String createExperimentForTrestles(Airavata.Client client) throws TException  {
         try{

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/TestCreateLaunchExperiment.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/TestCreateLaunchExperiment.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/TestCreateLaunchExperiment.java
index a90ed43..63c473c 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/TestCreateLaunchExperiment.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/TestCreateLaunchExperiment.java
@@ -23,31 +23,19 @@ package org.apache.airavata.client.samples;
 
 import org.apache.airavata.api.Airavata;
 import org.apache.airavata.api.client.AiravataClientFactory;
-import org.apache.airavata.client.AiravataAPIFactory;
-import org.apache.airavata.client.api.AiravataAPI;
-import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
-import org.apache.airavata.client.tools.DocumentCreator;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.utils.AiravataUtils;
-import org.apache.airavata.common.utils.ClientSettings;
 import org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule;
-import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription;
-import org.apache.airavata.model.error.*;
-import org.apache.airavata.model.util.ExperimentModelUtil;
-import org.apache.airavata.model.util.ProjectModelUtil;
-import org.apache.airavata.model.workspace.Project;
+import org.apache.airavata.model.error.AiravataClientException;
+import org.apache.airavata.model.error.AiravataSystemException;
+import org.apache.airavata.model.error.InvalidRequestException;
 import org.apache.airavata.model.workspace.experiment.*;
-import org.apache.airavata.model.workspace.experiment.Experiment;
-import org.apache.airavata.persistance.registry.jpa.model.*;
-import org.apache.airavata.workflow.model.component.system.SystemComponent;
 import org.apache.thrift.TException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.sql.Timestamp;
-import java.text.Format;
-import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Calendar;
+import java.util.List;
+import java.util.Map;
 
 public class TestCreateLaunchExperiment {
 
@@ -105,21 +93,21 @@ public class TestCreateLaunchExperiment {
         }
     }
 
-    private static AiravataAPI getAiravataAPI() throws AiravataAPIInvocationException, ApplicationSettingsException {
-        AiravataAPI airavataAPI;
-        try {
-            String sysUser = ClientSettings.getSetting(DEFAULT_USER);
-            String gateway = ClientSettings.getSetting(DEFAULT_GATEWAY);
-            airavataAPI = AiravataAPIFactory.getAPI(gateway, sysUser);
-        } catch (AiravataAPIInvocationException e) {
-            logger.error("Unable to create airavata API", e.getMessage());
-            throw new AiravataAPIInvocationException(e);
-        } catch (ApplicationSettingsException e) {
-            logger.error("Unable to create airavata API", e.getMessage());
-            throw new ApplicationSettingsException(e.getMessage());
-        }
-        return airavataAPI;
-    }
+//    private static AiravataAPI getAiravataAPI() throws AiravataAPIInvocationException, ApplicationSettingsException {
+//        AiravataAPI airavataAPI;
+//        try {
+//            String sysUser = ClientSettings.getSetting(DEFAULT_USER);
+//            String gateway = ClientSettings.getSetting(DEFAULT_GATEWAY);
+//            airavataAPI = AiravataAPIFactory.getAPI(gateway, sysUser);
+//        } catch (AiravataAPIInvocationException e) {
+//            logger.error("Unable to create airavata API", e.getMessage());
+//            throw new AiravataAPIInvocationException(e);
+//        } catch (ApplicationSettingsException e) {
+//            logger.error("Unable to create airavata API", e.getMessage());
+//            throw new ApplicationSettingsException(e.getMessage());
+//        }
+//        return airavataAPI;
+//    }
 
     public static List<Experiment> getExperimentsForUser (Airavata.Client client, String user){
         try {

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataAPIFactory.java
----------------------------------------------------------------------
diff --git a/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataAPIFactory.java b/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataAPIFactory.java
index 62305d9..606301c 100644
--- a/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataAPIFactory.java
+++ b/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataAPIFactory.java
@@ -19,14 +19,13 @@
 
 package org.apache.airavata.client;
 
-import java.net.URI;
-
 import org.apache.airavata.client.api.AiravataAPI;
 import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
-import org.apache.airavata.client.impl.PasswordCallBackImpl;
 import org.apache.airavata.common.utils.SecurityUtil;
 import org.apache.airavata.registry.api.PasswordCallback;
 
+import java.net.URI;
+
 public class AiravataAPIFactory {
 	
 	public static AiravataAPI getAPI(String gateway, String username, String alternativeUser) throws AiravataAPIInvocationException{

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
----------------------------------------------------------------------
diff --git a/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java b/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
index d516918..6ee3480 100644
--- a/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
+++ b/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
@@ -112,31 +112,31 @@ public class AiravataClient extends Observable implements AiravataAPI {
 		if (registryUrl != null) {
 			config.put(AiravataClient.REGISTRY, registryUrl.toString());
 		}
-		AiravataRegistry2 registryObject = getRegistry(registryUrl, gateway,
-				username, new PasswordCallBackImpl(username, password));
-		if (registryObject != null) {
-			URI uri = registryObject.getEventingServiceURI();
-			config.put(
-					AiravataClient.BROKER,
-					uri == null ? "http://localhost:8080/airavata-server/services/EventingService"
-							: uri.toString());
-			uri = registryObject.getMessageBoxURI();
-			config.put(
-					AiravataClient.MSGBOX,
-					uri == null ? "http://localhost:8080/airavata-server/services/MsgBoxService"
-							: uri.toString());
-			List<URI> URLList = registryObject.getWorkflowInterpreterURIs();
-			config.put(
-					AiravataClient.WORKFLOWSERVICEURL,
-					URLList == null || URLList.size() == 0 ? "http://localhost:8080/airavata-server/services/WorkflowInterpretor?wsdl"
-							: URLList.get(0).toString());
-			List<URI> urlList = registryObject.getGFacURIs();
-			config.put(
-					AiravataClient.GFAC,
-					urlList == null || urlList.size() == 0 ? "http://localhost:8080/airavata-server/services/GFacService"
-							: urlList.get(0).toString());
-			config.put(AiravataClient.WITHLISTENER, "true");
-		}
+//		AiravataRegistry2 registryObject = getRegistry(registryUrl, gateway,
+//				username, new PasswordCallBackImpl(username, password));
+//		if (registryObject != null) {
+//			URI uri = registryObject.getEventingServiceURI();
+//			config.put(
+//					AiravataClient.BROKER,
+//					uri == null ? "http://localhost:8080/airavata-server/services/EventingService"
+//							: uri.toString());
+//			uri = registryObject.getMessageBoxURI();
+//			config.put(
+//					AiravataClient.MSGBOX,
+//					uri == null ? "http://localhost:8080/airavata-server/services/MsgBoxService"
+//							: uri.toString());
+//			List<URI> URLList = registryObject.getWorkflowInterpreterURIs();
+//			config.put(
+//					AiravataClient.WORKFLOWSERVICEURL,
+//					URLList == null || URLList.size() == 0 ? "http://localhost:8080/airavata-server/services/WorkflowInterpretor?wsdl"
+//							: URLList.get(0).toString());
+//			List<URI> urlList = registryObject.getGFacURIs();
+//			config.put(
+//					AiravataClient.GFAC,
+//					urlList == null || urlList.size() == 0 ? "http://localhost:8080/airavata-server/services/GFacService"
+//							: urlList.get(0).toString());
+//			config.put(AiravataClient.WITHLISTENER, "true");
+//		}
 		return config;
 	}
 
@@ -146,34 +146,6 @@ public class AiravataClient extends Observable implements AiravataAPI {
 //        if (AiravataUtils.isServer()) {
 //            waitTillRegistryServiceStarts();
 //        }
-
-        try {
-			if (!configCreated) {
-				configuration = createConfig(getRegitryURI(), getGateway(), getCurrentUser(),
-						getPassword());
-				configCreated = true;
-			}
-			updateClientConfiguration(configuration);
-
-			// TODO: At some point this should contain the current user the
-			// airavata
-			// client is
-			// logged in to the Airavata system
-			setCurrentUser(getClientConfiguration().getJcrUsername());
-		} catch (Exception e) {
-			throw new AiravataAPIInvocationException(
-					"Error while initializing the Airavata API", e);
-		}
-	}
-
-    private void waitTillRegistryServiceStarts() throws AiravataAPIInvocationException{
-
-        synchronized (API_VERSION) {
-            if (!registryServiceStarted) {
-                waitForRegistryServiceToStart(getRegistryWebServiceWSDLUrl());
-                registryServiceStarted = true;
-            }
-        }
     }
 
     private String getRegistryWebServiceWSDLUrl() throws AiravataAPIInvocationException {
@@ -354,7 +326,7 @@ public class AiravataClient extends Observable implements AiravataAPI {
         }
 		return executionManager;
 	}
-	
+
 	@Override
 	public CredentialStoreManager getCredentialStoreManager() {
 		if(credentialStoreManagerImpl == null)
@@ -417,7 +389,7 @@ public class AiravataClient extends Observable implements AiravataAPI {
 	public void setGateway(String gateway) {
 		this.gateway = gateway;
 	}
-	
+
 	public static void main(String[] args) throws Exception {
 		AiravataAPI api = AiravataAPIFactory.getAPI(new URI("http://localhost:8080/airavata/services/registry"), "default", "admin", new PasswordCallBackImpl("admin", "admin"));
 		ExperimentAdvanceOptions options = api.getExecutionManager().createExperimentAdvanceOptions();

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorNew.java
----------------------------------------------------------------------
diff --git a/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorNew.java b/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorNew.java
index f686847..1cf6a3c 100644
--- a/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorNew.java
+++ b/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorNew.java
@@ -20,52 +20,26 @@
 */
 package org.apache.airavata.client.tools;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
 import org.airavata.appcatalog.cpi.AppCatalog;
 import org.airavata.appcatalog.cpi.AppCatalogException;
 import org.apache.airavata.api.Airavata;
-import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
 import org.apache.airavata.common.utils.ClientSettings;
-import org.apache.airavata.commons.gfac.type.ApplicationDescription;
-import org.apache.airavata.commons.gfac.type.HostDescription;
-import org.apache.airavata.commons.gfac.type.ServiceDescription;
 import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription;
 import org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule;
 import org.apache.airavata.model.appcatalog.appdeployment.ApplicationParallelismType;
 import org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription;
 import org.apache.airavata.model.appcatalog.appinterface.DataType;
-import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription;
-import org.apache.airavata.model.appcatalog.computeresource.JobManagerCommand;
-import org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement;
-import org.apache.airavata.model.appcatalog.computeresource.LOCALSubmission;
-import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManager;
-import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManagerType;
-import org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement;
-import org.apache.airavata.model.appcatalog.computeresource.SSHJobSubmission;
-import org.apache.airavata.model.appcatalog.computeresource.SecurityProtocol;
+import org.apache.airavata.model.appcatalog.computeresource.*;
 import org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference;
 import org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile;
 import org.apache.airavata.model.error.AiravataClientException;
 import org.apache.airavata.model.error.AiravataSystemException;
 import org.apache.airavata.model.error.InvalidRequestException;
-import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
-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.SSHHostType;
-import org.apache.airavata.schemas.gfac.StringParameterType;
 import org.apache.thrift.TException;
 
+import java.io.File;
+import java.util.*;
+
 public class DocumentCreatorNew {
 
     private AppCatalog appcatalog = null;

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/airavata-client/src/test/java/org/apache/airavata/client/airavata/AiravataClientTest.java
----------------------------------------------------------------------
diff --git a/modules/airavata-client/src/test/java/org/apache/airavata/client/airavata/AiravataClientTest.java b/modules/airavata-client/src/test/java/org/apache/airavata/client/airavata/AiravataClientTest.java
index 802c56b..617cb8f 100644
--- a/modules/airavata-client/src/test/java/org/apache/airavata/client/airavata/AiravataClientTest.java
+++ b/modules/airavata-client/src/test/java/org/apache/airavata/client/airavata/AiravataClientTest.java
@@ -93,14 +93,14 @@ public class AiravataClientTest {
     }
 
     //@Test
-    public void testRegistryServiceInvocation() throws Exception {
-        org.apache.airavata.registry.stub.RegistryServiceStub stub =
-                new org.apache.airavata.registry.stub.RegistryServiceStub("http://localhost:8080/axis2/services/RegistryService?wsdl");
-        boolean registryServiceStarted = stub.isRegistryServiceStarted().getIsRegistryServiceStartedResponse().
-                getReturn();
-
-        System.out.println(registryServiceStarted);
-    }
+//    public void testRegistryServiceInvocation() throws Exception {
+//        org.apache.airavata.registry.stub.RegistryServiceStub stub =
+//                new org.apache.airavata.registry.stub.RegistryServiceStub("http://localhost:8080/axis2/services/RegistryService?wsdl");
+//        boolean registryServiceStarted = stub.isRegistryServiceStarted().getIsRegistryServiceStartedResponse().
+//                getReturn();
+//
+//        System.out.println(registryServiceStarted);
+//    }
 
 
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/configuration/client/src/main/resources/airavata-client.properties
----------------------------------------------------------------------
diff --git a/modules/configuration/client/src/main/resources/airavata-client.properties b/modules/configuration/client/src/main/resources/airavata-client.properties
index a673565..9575517 100644
--- a/modules/configuration/client/src/main/resources/airavata-client.properties
+++ b/modules/configuration/client/src/main/resources/airavata-client.properties
@@ -27,7 +27,7 @@
 
 ###---------------------------REGISTRY API IMPLEMENTATION---------------------------###
 
-class.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
+#class.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
 #class.registry.accessor=org.apache.airavata.rest.client.RegistryClient
 
 ###---------------------REGISTRY API IMPLEMENTATION - CUSTOM SETTINGS----------------------###

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/configuration/server/src/main/resources/airavata-server.properties
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/airavata-server.properties b/modules/configuration/server/src/main/resources/airavata-server.properties
index 589c3d1..44d25c0 100644
--- a/modules/configuration/server/src/main/resources/airavata-server.properties
+++ b/modules/configuration/server/src/main/resources/airavata-server.properties
@@ -150,7 +150,7 @@ host.scheduler=org.apache.airavata.gfac.core.scheduler.impl.SimpleHostScheduler
 
 ###---------------------------REGISTRY API IMPLEMENTATION---------------------------###
 
-class.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
+#class.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
 #class.registry.accessor=org.apache.airavata.rest.client.RegistryClient
 
 ###########################################################################

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/distribution/client/java/pom.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/client/java/pom.xml b/modules/distribution/client/java/pom.xml
index e3b8fac..d36492c 100644
--- a/modules/distribution/client/java/pom.xml
+++ b/modules/distribution/client/java/pom.xml
@@ -229,11 +229,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-registry-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-gfac-schema-utils</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -272,11 +267,6 @@
             <artifactId>airavata-gfac-core</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-client-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <!--dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-message-monitor</artifactId>

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/distribution/client/java/src/main/assembly/bin-assembly.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/client/java/src/main/assembly/bin-assembly.xml b/modules/distribution/client/java/src/main/assembly/bin-assembly.xml
index 9497ba8..f89438d 100644
--- a/modules/distribution/client/java/src/main/assembly/bin-assembly.xml
+++ b/modules/distribution/client/java/src/main/assembly/bin-assembly.xml
@@ -103,7 +103,6 @@
                 <!--<include>amazon:MapReduce.Service.Client</include> -->
                 <include>net.java.dev.jets3t:jets3t</include>
 		<include>org.apache.airavata:airavata-orchestrator-core:jar</include>
-		<include>org.apache.airavata:airavata-registry-api:jar</include>
 		<include>org.apache.airavata:airavata-gfac-schema-utils:jar</include>
 		<include>org.apache.airavata:airavata-common-utils:jar</include>
 		<include>org.apache.airavata:airavata-workflow-execution-context:jar</include>
@@ -113,7 +112,6 @@
 		<include>org.apache.airavata:airavata-api-stubs:jar</include>
 		<include>org.apache.airavata:airavata-credential-store:jar</include>
 		<include>org.apache.airavata:airavata-gfac-core:jar</include>
-		<include>org.apache.airavata:airavata-client-api:jar</include>
 		<include>commons-cli:commons-cli:jar</include>
 		<!--include>org.apache.airavata:airavata-message-monitor:jar</include>
 		<include>org.apache.airavata:airavata-workflow-model-core:jar</include>

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/distribution/server/pom.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/server/pom.xml b/modules/distribution/server/pom.xml
index 8138baa..2ddd510 100644
--- a/modules/distribution/server/pom.xml
+++ b/modules/distribution/server/pom.xml
@@ -274,11 +274,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-registry-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-gfac-schema-utils</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -354,11 +349,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-client-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-message-monitor</artifactId>
             <version>${project.version}</version>
         </dependency>

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/distribution/server/src/main/assembly/bin-assembly.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/server/src/main/assembly/bin-assembly.xml b/modules/distribution/server/src/main/assembly/bin-assembly.xml
index e84d7b9..bec5b12 100644
--- a/modules/distribution/server/src/main/assembly/bin-assembly.xml
+++ b/modules/distribution/server/src/main/assembly/bin-assembly.xml
@@ -198,7 +198,6 @@
                 <include>org.apache.airavata:airavata-common-utils:jar</include>
                 <include>org.apache.airavata:airavata-orchestrator-service:jar</include>
                 <include>org.apache.airavata:airavata-orchestrator-core:jar</include>
-                <include>org.apache.airavata:airavata-registry-api:jar</include>
                 <include>org.apache.airavata:airavata-gfac-schema-utils:jar</include>
                 <include>org.apache.airavata:airavata-workflow-execution-context:jar</include>
                 <include>org.apache.airavata:airavata-registry-cpi:jar</include>
@@ -216,7 +215,6 @@
                 <include>org.apache.airavata:airavata-gfac-hadoop:jar</include>
                 <include>org.apache.airavata:airavata-gfac-bes:jar</include>
                 <include>org.apache.airavata:airavata-gfac-gram:jar</include>
-                <include>org.apache.airavata:airavata-client-api:jar</include>
                 <include>org.apache.airavata:airavata-message-monitor:jar</include>
                 <include>org.apache.airavata:airavata-workflow-model-core:jar</include>
                 <include>org.apache.airavata:airavata-messenger-commons:jar</include>

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/gfac/airavata-gfac-service/pom.xml
----------------------------------------------------------------------
diff --git a/modules/gfac/airavata-gfac-service/pom.xml b/modules/gfac/airavata-gfac-service/pom.xml
index 4387115..ca12b41 100644
--- a/modules/gfac/airavata-gfac-service/pom.xml
+++ b/modules/gfac/airavata-gfac-service/pom.xml
@@ -37,6 +37,26 @@
         </dependency>
         <dependency>
             <groupId>org.apache.airavata</groupId>
+            <artifactId>airavata-client-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.airavata</groupId>
+            <artifactId>airavata-common-utils</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.airavata</groupId>
+            <artifactId>airavata-registry-cpi</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.airavata</groupId>
+            <artifactId>airavata-jpa-registry</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-gfac-core</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -45,6 +65,11 @@
             <artifactId>airavata-model-utils</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.airavata</groupId>
+            <artifactId>airavata-api-stubs</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 	    <dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-server-configuration</artifactId>

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java b/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
index 0ec7e67..6573e19 100644
--- a/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
+++ b/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
@@ -20,10 +20,7 @@
 */
 package org.apache.airavata.gfac.server;
 
-import java.io.File;
-import java.io.IOException;
-
-import org.apache.airavata.common.exception.AiravataConfigurationException;
+import com.google.common.eventbus.EventBus;
 import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.utils.AiravataZKUtils;
 import org.apache.airavata.common.utils.Constants;
@@ -35,23 +32,15 @@ import org.apache.airavata.gfac.core.cpi.GFac;
 import org.apache.airavata.gfac.cpi.GfacService;
 import org.apache.airavata.gfac.cpi.gfac_cpi_serviceConstants;
 import org.apache.airavata.persistance.registry.jpa.impl.RegistryFactory;
-import org.apache.airavata.registry.api.AiravataRegistryFactory;
-import org.apache.airavata.registry.api.AiravataUser;
-import org.apache.airavata.registry.api.Gateway;
-import org.apache.airavata.registry.api.exception.RegException;
 import org.apache.airavata.registry.cpi.Registry;
 import org.apache.thrift.TException;
-import org.apache.zookeeper.CreateMode;
-import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.WatchedEvent;
-import org.apache.zookeeper.Watcher;
-import org.apache.zookeeper.ZooDefs;
-import org.apache.zookeeper.ZooKeeper;
+import org.apache.zookeeper.*;
 import org.apache.zookeeper.data.Stat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.eventbus.EventBus;
+import java.io.File;
+import java.io.IOException;
 
 
 public class GfacServerHandler implements GfacService.Iface, Watcher{
@@ -252,12 +241,8 @@ public class GfacServerHandler implements GfacService.Iface, Watcher{
 
     private GFac getGfac()throws TException{
         try {
-            return new BetterGfacImpl(registry, null,
-                                AiravataRegistryFactory.getRegistry(new Gateway(getGatewayName()),
-                                        new AiravataUser(getAiravataUserName())),zk,publisher);
-        } catch (RegException e) {
-            throw new TException("Error initializing gfac instance",e);
-        } catch (AiravataConfigurationException e) {
+            return new BetterGfacImpl(registry,zk,publisher);
+        } catch (Exception e) {
             throw new TException("Error initializing gfac instance",e);
         }
     }

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/gfac/airavata-gfac-service/src/test/java/org/apache/airavata/gfac/client/util/Initialize.java
----------------------------------------------------------------------
diff --git a/modules/gfac/airavata-gfac-service/src/test/java/org/apache/airavata/gfac/client/util/Initialize.java b/modules/gfac/airavata-gfac-service/src/test/java/org/apache/airavata/gfac/client/util/Initialize.java
index 0046204..12c0c56 100644
--- a/modules/gfac/airavata-gfac-service/src/test/java/org/apache/airavata/gfac/client/util/Initialize.java
+++ b/modules/gfac/airavata-gfac-service/src/test/java/org/apache/airavata/gfac/client/util/Initialize.java
@@ -23,9 +23,8 @@ package org.apache.airavata.gfac.client.util;
 import org.apache.airavata.persistance.registry.jpa.ResourceType;
 import org.apache.airavata.persistance.registry.jpa.ResourceUtils;
 import org.apache.airavata.persistance.registry.jpa.resources.*;
-import org.apache.airavata.registry.api.exception.RegistrySettingsException;
-import org.apache.airavata.registry.api.util.RegistrySettings;
 import org.apache.airavata.registry.cpi.RegistryException;
+import org.apache.airavata.registry.cpi.utils.RegistrySettings;
 import org.apache.derby.drda.NetworkServerControl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -101,7 +100,7 @@ public class Initialize {
             jdbcUser = RegistrySettings.getSetting("registry.jdbc.user");
             jdbcPassword = RegistrySettings.getSetting("registry.jdbc.password");
             jdbcUrl = jdbcUrl + "?" + "user=" + jdbcUser + "&" + "password=" + jdbcPassword;
-        } catch (RegistrySettingsException e) {
+        } catch (RegistryException e) {
             logger.error("Unable to read properties" , e);
         }
 
@@ -157,10 +156,8 @@ public class Initialize {
             resource.setWorker(workerResource);
             resource.save();
 
-        } catch (RegistrySettingsException e) {
-            logger.error("Unable to read properties", e);
         } catch (RegistryException e) {
-            logger.error("Error while saving data to registry", e);
+            logger.error("Unable to read properties", e);
         }
     }
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/provider/impl/BESProvider.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/provider/impl/BESProvider.java b/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/provider/impl/BESProvider.java
index 22e823d..207e076 100644
--- a/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/provider/impl/BESProvider.java
+++ b/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/provider/impl/BESProvider.java
@@ -20,43 +20,31 @@
 */
 package org.apache.airavata.gfac.bes.provider.impl;
 
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.math.BigInteger;
-import java.security.InvalidKeyException;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.PrivateKey;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Random;
-import java.util.Set;
-
-import javax.security.auth.x500.X500Principal;
-
+import de.fzj.unicore.bes.client.FactoryClient;
+import de.fzj.unicore.bes.faults.UnknownActivityIdentifierFault;
+import de.fzj.unicore.uas.client.StorageClient;
+import de.fzj.unicore.wsrflite.xmlbeans.WSUtilities;
+import eu.emi.security.authn.x509.helpers.CertificateHelpers;
+import eu.emi.security.authn.x509.helpers.proxy.X509v3CertificateBuilder;
+import eu.emi.security.authn.x509.impl.CertificateUtils;
+import eu.emi.security.authn.x509.impl.CertificateUtils.Encoding;
+import eu.emi.security.authn.x509.impl.DirectoryCertChainValidator;
+import eu.emi.security.authn.x509.impl.KeyAndCertCredential;
+import eu.emi.security.authn.x509.impl.X500NameUtils;
+import eu.unicore.util.httpclient.DefaultClientConfiguration;
 import org.apache.airavata.gfac.Constants;
 import org.apache.airavata.gfac.GFacException;
 import org.apache.airavata.gfac.bes.security.GSISecurityContext;
+import org.apache.airavata.gfac.bes.utils.DataTransferrer;
+import org.apache.airavata.gfac.bes.utils.JSDLGenerator;
+import org.apache.airavata.gfac.bes.utils.StorageCreator;
 import org.apache.airavata.gfac.core.context.JobExecutionContext;
 import org.apache.airavata.gfac.core.notification.events.StatusChangeEvent;
 import org.apache.airavata.gfac.core.notification.events.UnicoreJobIDEvent;
 import org.apache.airavata.gfac.core.provider.AbstractProvider;
 import org.apache.airavata.gfac.core.provider.GFacProviderException;
-import org.apache.airavata.gfac.bes.utils.DataTransferrer;
-import org.apache.airavata.gfac.bes.utils.JSDLGenerator;
-import org.apache.airavata.gfac.bes.utils.StorageCreator;
 import org.apache.airavata.gfac.core.utils.GFacUtils;
 import org.apache.airavata.model.workspace.experiment.JobState;
-import org.apache.airavata.registry.api.workflow.ApplicationJob;
-import org.apache.airavata.registry.api.workflow.ApplicationJob.ApplicationJobStatus;
 import org.apache.airavata.schemas.gfac.UnicoreHostType;
 import org.apache.xmlbeans.XmlCursor;
 import org.bouncycastle.asn1.ASN1InputStream;
@@ -64,31 +52,25 @@ import org.bouncycastle.asn1.x500.X500Name;
 import org.bouncycastle.asn1.x500.style.BCStyle;
 import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
 import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.ggf.schemas.bes.x2006.x08.besFactory.ActivityStateEnumeration;
+import org.ggf.schemas.bes.x2006.x08.besFactory.*;
 import org.ggf.schemas.bes.x2006.x08.besFactory.ActivityStateEnumeration.Enum;
-import org.ggf.schemas.bes.x2006.x08.besFactory.ActivityStatusType;
-import org.ggf.schemas.bes.x2006.x08.besFactory.CreateActivityDocument;
-import org.ggf.schemas.bes.x2006.x08.besFactory.CreateActivityResponseDocument;
-import org.ggf.schemas.bes.x2006.x08.besFactory.GetActivityStatusesDocument;
-import org.ggf.schemas.bes.x2006.x08.besFactory.GetActivityStatusesResponseDocument;
 import org.ggf.schemas.jsdl.x2005.x11.jsdl.JobDefinitionDocument;
 import org.ggf.schemas.jsdl.x2005.x11.jsdl.JobDefinitionType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3.x2005.x08.addressing.EndpointReferenceType;
 
-import de.fzj.unicore.bes.client.FactoryClient;
-import de.fzj.unicore.bes.faults.UnknownActivityIdentifierFault;
-import de.fzj.unicore.uas.client.StorageClient;
-import de.fzj.unicore.wsrflite.xmlbeans.WSUtilities;
-import eu.emi.security.authn.x509.helpers.CertificateHelpers;
-import eu.emi.security.authn.x509.helpers.proxy.X509v3CertificateBuilder;
-import eu.emi.security.authn.x509.impl.CertificateUtils;
-import eu.emi.security.authn.x509.impl.CertificateUtils.Encoding;
-import eu.emi.security.authn.x509.impl.DirectoryCertChainValidator;
-import eu.emi.security.authn.x509.impl.KeyAndCertCredential;
-import eu.emi.security.authn.x509.impl.X500NameUtils;
-import eu.unicore.util.httpclient.DefaultClientConfiguration;
+import javax.security.auth.x500.X500Principal;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.math.BigInteger;
+import java.security.InvalidKeyException;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.PrivateKey;
+import java.security.cert.X509Certificate;
+import java.util.*;
 
 
 
@@ -321,14 +303,14 @@ public class BESProvider extends AbstractProvider {
 
     private void saveApplicationJob(JobExecutionContext jobExecutionContext, JobDefinitionType jobDefinition,
                                     String metadata) {
-        ApplicationJob appJob = GFacUtils.createApplicationJob(jobExecutionContext);
-        appJob.setJobId(jobId);
-        appJob.setJobData(jobDefinition.toString());
-        appJob.setSubmittedTime(Calendar.getInstance().getTime());
-        appJob.setStatus(ApplicationJobStatus.SUBMITTED);
-        appJob.setStatusUpdateTime(appJob.getSubmittedTime());
-        appJob.setMetadata(metadata);
-        GFacUtils.recordApplicationJob(jobExecutionContext, appJob);
+//        ApplicationJob appJob = GFacUtils.createApplicationJob(jobExecutionContext);
+//        appJob.setJobId(jobId);
+//        appJob.setJobData(jobDefinition.toString());
+//        appJob.setSubmittedTime(Calendar.getInstance().getTime());
+//        appJob.setStatus(ApplicationJobStatus.SUBMITTED);
+//        appJob.setStatusUpdateTime(appJob.getSubmittedTime());
+//        appJob.setMetadata(metadata);
+//        GFacUtils.recordApplicationJob(jobExecutionContext, appJob);
     }
 
     public void dispose(JobExecutionContext jobExecutionContext) throws GFacProviderException {

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/gfac/gfac-core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/pom.xml b/modules/gfac/gfac-core/pom.xml
index f0a73f6..9ed07bf 100644
--- a/modules/gfac/gfac-core/pom.xml
+++ b/modules/gfac/gfac-core/pom.xml
@@ -32,21 +32,11 @@
         <!-- GFAC schemas -->
         <dependency>
             <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-client-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-workflow-execution-context</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-registry-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-registry-cpi</artifactId>
             <version>${project.version}</version>
         </dependency>

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/GFacConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/GFacConfiguration.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/GFacConfiguration.java
index f664bcc..901efda 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/GFacConfiguration.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/GFacConfiguration.java
@@ -34,7 +34,6 @@ import javax.xml.xpath.XPathExpression;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
 
-import org.apache.airavata.client.api.AiravataAPI;
 import org.apache.airavata.gfac.core.handler.GFacHandlerConfig;
 import org.apache.airavata.gfac.core.provider.GFacProviderConfig;
 import org.slf4j.Logger;
@@ -46,7 +45,7 @@ public class GFacConfiguration {
     public static final Logger log = LoggerFactory.getLogger(GFacConfiguration.class);
 
 
-    private AiravataAPI airavataAPI;
+//    private AiravataAPI airavataAPI;
 
     private static Document handlerDoc;
     // Keep list of full qualified class names of GFac handlers which should invoked before
@@ -59,13 +58,12 @@ public class GFacConfiguration {
 
     public ExecutionMode executionMode = ExecutionMode.SYNCHRONOUS; // default execution mode is SYNCHRONOUS
 
-    public GFacConfiguration(AiravataAPI airavataAPI) {
-        this.airavataAPI = airavataAPI;
+    public GFacConfiguration() {
     }
 
-    public AiravataAPI getAiravataAPI() {
-        return airavataAPI;
-    }
+//    public AiravataAPI getAiravataAPI() {
+//        return airavataAPI;
+//    }
 
 
     public List<GFacHandlerConfig> getInHandlers() {
@@ -156,11 +154,11 @@ public class GFacConfiguration {
      * @return GFacConfiguration object.
      */
     //FIXME
-    public static GFacConfiguration create(File configFile, AiravataAPI airavataAPI, Properties configurationProperties) throws ParserConfigurationException, IOException, SAXException, XPathExpressionException {
+    public static GFacConfiguration create(File configFile,  Properties configurationProperties) throws ParserConfigurationException, IOException, SAXException, XPathExpressionException {
         DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
         DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
         handlerDoc = docBuilder.parse(configFile);
-        return new GFacConfiguration(airavataAPI);
+        return new GFacConfiguration();
     }
 
     private static String xpathGetText(Document doc, String expression) throws XPathExpressionException {

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/Scheduler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/Scheduler.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/Scheduler.java
index 54ca221..1b8efe0 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/Scheduler.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/Scheduler.java
@@ -33,8 +33,6 @@ import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.xpath.XPathExpressionException;
 
-import org.apache.airavata.client.api.AiravataAPI;
-import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
 import org.apache.airavata.commons.gfac.type.ApplicationDescription;
 import org.apache.airavata.commons.gfac.type.HostDescription;
 import org.apache.airavata.gfac.core.context.JobExecutionContext;
@@ -178,14 +176,6 @@ public class Scheduler {
 
         return ExecutionMode.fromString(executionMode);
     }
-    public static HostDescription pickaHost(AiravataAPI api, String serviceName) throws AiravataAPIInvocationException {
-        List<HostDescription> registeredHosts = new ArrayList<HostDescription>();
-        Map<String, ApplicationDescription> applicationDescriptors = api.getApplicationManager().getApplicationDescriptors(serviceName);
-        for (String hostDescName : applicationDescriptors.keySet()) {
-            registeredHosts.add(api.getApplicationManager().getHostDescription(hostDescName));
-        }
-        return scheduleHost(registeredHosts);
-    }
 
     private static HostDescription scheduleHost(List<HostDescription> registeredHosts) {
         //todo implement an algorithm to pick a host among different hosts, ideally this could be configurable in an xml

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
----------------------------------------------------------------------
diff --git 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
index c4229be..fe498ab 100644
--- 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
@@ -32,7 +32,6 @@ import javax.xml.xpath.XPathExpressionException;
 
 import org.airavata.appcatalog.cpi.AppCatalog;
 import org.apache.aiaravata.application.catalog.data.impl.AppCatalogFactory;
-import org.apache.airavata.client.api.AiravataAPI;
 import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.utils.AiravataZKUtils;
 import org.apache.airavata.common.utils.MonitorPublisher;
@@ -82,7 +81,6 @@ import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManager;
 import org.apache.airavata.model.appcatalog.computeresource.SSHJobSubmission;
 import org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference;
 import org.apache.airavata.model.workspace.experiment.*;
-import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.registry.cpi.Registry;
 import org.apache.airavata.registry.cpi.RegistryModelType;
 import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
@@ -109,14 +107,14 @@ import org.xml.sax.SAXException;
  * the resource, required data for the job has to be stored in registry prior to invoke this object.
  */
 public class BetterGfacImpl implements GFac,Watcher {
-    private static final Logger log = LoggerFactory.getLogger(GFacImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(BetterGfacImpl.class);
     public static final String ERROR_SENT = "ErrorSent";
 
     private Registry registry;
 
-    private AiravataAPI airavataAPI;
+//    private AiravataAPI airavataAPI;
 
-    private AiravataRegistry2 airavataRegistry2;
+//    private AiravataRegistry2 airavataRegistry2;
 
     private ZooKeeper zk;                       // we are not storing zk instance in to jobExecution context
 
@@ -136,15 +134,13 @@ public class BetterGfacImpl implements GFac,Watcher {
      * Constructor for GFac
      *
      * @param registry
-     * @param airavataAPI
-     * @param airavataRegistry2
      * @param zooKeeper
      */
-    public BetterGfacImpl(Registry registry, AiravataAPI airavataAPI, AiravataRegistry2 airavataRegistry2, ZooKeeper zooKeeper,
+    public BetterGfacImpl(Registry registry, ZooKeeper zooKeeper,
                           MonitorPublisher publisher) {
         this.registry = registry;
-        this.airavataAPI = airavataAPI;
-        this.airavataRegistry2 = airavataRegistry2;
+//        this.airavataAPI = airavataAPI;
+//        this.airavataRegistry2 = airavataRegistry2;
         monitorPublisher = publisher;     // This is a EventBus common for gfac
         this.zk = zooKeeper;
     }
@@ -173,7 +169,7 @@ public class BetterGfacImpl implements GFac,Watcher {
 
     public static void startDaemonHandlers() {
         List<GFacHandlerConfig> daemonHandlerConfig = null;
-        URL resource = GFacImpl.class.getClassLoader().getResource(org.apache.airavata.common.utils.Constants.GFAC_CONFIG_XML);
+        URL resource = BetterGfacImpl.class.getClassLoader().getResource(org.apache.airavata.common.utils.Constants.GFAC_CONFIG_XML);
         gfacConfigFile = new File(resource.getPath());
         try {
             daemonHandlerConfig = GFacConfiguration.getDaemonHandlers(gfacConfigFile);
@@ -447,9 +443,9 @@ public class BetterGfacImpl implements GFac,Watcher {
             log.warn("Missing gateway resource profile for gateway id '" + gatewayID + "'.");
         }
 
-        URL resource = GFacImpl.class.getClassLoader().getResource(org.apache.airavata.common.utils.Constants.GFAC_CONFIG_XML);
+        URL resource = BetterGfacImpl.class.getClassLoader().getResource(org.apache.airavata.common.utils.Constants.GFAC_CONFIG_XML);
         Properties configurationProperties = ServerSettings.getProperties();
-        GFacConfiguration gFacConfiguration = GFacConfiguration.create(new File(resource.getPath()), airavataAPI, configurationProperties);
+        GFacConfiguration gFacConfiguration = GFacConfiguration.create(new File(resource.getPath()), configurationProperties);
 
         // start constructing jobexecutioncontext
         jobExecutionContext = new JobExecutionContext(gFacConfiguration, applicationInterfaceId);
@@ -1128,13 +1124,13 @@ public class BetterGfacImpl implements GFac,Watcher {
         BetterGfacImpl.monitorPublisher = monitorPublisher;
     }
 
-    public AiravataAPI getAiravataAPI() {
-        return airavataAPI;
-    }
+//    public AiravataAPI getAiravataAPI() {
+//        return airavataAPI;
+//    }
 
-    public AiravataRegistry2 getAiravataRegistry2() {
-        return airavataRegistry2;
-    }
+//    public AiravataRegistry2 getAiravataRegistry2() {
+//        return airavataRegistry2;
+//    }
 
     public static List<ThreadedHandler> getDaemonHandlers() {
         return daemonHandlers;


Mime
View raw message