You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2014/08/22 22:10:23 UTC
[2/3] adding more to AIRAVATA-1234
http://git-wip-us.apache.org/repos/asf/airavata/blob/98f41101/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ApplicationManagerImpl.java
----------------------------------------------------------------------
diff --git a/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ApplicationManagerImpl.java b/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ApplicationManagerImpl.java
index 804ca40..f962bfb 100644
--- a/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ApplicationManagerImpl.java
+++ b/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ApplicationManagerImpl.java
@@ -21,21 +21,16 @@
package org.apache.airavata.client.impl;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.apache.airavata.client.AiravataClient;
import org.apache.airavata.client.api.ApplicationManager;
import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
import org.apache.airavata.client.api.exception.DescriptorAlreadyExistsException;
-import org.apache.airavata.common.exception.AiravataConfigurationException;
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.registry.api.exception.RegException;
-import org.apache.airavata.registry.api.exception.UnimplementedRegOperationException;
+
+import java.util.List;
+import java.util.Map;
public class ApplicationManagerImpl implements ApplicationManager {
private AiravataClient client;
@@ -47,121 +42,126 @@ public class ApplicationManagerImpl implements ApplicationManager {
@Override
public ServiceDescription getServiceDescription(String serviceId)
throws AiravataAPIInvocationException {
- try {
- ServiceDescription desc = getClient().getRegistryClient().getServiceDescriptor(serviceId);
- if(desc!=null){
- return desc;
- }
-// throw new AiravataAPIInvocationException(new Exception("Service Description not found in registry."));
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
+// try {
+// ServiceDescription desc = getClient().getRegistryClient().getServiceDescriptor(serviceId);
+// if(desc!=null){
+// return desc;
+// }
+//// throw new AiravataAPIInvocationException(new Exception("Service Description not found in registry."));
+// } catch (Exception e) {
+// throw new AiravataAPIInvocationException(e);
+// }
return null;
}
@Override
public List<ServiceDescription> getAllServiceDescriptions()
throws AiravataAPIInvocationException {
- try {
- return getClient().getRegistryClient().getServiceDescriptors();
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
+// try {
+// return getClient().getRegistryClient().getServiceDescriptors();
+// } catch (Exception e) {
+// throw new AiravataAPIInvocationException(e);
+// }
+ return null;
}
@Override
public String saveServiceDescription(ServiceDescription service)
throws AiravataAPIInvocationException {
- try {
- if (getClient().getRegistryClient().isServiceDescriptorExists(service.getType().getName())) {
- getClient().getRegistryClient().updateServiceDescriptor(service);
- }else{
- getClient().getRegistryClient().addServiceDescriptor(service);
- }
- return service.getType().getName();
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
+// try {
+// if (getClient().getRegistryClient().isServiceDescriptorExists(service.getType().getName())) {
+// getClient().getRegistryClient().updateServiceDescriptor(service);
+// }else{
+// getClient().getRegistryClient().addServiceDescriptor(service);
+// }
+// return service.getType().getName();
+// } catch (Exception e) {
+// throw new AiravataAPIInvocationException(e);
+// }
+ return null;
}
@Override
public void addServiceDescription(ServiceDescription serviceDescription) throws DescriptorAlreadyExistsException,
AiravataAPIInvocationException{
- try {
- getClient().getRegistryClient().addServiceDescriptor(serviceDescription);
- } catch (org.apache.airavata.registry.api.exception.gateway.DescriptorAlreadyExistsException e) {
- throw new DescriptorAlreadyExistsException("Service descriptor "
- + serviceDescription.getType().getName()
- + " already exists.", e);
- } catch (RegException e) {
- throw new AiravataAPIInvocationException("An internal error occurred while trying to add service descriptor"
- + serviceDescription.getType().getName(),
- e);
- } catch (AiravataConfigurationException e) {
- throw new AiravataAPIInvocationException("Error retrieving registry controller. " +
- "An error occurred while trying to " +
- "add service descriptor" + serviceDescription.getType().getName(), e);
- }
+// try {
+// getClient().getRegistryClient().addServiceDescriptor(serviceDescription);
+// } catch (org.apache.airavata.registry.api.exception.gateway.DescriptorAlreadyExistsException e) {
+// throw new DescriptorAlreadyExistsException("Service descriptor "
+// + serviceDescription.getType().getName()
+// + " already exists.", e);
+// } catch (RegException e) {
+// throw new AiravataAPIInvocationException("An internal error occurred while trying to add service descriptor"
+// + serviceDescription.getType().getName(),
+// e);
+// } catch (AiravataConfigurationException e) {
+// throw new AiravataAPIInvocationException("Error retrieving registry controller. " +
+// "An error occurred while trying to " +
+// "add service descriptor" + serviceDescription.getType().getName(), e);
+// }
}
@Override
public void updateServiceDescription(ServiceDescription serviceDescription) throws AiravataAPIInvocationException {
- try {
- getClient().getRegistryClient().updateServiceDescriptor(serviceDescription);
- } catch (RegException e) {
- throw new AiravataAPIInvocationException("An internal error occurred while trying to add service descriptor"
- + serviceDescription.getType().getName(),
- e);
- } catch (AiravataConfigurationException e) {
- throw new AiravataAPIInvocationException("Error retrieving registry controller. " +
- "An error occurred while trying to " +
- "add service descriptor" + serviceDescription.getType().getName(), e);
- }
+// try {
+// getClient().getRegistryClient().updateServiceDescriptor(serviceDescription);
+// } catch (RegException e) {
+// throw new AiravataAPIInvocationException("An internal error occurred while trying to add service descriptor"
+// + serviceDescription.getType().getName(),
+// e);
+// } catch (AiravataConfigurationException e) {
+// throw new AiravataAPIInvocationException("Error retrieving registry controller. " +
+// "An error occurred while trying to " +
+// "add service descriptor" + serviceDescription.getType().getName(), e);
+// }
}
@Override
public void deleteServiceDescription(String serviceId)
throws AiravataAPIInvocationException {
- try {
- getClient().getRegistryClient().removeServiceDescriptor(serviceId);
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
+// try {
+// getClient().getRegistryClient().removeServiceDescriptor(serviceId);
+// } catch (Exception e) {
+// throw new AiravataAPIInvocationException(e);
+// }
}
@Override
public List<ServiceDescription> searchServiceDescription(String nameRegEx)
throws AiravataAPIInvocationException {
- throw new AiravataAPIInvocationException(new UnimplementedRegOperationException());
+// throw new AiravataAPIInvocationException(new UnimplementedRegOperationException());
+ return null;
}
@Override
public ApplicationDescription getApplicationDescription(
String serviceId, String hostId)
throws AiravataAPIInvocationException {
- try {
- return getClient().getRegistryClient().getApplicationDescriptors(serviceId, hostId);
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
+// try {
+// return getClient().getRegistryClient().getApplicationDescriptors(serviceId, hostId);
+// } catch (Exception e) {
+// throw new AiravataAPIInvocationException(e);
+// }
+ return null;
}
@Override
public String saveApplicationDescription(String serviceId, String hostId,
ApplicationDescription app)
throws AiravataAPIInvocationException {
- try {
- if (getClient().getRegistryClient().isApplicationDescriptorExists(serviceId, hostId, app.getType().getApplicationName().getStringValue())) {
- getClient().getRegistryClient().updateApplicationDescriptor(serviceId, hostId, app);
- }else{
- getClient().getRegistryClient().addApplicationDescriptor(serviceId, hostId, app);
- }
- return app.getType().getApplicationName().getStringValue();
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
+// try {
+// if (getClient().getRegistryClient().isApplicationDescriptorExists(serviceId, hostId, app.getType().getApplicationName().getStringValue())) {
+// getClient().getRegistryClient().updateApplicationDescriptor(serviceId, hostId, app);
+// }else{
+// getClient().getRegistryClient().addApplicationDescriptor(serviceId, hostId, app);
+// }
+// return app.getType().getApplicationName().getStringValue();
+// } catch (Exception e) {
+// throw new AiravataAPIInvocationException(e);
+// }
+ return null;
}
@@ -170,30 +170,30 @@ public class ApplicationManagerImpl implements ApplicationManager {
ApplicationDescription applicationDeploymentDescription)
throws DescriptorAlreadyExistsException, AiravataAPIInvocationException{
- try {
- getClient().getRegistryClient().addApplicationDescriptor(serviceDescription.getType().getName(),
- hostDescription.getType().getHostName(), applicationDeploymentDescription);
- } catch (org.apache.airavata.registry.api.exception.gateway.DescriptorAlreadyExistsException e) {
- throw new DescriptorAlreadyExistsException("Application descriptor " +
- applicationDeploymentDescription.getType().getApplicationName().getStringValue()
- + " already associated to host " + hostDescription.getType().getHostName()
- + " and service " + serviceDescription.getType().getName(), e);
- } catch (RegException e) {
-
- throw new AiravataAPIInvocationException("An internal error occurred while trying to add " +
- "application descriptor " +
- applicationDeploymentDescription.getType().getApplicationName().getStringValue()
- + " associated to host " + hostDescription.getType().getHostName()
- + " and service " + serviceDescription.getType().getName(), e);
-
- } catch (AiravataConfigurationException e) {
-
- throw new AiravataAPIInvocationException("Error retrieving registry controller. " +
- "An error occurred while trying to add application descriptor " +
- applicationDeploymentDescription.getType().getApplicationName().getStringValue()
- + " associated to host " + hostDescription.getType().getHostName()
- + " and service " + serviceDescription.getType().getName(), e);
- }
+// try {
+// getClient().getRegistryClient().addApplicationDescriptor(serviceDescription.getType().getName(),
+// hostDescription.getType().getHostName(), applicationDeploymentDescription);
+// } catch (org.apache.airavata.registry.api.exception.gateway.DescriptorAlreadyExistsException e) {
+// throw new DescriptorAlreadyExistsException("Application descriptor " +
+// applicationDeploymentDescription.getType().getApplicationName().getStringValue()
+// + " already associated to host " + hostDescription.getType().getHostName()
+// + " and service " + serviceDescription.getType().getName(), e);
+// } catch (RegException e) {
+//
+// throw new AiravataAPIInvocationException("An internal error occurred while trying to add " +
+// "application descriptor " +
+// applicationDeploymentDescription.getType().getApplicationName().getStringValue()
+// + " associated to host " + hostDescription.getType().getHostName()
+// + " and service " + serviceDescription.getType().getName(), e);
+//
+// } catch (AiravataConfigurationException e) {
+//
+// throw new AiravataAPIInvocationException("Error retrieving registry controller. " +
+// "An error occurred while trying to add application descriptor " +
+// applicationDeploymentDescription.getType().getApplicationName().getStringValue()
+// + " associated to host " + hostDescription.getType().getHostName()
+// + " and service " + serviceDescription.getType().getName(), e);
+// }
}
@@ -201,25 +201,25 @@ public class ApplicationManagerImpl implements ApplicationManager {
public void updateApplicationDescription(ServiceDescription serviceDescription, HostDescription hostDescription,
ApplicationDescription applicationDeploymentDescription)
throws AiravataAPIInvocationException {
- try {
- getClient().getRegistryClient().updateApplicationDescriptor(serviceDescription.getType().getName(),
- hostDescription.getType().getHostName(), applicationDeploymentDescription);
- } catch (RegException e) {
-
- throw new AiravataAPIInvocationException("An internal error occurred while trying to add " +
- "application descriptor " +
- applicationDeploymentDescription.getType().getApplicationName().getStringValue()
- + " associated to host " + hostDescription.getType().getHostName()
- + " and service " + serviceDescription.getType().getName(), e);
-
- } catch (AiravataConfigurationException e) {
-
- throw new AiravataAPIInvocationException("Error retrieving registry controller. " +
- "An error occurred while trying to add application descriptor " +
- applicationDeploymentDescription.getType().getApplicationName().getStringValue()
- + " associated to host " + hostDescription.getType().getHostName()
- + " and service " + serviceDescription.getType().getName(), e);
- }
+// try {
+// getClient().getRegistryClient().updateApplicationDescriptor(serviceDescription.getType().getName(),
+// hostDescription.getType().getHostName(), applicationDeploymentDescription);
+// } catch (RegException e) {
+//
+// throw new AiravataAPIInvocationException("An internal error occurred while trying to add " +
+// "application descriptor " +
+// applicationDeploymentDescription.getType().getApplicationName().getStringValue()
+// + " associated to host " + hostDescription.getType().getHostName()
+// + " and service " + serviceDescription.getType().getName(), e);
+//
+// } catch (AiravataConfigurationException e) {
+//
+// throw new AiravataAPIInvocationException("Error retrieving registry controller. " +
+// "An error occurred while trying to add application descriptor " +
+// applicationDeploymentDescription.getType().getApplicationName().getStringValue()
+// + " associated to host " + hostDescription.getType().getHostName()
+// + " and service " + serviceDescription.getType().getName(), e);
+// }
}
@@ -227,237 +227,251 @@ public class ApplicationManagerImpl implements ApplicationManager {
public List<ApplicationDescription> searchApplicationDescription(
String serviceName, String hostName)
throws AiravataAPIInvocationException {
- throw new AiravataAPIInvocationException(new UnimplementedRegOperationException());
+// throw new AiravataAPIInvocationException(new UnimplementedRegOperationException());
+ return null;
}
@Override
public Map<String[], ApplicationDescription> getAllApplicationDescriptions()
throws AiravataAPIInvocationException {
- try {
- return getClient().getRegistryClient().getApplicationDescriptors();
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
+// try {
+// return getClient().getRegistryClient().getApplicationDescriptors();
+// } catch (Exception e) {
+// throw new AiravataAPIInvocationException(e);
+// }
+ return null;
}
@Override
public List<ApplicationDescription> searchApplicationDescription(
String serviceName, String hostName, String applicationName)
throws AiravataAPIInvocationException {
- throw new AiravataAPIInvocationException(new UnimplementedRegOperationException());
+// throw new AiravataAPIInvocationException(new UnimplementedRegOperationException());
+ return null;
}
@Override
public Map<HostDescription, List<ApplicationDescription>> searchApplicationDescription(
String serviceName) throws AiravataAPIInvocationException {
- try {
- Map<HostDescription, List<ApplicationDescription>> map=new HashMap<HostDescription, List<ApplicationDescription>>();
- Map<String, ApplicationDescription> applicationDescriptors = getClient().getRegistryClient().getApplicationDescriptors(serviceName);
- for (String hostName : applicationDescriptors.keySet()) {
- ArrayList<ApplicationDescription> list = new ArrayList<ApplicationDescription>();
- list.add(applicationDescriptors.get(hostName));
- map.put(getClient().getRegistryClient().getHostDescriptor(hostName),list);
- }
- return map;
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
+// try {
+// Map<HostDescription, List<ApplicationDescription>> map=new HashMap<HostDescription, List<ApplicationDescription>>();
+// Map<String, ApplicationDescription> applicationDescriptors = getClient().getRegistryClient().getApplicationDescriptors(serviceName);
+// for (String hostName : applicationDescriptors.keySet()) {
+// ArrayList<ApplicationDescription> list = new ArrayList<ApplicationDescription>();
+// list.add(applicationDescriptors.get(hostName));
+// map.put(getClient().getRegistryClient().getHostDescriptor(hostName),list);
+// }
+// return map;
+// } catch (Exception e) {
+// throw new AiravataAPIInvocationException(e);
+// }
+ return null;
}
@Override
public void deleteApplicationDescription(String serviceName,
String hostName, String applicationName)
throws AiravataAPIInvocationException {
- try {
- getClient().getRegistryClient().removeApplicationDescriptor(serviceName, hostName, applicationName);
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
+// try {
+// getClient().getRegistryClient().removeApplicationDescriptor(serviceName, hostName, applicationName);
+// } catch (Exception e) {
+// throw new AiravataAPIInvocationException(e);
+// }
+
}
@Override
public HostDescription getHostDescription(String hostId)
throws AiravataAPIInvocationException {
- try {
- return getClient().getRegistryClient().getHostDescriptor(hostId);
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
+// try {
+// return getClient().getRegistryClient().getHostDescriptor(hostId);
+// } catch (Exception e) {
+// throw new AiravataAPIInvocationException(e);
+// }
+ return null;
}
@Override
public List<HostDescription> getAllHostDescriptions()
throws AiravataAPIInvocationException {
- try {
- return getClient().getRegistryClient().getHostDescriptors();
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
+// try {
+// return getClient().getRegistryClient().getHostDescriptors();
+// } catch (Exception e) {
+// throw new AiravataAPIInvocationException(e);
+// }
+ return null;
}
@Override
public String saveHostDescription(HostDescription host)
throws AiravataAPIInvocationException {
- try {
- if (getClient().getRegistryClient().isHostDescriptorExists(host.getType().getHostName())) {
- getClient().getRegistryClient().updateHostDescriptor(host);
- }else{
- getClient().getRegistryClient().addHostDescriptor(host);
- }
- return host.getType().getHostName();
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
+// try {
+// if (getClient().getRegistryClient().isHostDescriptorExists(host.getType().getHostName())) {
+// getClient().getRegistryClient().updateHostDescriptor(host);
+// }else{
+// getClient().getRegistryClient().addHostDescriptor(host);
+// }
+// return host.getType().getHostName();
+// } catch (Exception e) {
+// throw new AiravataAPIInvocationException(e);
+// }
+ return null;
}
@Override
public void addHostDescription(HostDescription host) throws DescriptorAlreadyExistsException,
AiravataAPIInvocationException{
- try {
- getClient().getRegistryClient().addHostDescriptor(host);
- } catch (org.apache.airavata.registry.api.exception.gateway.DescriptorAlreadyExistsException e) {
- throw new DescriptorAlreadyExistsException("Host descriptor " + host.getType().getHostName()
- + " already exists.", e);
- } catch (RegException e) {
- throw new AiravataAPIInvocationException("An internal error occurred while trying to add host descriptor"
- + host.getType().getHostName(),
- e);
- } catch (AiravataConfigurationException e) {
- throw new AiravataAPIInvocationException("Error retrieving registry controller. " +
- "An error occurred while trying to " +
- "add host descriptor" + host.getType().getHostName(), e);
- }
+// try {
+// getClient().getRegistryClient().addHostDescriptor(host);
+// } catch (org.apache.airavata.registry.api.exception.gateway.DescriptorAlreadyExistsException e) {
+// throw new DescriptorAlreadyExistsException("Host descriptor " + host.getType().getHostName()
+// + " already exists.", e);
+// } catch (RegException e) {
+// throw new AiravataAPIInvocationException("An internal error occurred while trying to add host descriptor"
+// + host.getType().getHostName(),
+// e);
+// } catch (AiravataConfigurationException e) {
+// throw new AiravataAPIInvocationException("Error retrieving registry controller. " +
+// "An error occurred while trying to " +
+// "add host descriptor" + host.getType().getHostName(), e);
+// }
}
@Override
public void updateHostDescription(HostDescription host) throws AiravataAPIInvocationException {
- try {
- getClient().getRegistryClient().updateHostDescriptor(host);
- } catch (RegException e) {
- throw new AiravataAPIInvocationException("An internal error occurred while trying to add host descriptor"
- + host.getType().getHostName(),
- e);
- } catch (AiravataConfigurationException e) {
- throw new AiravataAPIInvocationException("Error retrieving registry controller. " +
- "An error occurred while trying to " +
- "add host descriptor" + host.getType().getHostName(), e);
- }
+// try {
+// getClient().getRegistryClient().updateHostDescriptor(host);
+// } catch (RegException e) {
+// throw new AiravataAPIInvocationException("An internal error occurred while trying to add host descriptor"
+// + host.getType().getHostName(),
+// e);
+// } catch (AiravataConfigurationException e) {
+// throw new AiravataAPIInvocationException("Error retrieving registry controller. " +
+// "An error occurred while trying to " +
+// "add host descriptor" + host.getType().getHostName(), e);
+// }
}
@Override
public List<HostDescription> searchHostDescription(String regExName)
throws AiravataAPIInvocationException {
- throw new AiravataAPIInvocationException(new UnimplementedRegOperationException());
+// throw new AiravataAPIInvocationException(new UnimplementedRegOperationException());
+ return null;
}
@Override
public void deleteHostDescription(String hostId)
throws AiravataAPIInvocationException {
- try {
- getClient().getRegistryClient().removeHostDescriptor(hostId);
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
+// try {
+// getClient().getRegistryClient().removeHostDescriptor(hostId);
+// } catch (Exception e) {
+// throw new AiravataAPIInvocationException(e);
+// }
}
@Override
public boolean deployServiceOnHost(String serviceName, String hostName)
throws AiravataAPIInvocationException {
- throw new AiravataAPIInvocationException(new UnimplementedRegOperationException());
- }
+// throw new AiravataAPIInvocationException(new UnimplementedRegOperationException());
+ return false;
+ }
@Override
public Map<String, ApplicationDescription> getApplicationDescriptors(String serviceName) throws AiravataAPIInvocationException {
- try{
- Map<String, ApplicationDescription> applicationDescriptors = getClient().getRegistryClient().getApplicationDescriptors(serviceName);
- return applicationDescriptors;
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
+// try{
+// Map<String, ApplicationDescription> applicationDescriptors = getClient().getRegistryClient().getApplicationDescriptors(serviceName);
+// return applicationDescriptors;
+// } catch (Exception e) {
+// throw new AiravataAPIInvocationException(e);
+// }
+ return null;
}
@Override
public boolean isHostDescriptorExists(String descriptorName) throws AiravataAPIInvocationException {
- try {
- return getClient().getRegistryClient().isHostDescriptorExists(descriptorName);
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
+// try {
+// return getClient().getRegistryClient().isHostDescriptorExists(descriptorName);
+// } catch (Exception e) {
+// throw new AiravataAPIInvocationException(e);
+// }
+ return false;
}
@Override
public void removeHostDescriptor(String hostName) throws AiravataAPIInvocationException {
- try {
- getClient().getRegistryClient().removeHostDescriptor(hostName);
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
+// try {
+// getClient().getRegistryClient().removeHostDescriptor(hostName);
+// } catch (Exception e) {
+// throw new AiravataAPIInvocationException(e);
+// }
}
@Override
public boolean isServiceDescriptorExists(String descriptorName) throws AiravataAPIInvocationException {
- try {
- return getClient().getRegistryClient().isServiceDescriptorExists(descriptorName);
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
+// try {
+// return getClient().getRegistryClient().isServiceDescriptorExists(descriptorName);
+// } catch (Exception e) {
+// throw new AiravataAPIInvocationException(e);
+// }
+ return false;
}
@Override
public void removeServiceDescriptor(String serviceName) throws AiravataAPIInvocationException {
- try {
- getClient().getRegistryClient().removeServiceDescriptor(serviceName);
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
+// try {
+// getClient().getRegistryClient().removeServiceDescriptor(serviceName);
+// } catch (Exception e) {
+// throw new AiravataAPIInvocationException(e);
+// }
}
@Override
public void removeApplicationDescriptor(String serviceName, String hostName, String applicationName) throws AiravataAPIInvocationException {
- try {
- getClient().getRegistryClient().removeApplicationDescriptor(serviceName, hostName, applicationName);
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
+// try {
+// getClient().getRegistryClient().removeApplicationDescriptor(serviceName, hostName, applicationName);
+// } catch (Exception e) {
+// throw new AiravataAPIInvocationException(e);
+// }
}
@Override
public void updateHostDescriptor(HostDescription descriptor) throws AiravataAPIInvocationException {
- try {
- getClient().getRegistryClient().updateHostDescriptor(descriptor);
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
+// try {
+// getClient().getRegistryClient().updateHostDescriptor(descriptor);
+// } catch (Exception e) {
+// throw new AiravataAPIInvocationException(e);
+// }
}
@Override
public void updateServiceDescriptor(ServiceDescription descriptor) throws AiravataAPIInvocationException {
- try {
- getClient().getRegistryClient().updateServiceDescriptor(descriptor);
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
+// try {
+// getClient().getRegistryClient().updateServiceDescriptor(descriptor);
+// } catch (Exception e) {
+// throw new AiravataAPIInvocationException(e);
+// }
}
@Override
public void updateApplicationDescriptor(String serviceName, String hostName, ApplicationDescription descriptor) throws AiravataAPIInvocationException {
- try {
- getClient().getRegistryClient().updateApplicationDescriptor(serviceName, hostName, descriptor);
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
+// try {
+// getClient().getRegistryClient().updateApplicationDescriptor(serviceName, hostName, descriptor);
+// } catch (Exception e) {
+// throw new AiravataAPIInvocationException(e);
+// }
}
@Override
public ApplicationDescription getApplicationDescriptor(String serviceName, String hostname, String applicationName) throws AiravataAPIInvocationException {
- try {
- return getClient().getRegistryClient().getApplicationDescriptor(serviceName, hostname, applicationName);
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
+// try {
+// return getClient().getRegistryClient().getApplicationDescriptor(serviceName, hostname, applicationName);
+// } catch (Exception e) {
+// throw new AiravataAPIInvocationException(e);
+// }
+ return null;
}
public AiravataClient getClient() {
@@ -472,11 +486,12 @@ public class ApplicationManagerImpl implements ApplicationManager {
public boolean isApplicationDescriptorExists(String serviceName,
String hostName, String descriptorName)
throws AiravataAPIInvocationException {
- try {
- return getClient().getRegistryClient().isApplicationDescriptorExists(serviceName, hostName, descriptorName);
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
+// try {
+// return getClient().getRegistryClient().isApplicationDescriptorExists(serviceName, hostName, descriptorName);
+// } catch (Exception e) {
+// throw new AiravataAPIInvocationException(e);
+// }
+ return false;
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/98f41101/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/CredentialStoreManagerImpl.java
----------------------------------------------------------------------
diff --git a/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/CredentialStoreManagerImpl.java b/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/CredentialStoreManagerImpl.java
index ae4b929..d8d090b 100644
--- a/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/CredentialStoreManagerImpl.java
+++ b/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/CredentialStoreManagerImpl.java
@@ -35,41 +35,45 @@ public class CredentialStoreManagerImpl implements CredentialStoreManager{
@Override
public boolean isCredentialExist(String gatewayId, String tokenId) throws AiravataAPIInvocationException {
- if(gatewayId==null || gatewayId.isEmpty() || tokenId == null || tokenId.isEmpty()) {
- return false;
- }
- try {
- return client.getRegistryClient().isCredentialExist(gatewayId, tokenId);
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
+// if(gatewayId==null || gatewayId.isEmpty() || tokenId == null || tokenId.isEmpty()) {
+// return false;
+// }
+// try {
+// return client.getRegistryClient().isCredentialExist(gatewayId, tokenId);
+// } catch (Exception e) {
+// throw new AiravataAPIInvocationException(e);
+// }
+ return false;
}
@Override
public String getCredentialPublicKey(String gatewayId, String tokenId) throws AiravataAPIInvocationException {
- try {
- return client.getRegistryClient().getCredentialPublicKey(gatewayId, tokenId);
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
+// try {
+// return client.getRegistryClient().getCredentialPublicKey(gatewayId, tokenId);
+// } catch (Exception e) {
+// throw new AiravataAPIInvocationException(e);
+// }
+ return null;
}
@Override
public String createCredential(String gatewayId, String tokenId) throws AiravataAPIInvocationException {
- try {
- return client.getRegistryClient().createCredential(gatewayId, tokenId);
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
+// try {
+// return client.getRegistryClient().createCredential(gatewayId, tokenId);
+// } catch (Exception e) {
+// throw new AiravataAPIInvocationException(e);
+// }
+ return null;
}
@Override
public String createCredential(String gatewayId, String tokenId, String username) throws AiravataAPIInvocationException {
- try {
- return client.getRegistryClient().createCredential(gatewayId, tokenId, username);
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
+// try {
+// return client.getRegistryClient().createCredential(gatewayId, tokenId, username);
+// } catch (Exception e) {
+// throw new AiravataAPIInvocationException(e);
+// }
+ return null;
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/98f41101/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java
----------------------------------------------------------------------
diff --git a/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java b/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java
index ad920bc..2241d18 100644
--- a/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java
+++ b/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java
@@ -21,15 +21,6 @@
package org.apache.airavata.client.impl;
-import java.net.URISyntaxException;
-import java.rmi.RemoteException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-import java.util.UUID;
-
-import javax.xml.stream.XMLStreamException;
-
import org.apache.airavata.client.AiravataAPIUtils;
import org.apache.airavata.client.AiravataClient;
import org.apache.airavata.client.api.ExecutionManager;
@@ -39,27 +30,20 @@ import org.apache.airavata.client.stub.interpretor.NameValue;
import org.apache.airavata.client.stub.interpretor.WorkflowInterpretorStub;
import org.apache.airavata.common.utils.XMLUtil;
import org.apache.airavata.common.workflow.execution.context.WorkflowContextHeaderBuilder;
-import org.apache.airavata.registry.api.ExecutionErrors.Source;
-import org.apache.airavata.registry.api.workflow.ApplicationJobExecutionError;
-import org.apache.airavata.registry.api.workflow.ExecutionError;
-import org.apache.airavata.registry.api.workflow.ExperimentExecutionError;
-import org.apache.airavata.registry.api.workflow.NodeExecutionError;
-import org.apache.airavata.registry.api.workflow.WorkflowExecutionError;
-import org.apache.airavata.registry.api.workflow.WorkflowExecutionStatus;
-import org.apache.airavata.registry.api.workflow.WorkflowExecutionStatus.State;
import org.apache.airavata.workflow.model.wf.Workflow;
import org.apache.airavata.workflow.model.wf.WorkflowInput;
-import org.apache.airavata.ws.monitor.EventData;
-import org.apache.airavata.ws.monitor.EventDataListener;
-import org.apache.airavata.ws.monitor.EventDataListenerAdapter;
-import org.apache.airavata.ws.monitor.EventDataRepository;
-import org.apache.airavata.ws.monitor.Monitor;
-import org.apache.airavata.ws.monitor.MonitorConfiguration;
+import org.apache.airavata.ws.monitor.*;
import org.apache.airavata.ws.monitor.MonitorUtil.EventType;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.impl.llom.util.AXIOMUtil;
import org.apache.axis2.AxisFault;
+import javax.xml.stream.XMLStreamException;
+import java.net.URISyntaxException;
+import java.rmi.RemoteException;
+import java.util.Calendar;
+import java.util.List;
+
public class ExecutionManagerImpl implements ExecutionManager {
private AiravataClient client;
@@ -112,26 +96,26 @@ public class ExecutionManagerImpl implements ExecutionManager {
@Override
public void waitForExperimentTermination(String experimentId)
throws AiravataAPIInvocationException {
- Monitor experimentMonitor = getExperimentMonitor(experimentId, new EventDataListenerAdapter() {
- @Override
- public void notify(EventDataRepository eventDataRepo,
- EventData eventData) {
- if (eventData.getType()==EventType.WORKFLOW_TERMINATED){
- getMonitor().stopMonitoring();
- }
- }
- });
- experimentMonitor.startMonitoring();
- try {
- WorkflowExecutionStatus workflowInstanceStatus = getClient().getProvenanceManager().getWorkflowInstanceStatus(experimentId, experimentId);
- if (workflowInstanceStatus.getExecutionStatus()==State.FINISHED || workflowInstanceStatus.getExecutionStatus()==State.FAILED){
- experimentMonitor.stopMonitoring();
- return;
- }
- } catch (AiravataAPIInvocationException e) {
- //Workflow may not have started yet. Best to use the monitor to follow the progress
- }
- experimentMonitor.waitForCompletion();
+// Monitor experimentMonitor = getExperimentMonitor(experimentId, new EventDataListenerAdapter() {
+// @Override
+// public void notify(EventDataRepository eventDataRepo,
+// EventData eventData) {
+// if (eventData.getType()==EventType.WORKFLOW_TERMINATED){
+// getMonitor().stopMonitoring();
+// }
+// }
+// });
+// experimentMonitor.startMonitoring();
+// try {
+// WorkflowExecutionStatus workflowInstanceStatus = getClient().getProvenanceManager().getWorkflowInstanceStatus(experimentId, experimentId);
+// if (workflowInstanceStatus.getExecutionStatus()==State.FINISHED || workflowInstanceStatus.getExecutionStatus()==State.FAILED){
+// experimentMonitor.stopMonitoring();
+// return;
+// }
+// } catch (AiravataAPIInvocationException e) {
+// //Workflow may not have started yet. Best to use the monitor to follow the progress
+// }
+// experimentMonitor.waitForCompletion();
}
@Override
@@ -183,16 +167,17 @@ public class ExecutionManagerImpl implements ExecutionManager {
public void setClient(AiravataClient client) {
this.client = client;
}
+
private String runExperimentGeneral(Workflow workflowObj, List<WorkflowInput> inputs, ExperimentAdvanceOptions options, EventDataListener listener) throws AiravataAPIInvocationException {
- try {
- List<NameValue> inputValues = new ArrayList<NameValue>();
- for (WorkflowInput input : inputs) {
- NameValue nameValue = new NameValue();
- nameValue.setName(input.getName());
- nameValue.setValue(String.valueOf(input.getValue()==null?input.getDefaultValue():input.getValue()));
- inputValues.add(nameValue);
- }
- String workflowString = XMLUtil.xmlElementToString(workflowObj.toXML());
+// try {
+// List<NameValue> inputValues = new ArrayList<NameValue>();
+// for (WorkflowInput input : inputs) {
+// NameValue nameValue = new NameValue();
+// nameValue.setName(input.getName());
+// nameValue.setValue(String.valueOf(input.getValue()==null?input.getDefaultValue():input.getValue()));
+// inputValues.add(nameValue);
+// }
+// String workflowString = XMLUtil.xmlElementToString(workflowObj.toXML());
// List<WSComponentPort> ports = getWSComponentPortInputs(workflowObj);
// for (WorkflowInput input : inputs) {
// WSComponentPort port = getWSComponentPort(input.getName(),
@@ -211,34 +196,35 @@ public class ExecutionManagerImpl implements ExecutionManager {
// }
// inputValues.add(nameValue);
// }
- String experimentID=options.getCustomExperimentId();
- String workflowTemplateName = workflowObj.getName();
- if (experimentID == null || experimentID.isEmpty()) {
- experimentID = workflowTemplateName + "_" + UUID.randomUUID();
- }
- getClient().getProvenanceManager().setWorkflowInstanceTemplateName(experimentID,workflowTemplateName);
-
- //TODO - fix user passing
- String submissionUser = getClient().getUserManager().getAiravataUser();
- String executionUser=options.getExperimentExecutionUser();
- if (executionUser==null){
- executionUser=submissionUser;
- }
- WorkflowContextHeaderBuilder builder = AiravataAPIUtils.createWorkflowContextHeaderBuilder(options, executionUser, submissionUser);
- runPreWorkflowExecutionTasks(experimentID, executionUser, options.getExperimentMetadata(), options.getExperimentName());
- NameValue[] inputVals = inputValues.toArray(new NameValue[] {});
- if (listener!=null){
- getExperimentMonitor(experimentID, listener).startMonitoring();
- }
- launchWorkflow(experimentID, workflowString, inputVals, builder);
- return experimentID;
-// } catch (GraphException e) {
-// throw new AiravataAPIInvocationException(e);
-// } catch (ComponentException e) {
-// throw new AiravataAPIInvocationException(e);
- } catch (Exception e) {
- throw new AiravataAPIInvocationException("Error working with Airavata Registry: " + e.getLocalizedMessage(), e);
- }
+// String experimentID=options.getCustomExperimentId();
+// String workflowTemplateName = workflowObj.getName();
+// if (experimentID == null || experimentID.isEmpty()) {
+// experimentID = workflowTemplateName + "_" + UUID.randomUUID();
+// }
+// getClient().getProvenanceManager().setWorkflowInstanceTemplateName(experimentID,workflowTemplateName);
+//
+// //TODO - fix user passing
+// String submissionUser = getClient().getUserManager().getAiravataUser();
+// String executionUser=options.getExperimentExecutionUser();
+// if (executionUser==null){
+// executionUser=submissionUser;
+// }
+// WorkflowContextHeaderBuilder builder = AiravataAPIUtils.createWorkflowContextHeaderBuilder(options, executionUser, submissionUser);
+// runPreWorkflowExecutionTasks(experimentID, executionUser, options.getExperimentMetadata(), options.getExperimentName());
+// NameValue[] inputVals = inputValues.toArray(new NameValue[] {});
+// if (listener!=null){
+// getExperimentMonitor(experimentID, listener).startMonitoring();
+// }
+// launchWorkflow(experimentID, workflowString, inputVals, builder);
+// return experimentID;
+//// } catch (GraphException e) {
+//// throw new AiravataAPIInvocationException(e);
+//// } catch (ComponentException e) {
+//// throw new AiravataAPIInvocationException(e);
+// } catch (Exception e) {
+// throw new AiravataAPIInvocationException("Error working with Airavata Registry: " + e.getLocalizedMessage(), e);
+// }
+ return null;
}
private Workflow extractWorkflow(String workflowName) throws AiravataAPIInvocationException {
@@ -295,16 +281,17 @@ public class ExecutionManagerImpl implements ExecutionManager {
private void runPreWorkflowExecutionTasks(String experimentId, String user,
String metadata, String experimentName) throws AiravataAPIInvocationException {
- if (user != null) {
- getClient().getProvenanceManager().setExperimentUser(experimentId, user);
- }
- if (metadata != null) {
- getClient().getProvenanceManager().setExperimentMetadata(experimentId, metadata);
- }
- if (experimentName == null) {
- experimentName = experimentId;
- }
- getClient().getProvenanceManager().setExperimentName(experimentId, experimentName);
+// if (user != null) {
+// getClient().getProvenanceManager().setExperimentUser(experimentId, user);
+// }
+// if (metadata != null) {
+// getClient().getProvenanceManager().setExperimentMetadata(experimentId, metadata);
+// }
+// if (experimentName == null) {
+// experimentName = experimentId;
+// }
+// getClient().getProvenanceManager().setExperimentName(experimentId, experimentName);
+
}
public static void main(String[] args) {
@@ -319,111 +306,114 @@ public class ExecutionManagerImpl implements ExecutionManager {
}
}
- @Override
- public List<ExperimentExecutionError> getExperimentExecutionErrors(
- String experimentId) throws AiravataAPIInvocationException {
- try {
- return getClient().getRegistryClient().getExperimentExecutionErrors(experimentId);
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
- }
+// @Override
+// public List<ExperimentExecutionError> getExperimentExecutionErrors(
+// String experimentId) throws AiravataAPIInvocationException {
+//// try {
+//// return getClient().getRegistryClient().getExperimentExecutionErrors(experimentId);
+//// } catch (Exception e) {
+//// throw new AiravataAPIInvocationException(e);
+//// }
+// return null;
+// }
- @Override
- public List<WorkflowExecutionError> getWorkflowExecutionErrors(
- String experimentId, String workflowInstanceId)
- throws AiravataAPIInvocationException {
- try {
- return getClient().getRegistryClient().getWorkflowExecutionErrors(experimentId,
- workflowInstanceId);
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
- }
+// @Override
+// public List<WorkflowExecutionError> getWorkflowExecutionErrors(
+// String experimentId, String workflowInstanceId)
+// throws AiravataAPIInvocationException {
+//// try {
+//// return getClient().getRegistryClient().getWorkflowExecutionErrors(experimentId,
+//// workflowInstanceId);
+//// } catch (Exception e) {
+//// throw new AiravataAPIInvocationException(e);
+//// }
+// return null;
+// }
- @Override
- public List<NodeExecutionError> getNodeExecutionErrors(String experimentId,
- String workflowInstanceId, String nodeId)
- throws AiravataAPIInvocationException {
- try {
- return getClient().getRegistryClient().getNodeExecutionErrors(experimentId,
- workflowInstanceId, nodeId);
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
- }
+// @Override
+// public List<NodeExecutionError> getNodeExecutionErrors(String experimentId,
+// String workflowInstanceId, String nodeId)
+// throws AiravataAPIInvocationException {
+//// try {
+//// return getClient().getRegistryClient().getNodeExecutionErrors(experimentId,
+//// workflowInstanceId, nodeId);
+//// } catch (Exception e) {
+//// throw new AiravataAPIInvocationException(e);
+//// }
+// return null;
+// }
- @Override
- public List<ApplicationJobExecutionError> getApplicationJobErrors(String experimentId,
- String workflowInstanceId, String nodeId, String gfacJobId)
- throws AiravataAPIInvocationException {
- try {
- return getClient().getRegistryClient().getApplicationJobErrors(experimentId,
- workflowInstanceId, nodeId, gfacJobId);
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
- }
+// @Override
+// public List<ApplicationJobExecutionError> getApplicationJobErrors(String experimentId,
+// String workflowInstanceId, String nodeId, String gfacJobId)
+// throws AiravataAPIInvocationException {
+// try {
+// return getClient().getRegistryClient().getApplicationJobErrors(experimentId,
+// workflowInstanceId, nodeId, gfacJobId);
+// } catch (Exception e) {
+// throw new AiravataAPIInvocationException(e);
+// }
+// }
- @Override
- public List<ApplicationJobExecutionError> getApplicationJobErrors(String gfacJobId)
- throws AiravataAPIInvocationException {
- try {
- return getClient().getRegistryClient().getApplicationJobErrors(gfacJobId);
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
- }
+// @Override
+// public List<ApplicationJobExecutionError> getApplicationJobErrors(String gfacJobId)
+// throws AiravataAPIInvocationException {
+// try {
+// return getClient().getRegistryClient().getApplicationJobErrors(gfacJobId);
+// } catch (Exception e) {
+// throw new AiravataAPIInvocationException(e);
+// }
+// }
- @Override
- public List<ExecutionError> getExecutionErrors(String experimentId,
- String workflowInstanceId, String nodeId, String gfacJobId,
- Source... filterBy) throws AiravataAPIInvocationException {
- try {
- return getClient().getRegistryClient().getExecutionErrors(experimentId,
- workflowInstanceId, nodeId, gfacJobId, filterBy);
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
- }
+// @Override
+// public List<ExecutionError> getExecutionErrors(String experimentId,
+// String workflowInstanceId, String nodeId, String gfacJobId,
+// Source... filterBy) throws AiravataAPIInvocationException {
+// try {
+// return getClient().getRegistryClient().getExecutionErrors(experimentId,
+// workflowInstanceId, nodeId, gfacJobId, filterBy);
+// } catch (Exception e) {
+// throw new AiravataAPIInvocationException(e);
+// }
+// }
- @Override
- public int addExperimentError(ExperimentExecutionError error)
- throws AiravataAPIInvocationException {
- try {
- return getClient().getRegistryClient().addExperimentError(error);
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
- }
+// @Override
+// public int addExperimentError(ExperimentExecutionError error)
+// throws AiravataAPIInvocationException {
+// try {
+// return getClient().getRegistryClient().addExperimentError(error);
+// } catch (Exception e) {
+// throw new AiravataAPIInvocationException(e);
+// }
+// }
- @Override
- public int addWorkflowExecutionError(WorkflowExecutionError error)
- throws AiravataAPIInvocationException {
- try {
- return getClient().getRegistryClient().addWorkflowExecutionError(error);
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
- }
+// @Override
+// public int addWorkflowExecutionError(WorkflowExecutionError error)
+// throws AiravataAPIInvocationException {
+// try {
+// return getClient().getRegistryClient().addWorkflowExecutionError(error);
+// } catch (Exception e) {
+// throw new AiravataAPIInvocationException(e);
+// }
+// }
- @Override
- public int addNodeExecutionError(NodeExecutionError error)
- throws AiravataAPIInvocationException {
- try {
- return getClient().getRegistryClient().addNodeExecutionError(error);
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
- }
+// @Override
+// public int addNodeExecutionError(NodeExecutionError error)
+// throws AiravataAPIInvocationException {
+// try {
+// return getClient().getRegistryClient().addNodeExecutionError(error);
+// } catch (Exception e) {
+// throw new AiravataAPIInvocationException(e);
+// }
+// }
- @Override
- public int addApplicationJobExecutionError(ApplicationJobExecutionError error)
- throws AiravataAPIInvocationException {
- try {
- return getClient().getRegistryClient().addApplicationJobExecutionError(error);
- } catch (Exception e) {
- throw new AiravataAPIInvocationException(e);
- }
- }
+// @Override
+// public int addApplicationJobExecutionError(ApplicationJobExecutionError error)
+// throws AiravataAPIInvocationException {
+// try {
+// return getClient().getRegistryClient().addApplicationJobExecutionError(error);
+// } catch (Exception e) {
+// throw new AiravataAPIInvocationException(e);
+// }
+// }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/98f41101/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/PasswordCallBackImpl.java
----------------------------------------------------------------------
diff --git a/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/PasswordCallBackImpl.java b/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/PasswordCallBackImpl.java
index 92981e3..57d83a6 100644
--- a/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/PasswordCallBackImpl.java
+++ b/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/PasswordCallBackImpl.java
@@ -1,39 +1,39 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.client.impl;
-
-import org.apache.airavata.registry.api.PasswordCallback;
-
-public class PasswordCallBackImpl implements PasswordCallback {
- private String username;
- private String password;
-
- public PasswordCallBackImpl(String username, String password){
- this.username = username;
- this.password = password;
- }
-
- @Override
- public String getPassword(String username) {
- return password;
- }
-}
+///*
+// *
+// * Licensed to the Apache Software Foundation (ASF) under one
+// * or more contributor license agreements. See the NOTICE file
+// * distributed with this work for additional information
+// * regarding copyright ownership. The ASF licenses this file
+// * to you under the Apache License, Version 2.0 (the
+// * "License"); you may not use this file except in compliance
+// * with the License. You may obtain a copy of the License at
+// *
+// * http://www.apache.org/licenses/LICENSE-2.0
+// *
+// * Unless required by applicable law or agreed to in writing,
+// * software distributed under the License is distributed on an
+// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// * KIND, either express or implied. See the License for the
+// * specific language governing permissions and limitations
+// * under the License.
+// *
+// */
+//
+//package org.apache.airavata.client.impl;
+//
+//import org.apache.airavata.registry.api.PasswordCallback;
+//
+//public class PasswordCallBackImpl implements PasswordCallback {
+// private String username;
+// private String password;
+//
+// public PasswordCallBackImpl(String username, String password){
+// this.username = username;
+// this.password = password;
+// }
+//
+// @Override
+// public String getPassword(String username) {
+// return password;
+// }
+//}