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 2015/06/05 18:26:18 UTC
[28/30] airavata git commit: registry refactoring changes
http://git-wip-us.apache.org/repos/asf/airavata/blob/4045c094/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ApplicationInterfaceImpl.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ApplicationInterfaceImpl.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ApplicationInterfaceImpl.java
index c830f0a..a113d57 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ApplicationInterfaceImpl.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ApplicationInterfaceImpl.java
@@ -45,7 +45,7 @@ public class ApplicationInterfaceImpl implements ApplicationInterface {
@Override
public String addApplicationModule(ApplicationModule applicationModule, String gatewayId) throws AppCatalogException {
try {
- AppModuleAppCatalogResourceAppCat moduleResource = new AppModuleAppCatalogResourceAppCat();
+ AppModuleResource moduleResource = new AppModuleResource();
moduleResource.setModuleName(applicationModule.getAppModuleName());
moduleResource.setGatewayId(gatewayId);
if (!applicationModule.getAppModuleId().equals("") && !applicationModule.getAppModuleId().equals(applicationInterfaceModelConstants.DEFAULT_ID)){
@@ -67,7 +67,7 @@ public class ApplicationInterfaceImpl implements ApplicationInterface {
@Override
public String addApplicationInterface(ApplicationInterfaceDescription applicationInterfaceDescription, String gatewayId) throws AppCatalogException {
try {
- AppInterfaceAppCatalogResourceAppCat resource = new AppInterfaceAppCatalogResourceAppCat();
+ AppInterfaceResource resource = new AppInterfaceResource();
resource.setAppName(applicationInterfaceDescription.getApplicationName());
if (!applicationInterfaceDescription.getApplicationInterfaceId().equals("") && !applicationInterfaceDescription.getApplicationInterfaceId().equals(applicationInterfaceModelConstants.DEFAULT_ID)){
resource.setInterfaceId(applicationInterfaceDescription.getApplicationInterfaceId());
@@ -82,11 +82,11 @@ public class ApplicationInterfaceImpl implements ApplicationInterface {
List<String> applicationModules = applicationInterfaceDescription.getApplicationModules();
if (applicationModules != null && !applicationModules.isEmpty()){
for (String moduleId : applicationModules){
- AppModuleAppCatalogResourceAppCat appModuleResource = new AppModuleAppCatalogResourceAppCat();
+ AppModuleResource appModuleResource = new AppModuleResource();
AppModuleMappingAppCatalogResourceAppCat moduleMappingResource = new AppModuleMappingAppCatalogResourceAppCat();
moduleMappingResource.setInterfaceId(resource.getInterfaceId());
moduleMappingResource.setModuleId(moduleId);
- moduleMappingResource.setModuleResource((AppModuleAppCatalogResourceAppCat)appModuleResource.get(moduleId));
+ moduleMappingResource.setModuleResource((AppModuleResource)appModuleResource.get(moduleId));
moduleMappingResource.setAppInterfaceResource(resource);
moduleMappingResource.save();
}
@@ -95,7 +95,7 @@ public class ApplicationInterfaceImpl implements ApplicationInterface {
List<InputDataObjectType> applicationInputs = applicationInterfaceDescription.getApplicationInputs();
if (applicationInputs != null && !applicationInputs.isEmpty()){
for (InputDataObjectType input : applicationInputs){
- ApplicationInputAppCatalogResourceAppCat inputResource = new ApplicationInputAppCatalogResourceAppCat();
+ ApplicationInputResource inputResource = new ApplicationInputResource();
inputResource.setAppInterfaceResource(resource);
inputResource.setInterfaceID(resource.getInterfaceId());
inputResource.setUserFriendlyDesc(input.getUserFriendlyDescription());
@@ -115,7 +115,7 @@ public class ApplicationInterfaceImpl implements ApplicationInterface {
List<OutputDataObjectType> applicationOutputs = applicationInterfaceDescription.getApplicationOutputs();
if (applicationOutputs != null && !applicationOutputs.isEmpty()) {
for (OutputDataObjectType output : applicationOutputs) {
- ApplicationOutputAppCatalogResourceAppCat outputResource = new ApplicationOutputAppCatalogResourceAppCat();
+ ApplicationOutputResource outputResource = new ApplicationOutputResource();
outputResource.setInterfaceID(resource.getInterfaceId());
outputResource.setAppInterfaceResource(resource);
outputResource.setOutputKey(output.getName());
@@ -140,13 +140,13 @@ public class ApplicationInterfaceImpl implements ApplicationInterface {
@Override
public void addApplicationModuleMapping(String moduleId, String interfaceId) throws AppCatalogException {
try {
- AppModuleAppCatalogResourceAppCat appModuleResource = new AppModuleAppCatalogResourceAppCat();
- AppInterfaceAppCatalogResourceAppCat interfaceResource = new AppInterfaceAppCatalogResourceAppCat();
+ AppModuleResource appModuleResource = new AppModuleResource();
+ AppInterfaceResource interfaceResource = new AppInterfaceResource();
AppModuleMappingAppCatalogResourceAppCat moduleMappingResource = new AppModuleMappingAppCatalogResourceAppCat();
moduleMappingResource.setInterfaceId(interfaceId);
moduleMappingResource.setModuleId(moduleId);
- moduleMappingResource.setModuleResource((AppModuleAppCatalogResourceAppCat)appModuleResource.get(moduleId));
- moduleMappingResource.setAppInterfaceResource((AppInterfaceAppCatalogResourceAppCat)interfaceResource.get(interfaceId));
+ moduleMappingResource.setModuleResource((AppModuleResource)appModuleResource.get(moduleId));
+ moduleMappingResource.setAppInterfaceResource((AppInterfaceResource)interfaceResource.get(interfaceId));
moduleMappingResource.save();
}catch (Exception e) {
logger.error("Error while saving application module mapping "+moduleId, e);
@@ -157,8 +157,8 @@ public class ApplicationInterfaceImpl implements ApplicationInterface {
@Override
public void updateApplicationModule(String moduleId, ApplicationModule updatedModule) throws AppCatalogException {
try {
- AppModuleAppCatalogResourceAppCat moduleResource = new AppModuleAppCatalogResourceAppCat();
- AppModuleAppCatalogResourceAppCat existingModule = (AppModuleAppCatalogResourceAppCat)moduleResource.get(moduleId);
+ AppModuleResource moduleResource = new AppModuleResource();
+ AppModuleResource existingModule = (AppModuleResource)moduleResource.get(moduleId);
existingModule.setModuleName(updatedModule.getAppModuleName());
existingModule.setModuleDesc(updatedModule.getAppModuleDescription());
existingModule.setModuleVersion(updatedModule.getAppModuleVersion());
@@ -172,8 +172,8 @@ public class ApplicationInterfaceImpl implements ApplicationInterface {
@Override
public void updateApplicationInterface(String interfaceId, ApplicationInterfaceDescription updatedInterface) throws AppCatalogException {
try {
- AppInterfaceAppCatalogResourceAppCat resource = new AppInterfaceAppCatalogResourceAppCat();
- AppInterfaceAppCatalogResourceAppCat existingInterface = (AppInterfaceAppCatalogResourceAppCat) resource.get(interfaceId);
+ AppInterfaceResource resource = new AppInterfaceResource();
+ AppInterfaceResource existingInterface = (AppInterfaceResource) resource.get(interfaceId);
existingInterface.setAppName(updatedInterface.getApplicationName());
existingInterface.setAppDescription(updatedInterface.getApplicationDescription());
existingInterface.save();
@@ -186,7 +186,7 @@ public class ApplicationInterfaceImpl implements ApplicationInterface {
List<String> applicationModules = updatedInterface.getApplicationModules();
if (applicationModules != null && !applicationModules.isEmpty()) {
for (String moduleId : applicationModules) {
- AppModuleAppCatalogResourceAppCat appModuleResource = new AppModuleAppCatalogResourceAppCat();
+ AppModuleResource appModuleResource = new AppModuleResource();
moduleMappingResource = new AppModuleMappingAppCatalogResourceAppCat();
ids = new HashMap<String, String>();
ids.put(AppCatAbstractResource.AppModuleMappingConstants.MODULE_ID, moduleId);
@@ -199,26 +199,26 @@ public class ApplicationInterfaceImpl implements ApplicationInterface {
}
existingMapping.setInterfaceId(interfaceId);
existingMapping.setModuleId(moduleId);
- existingMapping.setModuleResource((AppModuleAppCatalogResourceAppCat) appModuleResource.get(moduleId));
+ existingMapping.setModuleResource((AppModuleResource) appModuleResource.get(moduleId));
existingMapping.setAppInterfaceResource(existingInterface);
existingMapping.save();
}
}
// remove existing application inputs
- ApplicationInputAppCatalogResourceAppCat inputResource = new ApplicationInputAppCatalogResourceAppCat();
+ ApplicationInputResource inputResource = new ApplicationInputResource();
ids = new HashMap<String, String>();
ids.put(AppCatAbstractResource.AppInputConstants.INTERFACE_ID, interfaceId);
inputResource.remove(ids);
List<InputDataObjectType> applicationInputs = updatedInterface.getApplicationInputs();
if (applicationInputs != null && !applicationInputs.isEmpty()) {
for (InputDataObjectType input : applicationInputs) {
- inputResource = new ApplicationInputAppCatalogResourceAppCat();
+ inputResource = new ApplicationInputResource();
ids = new HashMap<String, String>();
ids.put(AppCatAbstractResource.AppInputConstants.INTERFACE_ID, interfaceId);
ids.put(AppCatAbstractResource.AppInputConstants.INPUT_KEY, input.getName());
if (inputResource.isExists(ids)) {
- inputResource = (ApplicationInputAppCatalogResourceAppCat) inputResource.get(ids);
+ inputResource = (ApplicationInputResource) inputResource.get(ids);
}
inputResource.setAppInterfaceResource(existingInterface);
inputResource.setInterfaceID(interfaceId);
@@ -237,19 +237,19 @@ public class ApplicationInterfaceImpl implements ApplicationInterface {
}
// remove existing app outputs before adding
- ApplicationOutputAppCatalogResourceAppCat outputResource = new ApplicationOutputAppCatalogResourceAppCat();
+ ApplicationOutputResource outputResource = new ApplicationOutputResource();
ids = new HashMap<String, String>();
ids.put(AppCatAbstractResource.AppOutputConstants.INTERFACE_ID, interfaceId);
outputResource.remove(ids);
List<OutputDataObjectType> applicationOutputs = updatedInterface.getApplicationOutputs();
if (applicationOutputs != null && !applicationOutputs.isEmpty()) {
for (OutputDataObjectType output : applicationOutputs) {
- outputResource = new ApplicationOutputAppCatalogResourceAppCat();
+ outputResource = new ApplicationOutputResource();
ids = new HashMap<String, String>();
ids.put(AppCatAbstractResource.AppOutputConstants.INTERFACE_ID, interfaceId);
ids.put(AppCatAbstractResource.AppOutputConstants.OUTPUT_KEY, output.getName());
if (outputResource.isExists(ids)) {
- outputResource = (ApplicationOutputAppCatalogResourceAppCat) outputResource.get(ids);
+ outputResource = (ApplicationOutputResource) outputResource.get(ids);
}
outputResource.setInterfaceID(interfaceId);
outputResource.setAppInterfaceResource(existingInterface);
@@ -274,8 +274,8 @@ public class ApplicationInterfaceImpl implements ApplicationInterface {
@Override
public ApplicationModule getApplicationModule(String moduleId) throws AppCatalogException {
try {
- AppModuleAppCatalogResourceAppCat appModuleResource = new AppModuleAppCatalogResourceAppCat();
- return AppCatalogThriftConversion.getApplicationModuleDesc((AppModuleAppCatalogResourceAppCat) appModuleResource.get(moduleId));
+ AppModuleResource appModuleResource = new AppModuleResource();
+ return AppCatalogThriftConversion.getApplicationModuleDesc((AppModuleResource) appModuleResource.get(moduleId));
}catch (Exception e) {
logger.error("Error while retrieving application module "+moduleId, e);
throw new AppCatalogException(e);
@@ -285,8 +285,8 @@ public class ApplicationInterfaceImpl implements ApplicationInterface {
@Override
public ApplicationInterfaceDescription getApplicationInterface(String interfaceId) throws AppCatalogException {
try {
- AppInterfaceAppCatalogResourceAppCat interfaceResource = new AppInterfaceAppCatalogResourceAppCat();
- return AppCatalogThriftConversion.getApplicationInterfaceDescription((AppInterfaceAppCatalogResourceAppCat)interfaceResource.get(interfaceId));
+ AppInterfaceResource interfaceResource = new AppInterfaceResource();
+ return AppCatalogThriftConversion.getApplicationInterfaceDescription((AppInterfaceResource)interfaceResource.get(interfaceId));
}catch (Exception e) {
logger.error("Error while retrieving application interface '"+interfaceId, e);
throw new AppCatalogException(e);
@@ -297,7 +297,7 @@ public class ApplicationInterfaceImpl implements ApplicationInterface {
public List<ApplicationModule> getApplicationModules(Map<String, String> filters) throws AppCatalogException {
List<ApplicationModule> modules = new ArrayList<ApplicationModule>();
try {
- AppModuleAppCatalogResourceAppCat resource = new AppModuleAppCatalogResourceAppCat();
+ AppModuleResource resource = new AppModuleResource();
for (String fieldName : filters.keySet() ){
if (fieldName.equals(AppCatAbstractResource.ApplicationModuleConstants.MODULE_NAME)){
List<AppCatalogResource> resources = resource.get(AppCatAbstractResource.ApplicationModuleConstants.MODULE_NAME, filters.get(fieldName));
@@ -320,7 +320,7 @@ public class ApplicationInterfaceImpl implements ApplicationInterface {
public List<ApplicationModule> getAllApplicationModules(String gatewayId) throws AppCatalogException {
List<ApplicationModule> applicationModules = new ArrayList<ApplicationModule>();
try {
- AppModuleAppCatalogResourceAppCat resource = new AppModuleAppCatalogResourceAppCat();
+ AppModuleResource resource = new AppModuleResource();
resource.setGatewayId(gatewayId);
List<AppCatalogResource> resources = resource.getAll();
if (resources != null && !resources.isEmpty()){
@@ -337,7 +337,7 @@ public class ApplicationInterfaceImpl implements ApplicationInterface {
public List<ApplicationInterfaceDescription> getApplicationInterfaces(Map<String, String> filters) throws AppCatalogException {
List<ApplicationInterfaceDescription> appInterfaces = new ArrayList<ApplicationInterfaceDescription>();
try {
- AppInterfaceAppCatalogResourceAppCat resource = new AppInterfaceAppCatalogResourceAppCat();
+ AppInterfaceResource resource = new AppInterfaceResource();
for (String fieldName : filters.keySet() ){
if (fieldName.equals(AppCatAbstractResource.ApplicationInterfaceConstants.APPLICATION_NAME)){
List<AppCatalogResource> resources = resource.get(AppCatAbstractResource.ApplicationInterfaceConstants.APPLICATION_NAME, filters.get(fieldName));
@@ -357,7 +357,7 @@ public class ApplicationInterfaceImpl implements ApplicationInterface {
@Override
public List<ApplicationInterfaceDescription> getAllApplicationInterfaces(String gatewayId) throws AppCatalogException {
try {
- AppInterfaceAppCatalogResourceAppCat resource = new AppInterfaceAppCatalogResourceAppCat();
+ AppInterfaceResource resource = new AppInterfaceResource();
resource.setGatewayId(gatewayId);
List<AppCatalogResource> resources = resource.getAll();
return AppCatalogThriftConversion.getAppInterfaceDescList(resources);
@@ -370,7 +370,7 @@ public class ApplicationInterfaceImpl implements ApplicationInterface {
@Override
public List<String> getAllApplicationInterfaceIds() throws AppCatalogException {
try {
- AppInterfaceAppCatalogResourceAppCat resource = new AppInterfaceAppCatalogResourceAppCat();
+ AppInterfaceResource resource = new AppInterfaceResource();
return resource.getAllIds();
}catch (Exception e){
logger.error("Error while retrieving app interface list...", e);
@@ -381,7 +381,7 @@ public class ApplicationInterfaceImpl implements ApplicationInterface {
@Override
public boolean removeApplicationInterface(String interfaceId) throws AppCatalogException {
try {
- AppInterfaceAppCatalogResourceAppCat resource = new AppInterfaceAppCatalogResourceAppCat();
+ AppInterfaceResource resource = new AppInterfaceResource();
resource.remove(interfaceId);
return true;
}catch (Exception e){
@@ -393,7 +393,7 @@ public class ApplicationInterfaceImpl implements ApplicationInterface {
@Override
public boolean removeApplicationModule(String moduleId) throws AppCatalogException {
try {
- AppModuleAppCatalogResourceAppCat resource = new AppModuleAppCatalogResourceAppCat();
+ AppModuleResource resource = new AppModuleResource();
resource.remove(moduleId);
return true;
}catch (Exception e){
@@ -405,7 +405,7 @@ public class ApplicationInterfaceImpl implements ApplicationInterface {
@Override
public boolean isApplicationInterfaceExists(String interfaceId) throws AppCatalogException {
try {
- AppInterfaceAppCatalogResourceAppCat resource = new AppInterfaceAppCatalogResourceAppCat();
+ AppInterfaceResource resource = new AppInterfaceResource();
return resource.isExists(interfaceId);
}catch (Exception e){
logger.error("Error while checking app interface existence "+interfaceId, e);
@@ -416,7 +416,7 @@ public class ApplicationInterfaceImpl implements ApplicationInterface {
@Override
public boolean isApplicationModuleExists(String moduleId) throws AppCatalogException {
try {
- AppModuleAppCatalogResourceAppCat resource = new AppModuleAppCatalogResourceAppCat();
+ AppModuleResource resource = new AppModuleResource();
return resource.isExists(moduleId);
}catch (Exception e){
logger.error("Error while checking app module existence "+moduleId, e);
@@ -427,7 +427,7 @@ public class ApplicationInterfaceImpl implements ApplicationInterface {
@Override
public List<InputDataObjectType> getApplicationInputs(String interfaceId) throws AppCatalogException {
try {
- ApplicationInputAppCatalogResourceAppCat resource = new ApplicationInputAppCatalogResourceAppCat();
+ ApplicationInputResource resource = new ApplicationInputResource();
List<AppCatalogResource> resources = resource.get(AppCatAbstractResource.AppInputConstants.INTERFACE_ID, interfaceId);
return AppCatalogThriftConversion.getAppInputs(resources);
}catch (Exception e){
@@ -439,7 +439,7 @@ public class ApplicationInterfaceImpl implements ApplicationInterface {
@Override
public List<OutputDataObjectType> getApplicationOutputs(String interfaceId) throws AppCatalogException {
try {
- ApplicationOutputAppCatalogResourceAppCat resource = new ApplicationOutputAppCatalogResourceAppCat();
+ ApplicationOutputResource resource = new ApplicationOutputResource();
List<AppCatalogResource> resources = resource.get(AppCatAbstractResource.AppOutputConstants.INTERFACE_ID, interfaceId);
return AppCatalogThriftConversion.getAppOutputs(resources);
}catch (Exception e){
http://git-wip-us.apache.org/repos/asf/airavata/blob/4045c094/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java
index 0f14078..385a92a 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java
@@ -51,7 +51,7 @@ public class ComputeResourceImpl implements ComputeResource {
protected String saveComputeResourceDescriptorData(
ComputeResourceDescription description) throws AppCatalogException {
//TODO remove existing one
- ComputeResourceAppCatalogResourceAppCat computeHostResource = saveComputeResource(description);
+ ComputeResourceResource computeHostResource = saveComputeResource(description);
saveHostAliases(description, computeHostResource);
saveIpAddresses(description, computeHostResource);
saveBatchQueues(description, computeHostResource);
@@ -61,21 +61,21 @@ public class ComputeResourceImpl implements ComputeResource {
return computeHostResource.getResourceId();
}
- protected ComputeResourceAppCatalogResourceAppCat saveComputeResource(
+ protected ComputeResourceResource saveComputeResource(
ComputeResourceDescription description) throws AppCatalogException {
- ComputeResourceAppCatalogResourceAppCat computeHostResource = AppCatalogThriftConversion.getComputeHostResource(description);
+ ComputeResourceResource computeHostResource = AppCatalogThriftConversion.getComputeHostResource(description);
computeHostResource.save();
return computeHostResource;
}
protected void saveDataMovementInterfaces(
ComputeResourceDescription description,
- ComputeResourceAppCatalogResourceAppCat computeHostResource)
+ ComputeResourceResource computeHostResource)
throws AppCatalogException {
List<DataMovementInterface> dataMovemenetInterfaces = description.getDataMovementInterfaces();
if (dataMovemenetInterfaces != null && !dataMovemenetInterfaces.isEmpty()) {
for (DataMovementInterface dataMovementInterface : dataMovemenetInterfaces) {
- DataMovementInterfaceAppCatalogResourceAppCat dmir = AppCatalogThriftConversion.getDataMovementInterface(dataMovementInterface);
+ DataMovementInterfaceResource dmir = AppCatalogThriftConversion.getDataMovementInterface(dataMovementInterface);
dmir.setComputeHostResource(computeHostResource);
dmir.setComputeResourceId(computeHostResource.getResourceId());
dmir.save();
@@ -85,12 +85,12 @@ public class ComputeResourceImpl implements ComputeResource {
protected void saveJobSubmissionInterfaces(
ComputeResourceDescription description,
- ComputeResourceAppCatalogResourceAppCat computeHostResource)
+ ComputeResourceResource computeHostResource)
throws AppCatalogException {
List<JobSubmissionInterface> jobSubmissionInterfaces = description.getJobSubmissionInterfaces();
if (jobSubmissionInterfaces != null && !jobSubmissionInterfaces.isEmpty()) {
for (JobSubmissionInterface jobSubmissionInterface : jobSubmissionInterfaces) {
- JobSubmissionInterfaceAppCatalogResourceAppCat jsir = AppCatalogThriftConversion.getJobSubmissionInterface(jobSubmissionInterface);
+ JobSubmissionInterfaceResource jsir = AppCatalogThriftConversion.getJobSubmissionInterface(jobSubmissionInterface);
jsir.setComputeHostResource(computeHostResource);
jsir.setComputeResourceId(computeHostResource.getResourceId());
jsir.save();
@@ -99,12 +99,12 @@ public class ComputeResourceImpl implements ComputeResource {
}
protected void saveFileSystems(ComputeResourceDescription description,
- ComputeResourceAppCatalogResourceAppCat computeHostResource)
+ ComputeResourceResource computeHostResource)
throws AppCatalogException {
Map<FileSystems, String> fileSystems = description.getFileSystems();
if (fileSystems != null && !fileSystems.isEmpty()) {
for (FileSystems key : fileSystems.keySet()) {
- ComputeResourceFileSystemAppCatalogResourceAppCat computeResourceFileSystemResource = new ComputeResourceFileSystemAppCatalogResourceAppCat();
+ ComputeResourceFileSystemResource computeResourceFileSystemResource = new ComputeResourceFileSystemResource();
computeResourceFileSystemResource.setComputeHostResource(computeHostResource);
computeResourceFileSystemResource.setComputeResourceId(computeHostResource.getResourceId());
computeResourceFileSystemResource.setFileSystem(key.toString());
@@ -115,12 +115,12 @@ public class ComputeResourceImpl implements ComputeResource {
}
protected void saveBatchQueues(ComputeResourceDescription description,
- ComputeResourceAppCatalogResourceAppCat computeHostResource)
+ ComputeResourceResource computeHostResource)
throws AppCatalogException {
List<BatchQueue> batchQueueList = description.getBatchQueues();
if (batchQueueList != null && !batchQueueList.isEmpty()) {
for (BatchQueue batchQueue : batchQueueList) {
- BatchQueueAppCatalogResourceAppCat bq = AppCatalogThriftConversion.getBatchQueue(batchQueue);
+ BatchQueueResource bq = AppCatalogThriftConversion.getBatchQueue(batchQueue);
bq.setComputeResourceId(computeHostResource.getResourceId());
bq.setComputeHostResource(computeHostResource);
bq.save();
@@ -129,14 +129,14 @@ public class ComputeResourceImpl implements ComputeResource {
}
protected void saveIpAddresses(ComputeResourceDescription description,
- ComputeResourceAppCatalogResourceAppCat computeHostResource)
+ ComputeResourceResource computeHostResource)
throws AppCatalogException {
List<String> ipAddresses = description.getIpAddresses();
- HostIPAddressAppCatalogResourceAppCat resource = new HostIPAddressAppCatalogResourceAppCat();
+ HostIPAddressResource resource = new HostIPAddressResource();
resource.remove(description.getComputeResourceId());
if (ipAddresses != null && !ipAddresses.isEmpty()) {
for (String ipAddress : ipAddresses) {
- HostIPAddressAppCatalogResourceAppCat ipAddressResource = new HostIPAddressAppCatalogResourceAppCat();
+ HostIPAddressResource ipAddressResource = new HostIPAddressResource();
ipAddressResource.setComputeHostResource(computeHostResource);
ipAddressResource.setResourceID(computeHostResource.getResourceId());
ipAddressResource.setIpaddress(ipAddress);
@@ -146,15 +146,15 @@ public class ComputeResourceImpl implements ComputeResource {
}
protected void saveHostAliases(ComputeResourceDescription description,
- ComputeResourceAppCatalogResourceAppCat computeHostResource)
+ ComputeResourceResource computeHostResource)
throws AppCatalogException {
List<String> hostAliases = description.getHostAliases();
// delete previous host aliases
- HostAliasAppCatalogResourceAppCat resource = new HostAliasAppCatalogResourceAppCat();
+ HostAliasAppResource resource = new HostAliasAppResource();
resource.remove(description.getComputeResourceId());
if (hostAliases != null && !hostAliases.isEmpty()) {
for (String alias : hostAliases) {
- HostAliasAppCatalogResourceAppCat aliasResource = new HostAliasAppCatalogResourceAppCat();
+ HostAliasAppResource aliasResource = new HostAliasAppResource();
aliasResource.setComputeHostResource(computeHostResource);
aliasResource.setResourceID(computeHostResource.getResourceId());
aliasResource.setAlias(alias);
@@ -179,7 +179,7 @@ public class ComputeResourceImpl implements ComputeResource {
String submissionId = AppCatalogUtils.getID("SSH");
sshJobSubmission.setJobSubmissionInterfaceId(submissionId);
String resourceJobManagerId = addResourceJobManager(sshJobSubmission.getResourceJobManager());
- SshJobSubmissionAppCatalogResourceAppCat resource = AppCatalogThriftConversion.getSSHJobSubmission(sshJobSubmission);
+ SshJobSubmissionResource resource = AppCatalogThriftConversion.getSSHJobSubmission(sshJobSubmission);
resource.setResourceJobManagerId(resourceJobManagerId);
resource.getResourceJobManagerResource().setResourceJobManagerId(resourceJobManagerId);
if (sshJobSubmission.getMonitorMode() != null){
@@ -197,7 +197,7 @@ public class ComputeResourceImpl implements ComputeResource {
public String addCloudJobSubmission(CloudJobSubmission sshJobSubmission) throws AppCatalogException {
try {
sshJobSubmission.setJobSubmissionInterfaceId(AppCatalogUtils.getID("Cloud"));
- CloudSubmissionAppCatalogResourceAppCat resource = AppCatalogThriftConversion.getCloudJobSubmission(sshJobSubmission);
+ CloudSubmissionResource resource = AppCatalogThriftConversion.getCloudJobSubmission(sshJobSubmission);
resource.save();
return resource.getJobSubmissionInterfaceId();
}catch (Exception e) {
@@ -211,7 +211,7 @@ public class ComputeResourceImpl implements ComputeResource {
throws AppCatalogException {
try {
unicoreJobSubmission.setJobSubmissionInterfaceId(AppCatalogUtils.getID("UNICORE"));
- UnicoreJobSubmissionAppCatalogResourceAppCat resource = AppCatalogThriftConversion.getUnicoreJobSubmission(unicoreJobSubmission);
+ UnicoreJobSubmissionResource resource = AppCatalogThriftConversion.getUnicoreJobSubmission(unicoreJobSubmission);
resource.setUnicoreEndpointUrl(unicoreJobSubmission.getUnicoreEndPointURL());
if (unicoreJobSubmission.getSecurityProtocol() != null){
resource.setSecurityProtocol(unicoreJobSubmission.getSecurityProtocol().toString());
@@ -228,10 +228,10 @@ public class ComputeResourceImpl implements ComputeResource {
@Override
public String addJobSubmissionProtocol(String computeResourceId, JobSubmissionInterface jobSubmissionInterface) throws AppCatalogException {
try {
- JobSubmissionInterfaceAppCatalogResourceAppCat jsi = AppCatalogThriftConversion.getJobSubmissionInterface(jobSubmissionInterface);
+ JobSubmissionInterfaceResource jsi = AppCatalogThriftConversion.getJobSubmissionInterface(jobSubmissionInterface);
jsi.setComputeResourceId(computeResourceId);
- ComputeResourceAppCatalogResourceAppCat computeResourceResource = new ComputeResourceAppCatalogResourceAppCat();
- computeResourceResource=(ComputeResourceAppCatalogResourceAppCat)computeResourceResource.get(computeResourceId);
+ ComputeResourceResource computeResourceResource = new ComputeResourceResource();
+ computeResourceResource=(ComputeResourceResource)computeResourceResource.get(computeResourceId);
jsi.setComputeHostResource(computeResourceResource);
jsi.save();
return jsi.getJobSubmissionInterfaceId();
@@ -341,7 +341,7 @@ public class ComputeResourceImpl implements ComputeResource {
public String addScpDataMovement(SCPDataMovement scpDataMovement) throws AppCatalogException {
try {
scpDataMovement.setDataMovementInterfaceId(AppCatalogUtils.getID("SCP"));
- ScpDataMovementAppCatalogResourceAppCat resource = AppCatalogThriftConversion.getSCPDataMovementDescription(scpDataMovement);
+ ScpDataMovementResource resource = AppCatalogThriftConversion.getSCPDataMovementDescription(scpDataMovement);
resource.save();
return resource.getDataMovementInterfaceId();
}catch (Exception e){
@@ -354,7 +354,7 @@ public class ComputeResourceImpl implements ComputeResource {
public String addUnicoreDataMovement(UnicoreDataMovement unicoreDataMovement) throws AppCatalogException {
try {
unicoreDataMovement.setDataMovementInterfaceId(AppCatalogUtils.getID("UNICORE"));
- UnicoreDataMovementAppCatalogResourceAppCat resource = AppCatalogThriftConversion.getUnicoreDMResource(unicoreDataMovement);
+ UnicoreDataMovementResource resource = AppCatalogThriftConversion.getUnicoreDMResource(unicoreDataMovement);
resource.save();
return resource.getDataMovementId();
}catch (Exception e){
@@ -366,10 +366,10 @@ public class ComputeResourceImpl implements ComputeResource {
@Override
public String addDataMovementProtocol(String computeResourceId, DataMovementInterface dataMovementInterface) throws AppCatalogException {
try {
- DataMovementInterfaceAppCatalogResourceAppCat dmi = AppCatalogThriftConversion.getDataMovementInterface(dataMovementInterface);
+ DataMovementInterfaceResource dmi = AppCatalogThriftConversion.getDataMovementInterface(dataMovementInterface);
dmi.setComputeResourceId(computeResourceId);
- ComputeResourceAppCatalogResourceAppCat computeResourceResource = new ComputeResourceAppCatalogResourceAppCat();
- computeResourceResource=(ComputeResourceAppCatalogResourceAppCat)computeResourceResource.get(computeResourceId);
+ ComputeResourceResource computeResourceResource = new ComputeResourceResource();
+ computeResourceResource=(ComputeResourceResource)computeResourceResource.get(computeResourceId);
dmi.setComputeHostResource(computeResourceResource);
dmi.save();
return dmi.getDataMovementInterfaceId();
@@ -383,12 +383,12 @@ public class ComputeResourceImpl implements ComputeResource {
public String addGridFTPDataMovement(GridFTPDataMovement gridFTPDataMovement) throws AppCatalogException {
try {
gridFTPDataMovement.setDataMovementInterfaceId(AppCatalogUtils.getID("GRIDFTP"));
- GridftpDataMovementAppCatalogResourceAppCat resource = AppCatalogThriftConversion.getGridFTPDataMovementDescription(gridFTPDataMovement);
+ GridftpDataMovementResource resource = AppCatalogThriftConversion.getGridFTPDataMovementDescription(gridFTPDataMovement);
resource.save();
List<String> gridFTPEndPoint = gridFTPDataMovement.getGridFTPEndPoints();
if (gridFTPEndPoint != null && !gridFTPEndPoint.isEmpty()) {
for (String endpoint : gridFTPEndPoint) {
- GridftpEndpointAppCatalogResourceAppCat endpointResource = new GridftpEndpointAppCatalogResourceAppCat();
+ GridftpEndpointResource endpointResource = new GridftpEndpointResource();
endpointResource.setDataMovementInterfaceId(resource.getDataMovementInterfaceId());
endpointResource.setEndpoint(endpoint);
endpointResource.setGridftpDataMovementResource(resource);
@@ -405,8 +405,8 @@ public class ComputeResourceImpl implements ComputeResource {
@Override
public ComputeResourceDescription getComputeResource(String resourceId) throws AppCatalogException {
try {
- ComputeResourceAppCatalogResourceAppCat resource = new ComputeResourceAppCatalogResourceAppCat();
- ComputeResourceAppCatalogResourceAppCat computeResource = (ComputeResourceAppCatalogResourceAppCat)resource.get(resourceId);
+ ComputeResourceResource resource = new ComputeResourceResource();
+ ComputeResourceResource computeResource = (ComputeResourceResource)resource.get(resourceId);
return AppCatalogThriftConversion.getComputeHostDescription(computeResource);
}catch (Exception e){
logger.error("Error while retrieving compute resource...", e);
@@ -419,7 +419,7 @@ public class ComputeResourceImpl implements ComputeResource {
List<ComputeResourceDescription> computeResourceDescriptions = new ArrayList<ComputeResourceDescription>();
try {
//TODO check if this is correct way to do this
- ComputeResourceAppCatalogResourceAppCat resource = new ComputeResourceAppCatalogResourceAppCat();
+ ComputeResourceResource resource = new ComputeResourceResource();
for (String fieldName : filters.keySet() ){
if (fieldName.equals(AppCatAbstractResource.ComputeResourceConstants.HOST_NAME)){
List<AppCatalogResource> resources = resource.get(AppCatAbstractResource.ComputeResourceConstants.HOST_NAME, filters.get(fieldName));
@@ -442,7 +442,7 @@ public class ComputeResourceImpl implements ComputeResource {
public List<ComputeResourceDescription> getAllComputeResourceList() throws AppCatalogException {
List<ComputeResourceDescription> computeResourceDescriptions = new ArrayList<ComputeResourceDescription>();
try {
- ComputeResourceAppCatalogResourceAppCat resource = new ComputeResourceAppCatalogResourceAppCat();
+ ComputeResourceResource resource = new ComputeResourceResource();
List<AppCatalogResource> resources = resource.getAll();
if (resources != null && !resources.isEmpty()){
computeResourceDescriptions = AppCatalogThriftConversion.getComputeDescriptionList(resources);
@@ -458,11 +458,11 @@ public class ComputeResourceImpl implements ComputeResource {
public Map<String, String> getAllComputeResourceIdList() throws AppCatalogException {
try {
Map<String, String> computeResourceMap = new HashMap<String, String>();
- ComputeResourceAppCatalogResourceAppCat resource = new ComputeResourceAppCatalogResourceAppCat();
+ ComputeResourceResource resource = new ComputeResourceResource();
List<AppCatalogResource> allComputeResources = resource.getAll();
if (allComputeResources != null && !allComputeResources.isEmpty()){
for (AppCatalogResource cm : allComputeResources){
- ComputeResourceAppCatalogResourceAppCat cmr = (ComputeResourceAppCatalogResourceAppCat)cm;
+ ComputeResourceResource cmr = (ComputeResourceResource)cm;
computeResourceMap.put(cmr.getResourceId(), cmr.getHostName());
}
}
@@ -552,8 +552,8 @@ public class ComputeResourceImpl implements ComputeResource {
@Override
public SSHJobSubmission getSSHJobSubmission(String submissionId) throws AppCatalogException {
try {
- SshJobSubmissionAppCatalogResourceAppCat resource = new SshJobSubmissionAppCatalogResourceAppCat();
- resource = (SshJobSubmissionAppCatalogResourceAppCat)resource.get(submissionId);
+ SshJobSubmissionResource resource = new SshJobSubmissionResource();
+ resource = (SshJobSubmissionResource)resource.get(submissionId);
return AppCatalogThriftConversion.getSSHJobSubmissionDescription(resource);
}catch (Exception e){
logger.error("Error while retrieving SSH Job Submission...", e);
@@ -587,8 +587,8 @@ public class ComputeResourceImpl implements ComputeResource {
public UnicoreJobSubmission getUNICOREJobSubmission(String submissionId)
throws AppCatalogException {
try {
- UnicoreJobSubmissionAppCatalogResourceAppCat resource = new UnicoreJobSubmissionAppCatalogResourceAppCat();
- resource = (UnicoreJobSubmissionAppCatalogResourceAppCat)resource.get(submissionId);
+ UnicoreJobSubmissionResource resource = new UnicoreJobSubmissionResource();
+ resource = (UnicoreJobSubmissionResource)resource.get(submissionId);
return AppCatalogThriftConversion.getUnicoreJobSubmissionDescription(resource);
}catch (Exception e){
logger.error("Error while retrieving UNICORE Job Submission model instance...", e);
@@ -600,8 +600,8 @@ public class ComputeResourceImpl implements ComputeResource {
public UnicoreDataMovement getUNICOREDataMovement(String dataMovementId)
throws AppCatalogException {
try {
- UnicoreDataMovementAppCatalogResourceAppCat resource = new UnicoreDataMovementAppCatalogResourceAppCat();
- resource = (UnicoreDataMovementAppCatalogResourceAppCat)resource.get(dataMovementId);
+ UnicoreDataMovementResource resource = new UnicoreDataMovementResource();
+ resource = (UnicoreDataMovementResource)resource.get(dataMovementId);
return AppCatalogThriftConversion.getUnicoreDMDescription(resource);
}catch (Exception e){
logger.error("Error while retrieving UNICORE data movement...", e);
@@ -612,8 +612,8 @@ public class ComputeResourceImpl implements ComputeResource {
@Override
public CloudJobSubmission getCloudJobSubmission(String submissionId) throws AppCatalogException {
try {
- CloudSubmissionAppCatalogResourceAppCat resource = new CloudSubmissionAppCatalogResourceAppCat();
- resource = (CloudSubmissionAppCatalogResourceAppCat)resource.get(submissionId);
+ CloudSubmissionResource resource = new CloudSubmissionResource();
+ resource = (CloudSubmissionResource)resource.get(submissionId);
return AppCatalogThriftConversion.getCloudJobSubmissionDescription(resource);
}catch (Exception e){
logger.error("Error while retrieving SSH Job Submission...", e);
@@ -646,8 +646,8 @@ public class ComputeResourceImpl implements ComputeResource {
@Override
public SCPDataMovement getSCPDataMovement(String dataMoveId) throws AppCatalogException {
try {
- ScpDataMovementAppCatalogResourceAppCat resource = new ScpDataMovementAppCatalogResourceAppCat();
- ScpDataMovementAppCatalogResourceAppCat dataMovementResource = (ScpDataMovementAppCatalogResourceAppCat)resource.get(dataMoveId);
+ ScpDataMovementResource resource = new ScpDataMovementResource();
+ ScpDataMovementResource dataMovementResource = (ScpDataMovementResource)resource.get(dataMoveId);
return AppCatalogThriftConversion.getSCPDataMovementDescription(dataMovementResource);
}catch (Exception e){
logger.error("Error while retrieving SCP Data Movement...", e);
@@ -680,8 +680,8 @@ public class ComputeResourceImpl implements ComputeResource {
@Override
public GridFTPDataMovement getGridFTPDataMovement(String dataMoveId) throws AppCatalogException {
try {
- GridftpDataMovementAppCatalogResourceAppCat resource = new GridftpDataMovementAppCatalogResourceAppCat();
- GridftpDataMovementAppCatalogResourceAppCat dataMovementResource = (GridftpDataMovementAppCatalogResourceAppCat)resource.get(dataMoveId);
+ GridftpDataMovementResource resource = new GridftpDataMovementResource();
+ GridftpDataMovementResource dataMovementResource = (GridftpDataMovementResource)resource.get(dataMoveId);
return AppCatalogThriftConversion.getGridFTPDataMovementDescription(dataMovementResource);
}catch (Exception e){
logger.error("Error while retrieving Grid FTP Data Movement...", e);
@@ -714,7 +714,7 @@ public class ComputeResourceImpl implements ComputeResource {
@Override
public boolean isComputeResourceExists(String resourceId) throws AppCatalogException {
try {
- ComputeResourceAppCatalogResourceAppCat resource = new ComputeResourceAppCatalogResourceAppCat();
+ ComputeResourceResource resource = new ComputeResourceResource();
return resource.isExists(resourceId);
}catch (Exception e){
logger.error("Error while retrieving compute resource...", e);
@@ -725,7 +725,7 @@ public class ComputeResourceImpl implements ComputeResource {
@Override
public void removeComputeResource(String resourceId) throws AppCatalogException {
try {
- ComputeResourceAppCatalogResourceAppCat resource = new ComputeResourceAppCatalogResourceAppCat();
+ ComputeResourceResource resource = new ComputeResourceResource();
resource.remove(resourceId);
}catch (Exception e){
logger.error("Error while removing compute resource...", e);
@@ -736,7 +736,7 @@ public class ComputeResourceImpl implements ComputeResource {
@Override
public void removeJobSubmissionInterface(String computeResourceId, String jobSubmissionInterfaceId) throws AppCatalogException {
try {
- JobSubmissionInterfaceAppCatalogResourceAppCat resource = new JobSubmissionInterfaceAppCatalogResourceAppCat();
+ JobSubmissionInterfaceResource resource = new JobSubmissionInterfaceResource();
Map<String, String> ids = new HashMap<String, String>();
ids.put(AppCatAbstractResource.JobSubmissionInterfaceConstants.COMPUTE_RESOURCE_ID, computeResourceId);
ids.put(AppCatAbstractResource.JobSubmissionInterfaceConstants.JOB_SUBMISSION_INTERFACE_ID, jobSubmissionInterfaceId);
@@ -750,7 +750,7 @@ public class ComputeResourceImpl implements ComputeResource {
@Override
public void removeDataMovementInterface(String computeResourceId, String dataMovementInterfaceId) throws AppCatalogException {
try {
- DataMovementInterfaceAppCatalogResourceAppCat resource = new DataMovementInterfaceAppCatalogResourceAppCat();
+ DataMovementInterfaceResource resource = new DataMovementInterfaceResource();
Map<String, String> ids = new HashMap<String, String>();
ids.put(AppCatAbstractResource.DataMovementInterfaceConstants.COMPUTE_RESOURCE_ID, computeResourceId);
ids.put(AppCatAbstractResource.DataMovementInterfaceConstants.DATA_MOVEMENT_INTERFACE_ID, dataMovementInterfaceId);
@@ -764,7 +764,7 @@ public class ComputeResourceImpl implements ComputeResource {
@Override
public void removeBatchQueue(String computeResourceId, String queueName) throws AppCatalogException {
try {
- BatchQueueAppCatalogResourceAppCat resource = new BatchQueueAppCatalogResourceAppCat();
+ BatchQueueResource resource = new BatchQueueResource();
Map<String, String> ids = new HashMap<String, String>();
ids.put(AppCatAbstractResource.BatchQueueConstants.COMPUTE_RESOURCE_ID, computeResourceId);
ids.put(AppCatAbstractResource.BatchQueueConstants.QUEUE_NAME, queueName);
@@ -779,12 +779,12 @@ public class ComputeResourceImpl implements ComputeResource {
public String addResourceJobManager(ResourceJobManager resourceJobManager)
throws AppCatalogException {
resourceJobManager.setResourceJobManagerId(AppCatalogUtils.getID("RJM"));
- ResourceJobManagerAppCatalogResourceAppCat resource = AppCatalogThriftConversion.getResourceJobManager(resourceJobManager);
+ ResourceJobManagerResource resource = AppCatalogThriftConversion.getResourceJobManager(resourceJobManager);
resource.save();
Map<JobManagerCommand, String> jobManagerCommands = resourceJobManager.getJobManagerCommands();
if (jobManagerCommands!=null && jobManagerCommands.size() != 0) {
for (JobManagerCommand commandType : jobManagerCommands.keySet()) {
- JobManagerCommandAppCatalogResourceAppCat r = new JobManagerCommandAppCatalogResourceAppCat();
+ JobManagerCommandResource r = new JobManagerCommandResource();
r.setCommandType(commandType.toString());
r.setCommand(jobManagerCommands.get(commandType));
r.setResourceJobManagerId(resource.getResourceJobManagerId());
@@ -797,21 +797,21 @@ public class ComputeResourceImpl implements ComputeResource {
@Override
public void updateResourceJobManager(String resourceJobManagerId, ResourceJobManager updatedResourceJobManager) throws AppCatalogException {
try {
- ResourceJobManagerAppCatalogResourceAppCat resource = AppCatalogThriftConversion.getResourceJobManager(updatedResourceJobManager);
+ ResourceJobManagerResource resource = AppCatalogThriftConversion.getResourceJobManager(updatedResourceJobManager);
resource.setResourceJobManagerId(resourceJobManagerId);
resource.save();
Map<JobManagerCommand, String> jobManagerCommands = updatedResourceJobManager.getJobManagerCommands();
if (jobManagerCommands!=null && jobManagerCommands.size() != 0) {
for (JobManagerCommand commandType : jobManagerCommands.keySet()) {
- JobManagerCommandAppCatalogResourceAppCat r = new JobManagerCommandAppCatalogResourceAppCat();
+ JobManagerCommandResource r = new JobManagerCommandResource();
Map<String, String> ids = new HashMap<String, String>();
ids.put(AppCatAbstractResource.JobManagerCommandConstants.RESOURCE_JOB_MANAGER_ID, resourceJobManagerId);
ids.put(AppCatAbstractResource.JobManagerCommandConstants.COMMAND_TYPE, commandType.toString());
- JobManagerCommandAppCatalogResourceAppCat existingCommand;
+ JobManagerCommandResource existingCommand;
if (r.isExists(ids)){
- existingCommand = (JobManagerCommandAppCatalogResourceAppCat)r.get(ids);
+ existingCommand = (JobManagerCommandResource)r.get(ids);
}else {
- existingCommand = new JobManagerCommandAppCatalogResourceAppCat();
+ existingCommand = new JobManagerCommandResource();
}
existingCommand.setCommandType(commandType.toString());
existingCommand.setCommand(jobManagerCommands.get(commandType));
@@ -828,8 +828,8 @@ public class ComputeResourceImpl implements ComputeResource {
@Override
public ResourceJobManager getResourceJobManager(String resourceJobManagerId) throws AppCatalogException {
try {
- ResourceJobManagerAppCatalogResourceAppCat resource = new ResourceJobManagerAppCatalogResourceAppCat();
- ResourceJobManagerAppCatalogResourceAppCat jobManagerResource = (ResourceJobManagerAppCatalogResourceAppCat)resource.get(resourceJobManagerId);
+ ResourceJobManagerResource resource = new ResourceJobManagerResource();
+ ResourceJobManagerResource jobManagerResource = (ResourceJobManagerResource)resource.get(resourceJobManagerId);
return AppCatalogThriftConversion.getResourceJobManager(jobManagerResource);
}catch (Exception e){
logger.error("Error while retrieving resource job manager..", e);
@@ -840,7 +840,7 @@ public class ComputeResourceImpl implements ComputeResource {
@Override
public void deleteResourceJobManager(String resourceJobManagerId) throws AppCatalogException {
try {
- ResourceJobManagerAppCatalogResourceAppCat resource = new ResourceJobManagerAppCatalogResourceAppCat();
+ ResourceJobManagerResource resource = new ResourceJobManagerResource();
resource.remove(resourceJobManagerId);
}catch (Exception e){
logger.error("Error while deleting resource job manager..", e);
@@ -853,7 +853,7 @@ public class ComputeResourceImpl implements ComputeResource {
throws AppCatalogException {
localSubmission.setJobSubmissionInterfaceId(AppCatalogUtils.getID("LOCAL"));
String resourceJobManagerId = addResourceJobManager(localSubmission.getResourceJobManager());
- LocalSubmissionAppCatalogResourceAppCat localJobSubmission = AppCatalogThriftConversion.getLocalJobSubmission(localSubmission);
+ LocalSubmissionResource localJobSubmission = AppCatalogThriftConversion.getLocalJobSubmission(localSubmission);
localJobSubmission.setResourceJobManagerId(resourceJobManagerId);
localJobSubmission.getResourceJobManagerResource().setResourceJobManagerId(resourceJobManagerId);
localJobSubmission.save();
@@ -864,7 +864,7 @@ public class ComputeResourceImpl implements ComputeResource {
public String addLocalDataMovement(LOCALDataMovement localDataMovement)
throws AppCatalogException {
localDataMovement.setDataMovementInterfaceId(AppCatalogUtils.getID("LOCAL"));
- LocalDataMovementAppCatalogResourceAppCat ldm = AppCatalogThriftConversion.getLocalDataMovement(localDataMovement);
+ LocalDataMovementResource ldm = AppCatalogThriftConversion.getLocalDataMovement(localDataMovement);
ldm.save();
return ldm.getDataMovementInterfaceId();
}
@@ -872,16 +872,16 @@ public class ComputeResourceImpl implements ComputeResource {
@Override
public LOCALSubmission getLocalJobSubmission(String submissionId)
throws AppCatalogException {
- LocalSubmissionAppCatalogResourceAppCat localSubmissionResource = new LocalSubmissionAppCatalogResourceAppCat();
- localSubmissionResource= (LocalSubmissionAppCatalogResourceAppCat)localSubmissionResource.get(submissionId);
+ LocalSubmissionResource localSubmissionResource = new LocalSubmissionResource();
+ localSubmissionResource= (LocalSubmissionResource)localSubmissionResource.get(submissionId);
return AppCatalogThriftConversion.getLocalJobSubmission(localSubmissionResource);
}
@Override
public LOCALDataMovement getLocalDataMovement(String datamovementId)
throws AppCatalogException {
- LocalDataMovementAppCatalogResourceAppCat localDataMovementResource = new LocalDataMovementAppCatalogResourceAppCat();
- localDataMovementResource = (LocalDataMovementAppCatalogResourceAppCat) localDataMovementResource.get(datamovementId);
+ LocalDataMovementResource localDataMovementResource = new LocalDataMovementResource();
+ localDataMovementResource = (LocalDataMovementResource) localDataMovementResource.get(datamovementId);
return AppCatalogThriftConversion.getLocalDataMovement(localDataMovementResource);
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/4045c094/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/GwyResourceProfileImpl.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/GwyResourceProfileImpl.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/GwyResourceProfileImpl.java
index 05cbcdc..8a4e067 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/GwyResourceProfileImpl.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/GwyResourceProfileImpl.java
@@ -42,7 +42,7 @@ public class GwyResourceProfileImpl implements GwyResourceProfile {
@Override
public String addGatewayResourceProfile(org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile gatewayProfile) throws AppCatalogException {
try {
- GatewayProfileAppCatalogResourceAppCat profileResource = new GatewayProfileAppCatalogResourceAppCat();
+ GatewayProfileResource profileResource = new GatewayProfileResource();
if (!gatewayProfile.getGatewayID().equals("") && !gatewayProfile.getGatewayID().equals(gatewayResourceProfileModelConstants.DEFAULT_ID)){
profileResource.setGatewayID(gatewayProfile.getGatewayID());
}
@@ -51,11 +51,11 @@ public class GwyResourceProfileImpl implements GwyResourceProfile {
List<ComputeResourcePreference> computeResourcePreferences = gatewayProfile.getComputeResourcePreferences();
if (computeResourcePreferences != null && !computeResourcePreferences.isEmpty()){
for (ComputeResourcePreference preference : computeResourcePreferences ){
- ComputeHostPreferenceAppCatalogResourceAppCat resource = new ComputeHostPreferenceAppCatalogResourceAppCat();
+ ComputeHostPreferenceResource resource = new ComputeHostPreferenceResource();
resource.setGatewayProfile(profileResource);
resource.setResourceId(preference.getComputeResourceId());
- ComputeResourceAppCatalogResourceAppCat computeHostResource = new ComputeResourceAppCatalogResourceAppCat();
- resource.setComputeHostResource((ComputeResourceAppCatalogResourceAppCat)computeHostResource.get(preference.getComputeResourceId()));
+ ComputeResourceResource computeHostResource = new ComputeResourceResource();
+ resource.setComputeHostResource((ComputeResourceResource)computeHostResource.get(preference.getComputeResourceId()));
resource.setGatewayId(profileResource.getGatewayID());
resource.setOverrideByAiravata(preference.isOverridebyAiravata());
resource.setLoginUserName(preference.getLoginUserName());
@@ -83,18 +83,18 @@ public class GwyResourceProfileImpl implements GwyResourceProfile {
@Override
public void updateGatewayResourceProfile(String gatewayId, org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile updatedProfile) throws AppCatalogException {
try {
- GatewayProfileAppCatalogResourceAppCat profileResource = new GatewayProfileAppCatalogResourceAppCat();
- GatewayProfileAppCatalogResourceAppCat existingGP = (GatewayProfileAppCatalogResourceAppCat)profileResource.get(gatewayId);
+ GatewayProfileResource profileResource = new GatewayProfileResource();
+ GatewayProfileResource existingGP = (GatewayProfileResource)profileResource.get(gatewayId);
existingGP.save();
List<ComputeResourcePreference> computeResourcePreferences = updatedProfile.getComputeResourcePreferences();
if (computeResourcePreferences != null && !computeResourcePreferences.isEmpty()){
for (ComputeResourcePreference preference : computeResourcePreferences ){
- ComputeHostPreferenceAppCatalogResourceAppCat resource = new ComputeHostPreferenceAppCatalogResourceAppCat();
+ ComputeHostPreferenceResource resource = new ComputeHostPreferenceResource();
resource.setGatewayProfile(existingGP);
resource.setResourceId(preference.getComputeResourceId());
- ComputeResourceAppCatalogResourceAppCat computeHostResource = new ComputeResourceAppCatalogResourceAppCat();
- resource.setComputeHostResource((ComputeResourceAppCatalogResourceAppCat)computeHostResource.get(preference.getComputeResourceId()));
+ ComputeResourceResource computeHostResource = new ComputeResourceResource();
+ resource.setComputeHostResource((ComputeResourceResource)computeHostResource.get(preference.getComputeResourceId()));
resource.setGatewayId(gatewayId);
resource.setLoginUserName(preference.getLoginUserName());
resource.setOverrideByAiravata(preference.isOverridebyAiravata());
@@ -120,9 +120,9 @@ public class GwyResourceProfileImpl implements GwyResourceProfile {
@Override
public GatewayResourceProfile getGatewayProfile(String gatewayId) throws AppCatalogException {
try {
- GatewayProfileAppCatalogResourceAppCat resource = new GatewayProfileAppCatalogResourceAppCat();
- GatewayProfileAppCatalogResourceAppCat gwresource = (GatewayProfileAppCatalogResourceAppCat)resource.get(gatewayId);
- ComputeHostPreferenceAppCatalogResourceAppCat prefResource = new ComputeHostPreferenceAppCatalogResourceAppCat();
+ GatewayProfileResource resource = new GatewayProfileResource();
+ GatewayProfileResource gwresource = (GatewayProfileResource)resource.get(gatewayId);
+ ComputeHostPreferenceResource prefResource = new ComputeHostPreferenceResource();
List<AppCatalogResource> computePrefList = prefResource.get(AppCatAbstractResource.ComputeResourcePreferenceConstants.GATEWAY_ID, gatewayId);
List<ComputeResourcePreference> computeResourcePreferences = AppCatalogThriftConversion.getComputeResourcePreferences(computePrefList);
return AppCatalogThriftConversion.getGatewayResourceProfile(gwresource, computeResourcePreferences);
@@ -135,7 +135,7 @@ public class GwyResourceProfileImpl implements GwyResourceProfile {
@Override
public boolean removeGatewayResourceProfile(String gatewayId) throws AppCatalogException {
try {
- GatewayProfileAppCatalogResourceAppCat resource = new GatewayProfileAppCatalogResourceAppCat();
+ GatewayProfileResource resource = new GatewayProfileResource();
resource.remove(gatewayId);
return true;
}catch (Exception e) {
@@ -147,7 +147,7 @@ public class GwyResourceProfileImpl implements GwyResourceProfile {
@Override
public boolean removeComputeResourcePreferenceFromGateway(String gatewayId, String preferenceId) throws AppCatalogException {
try {
- ComputeHostPreferenceAppCatalogResourceAppCat resource = new ComputeHostPreferenceAppCatalogResourceAppCat();
+ ComputeHostPreferenceResource resource = new ComputeHostPreferenceResource();
Map<String, String> ids = new HashMap<String, String>();
ids.put(AppCatAbstractResource.ComputeResourcePreferenceConstants.GATEWAY_ID, gatewayId);
ids.put(AppCatAbstractResource.ComputeResourcePreferenceConstants.RESOURCE_ID, preferenceId);
@@ -162,7 +162,7 @@ public class GwyResourceProfileImpl implements GwyResourceProfile {
@Override
public boolean isGatewayResourceProfileExists(String gatewayId) throws AppCatalogException {
try {
- GatewayProfileAppCatalogResourceAppCat resource = new GatewayProfileAppCatalogResourceAppCat();
+ GatewayProfileResource resource = new GatewayProfileResource();
return resource.isExists(gatewayId);
}catch (Exception e) {
logger.error("Error while retrieving gateway profile...", e);
@@ -178,10 +178,10 @@ public class GwyResourceProfileImpl implements GwyResourceProfile {
@Override
public ComputeResourcePreference getComputeResourcePreference(String gatewayId, String hostId) throws AppCatalogException {
try {
- ComputeHostPreferenceAppCatalogResourceAppCat prefResource = new ComputeHostPreferenceAppCatalogResourceAppCat();
+ ComputeHostPreferenceResource prefResource = new ComputeHostPreferenceResource();
List<AppCatalogResource> computePrefList = prefResource.get(AppCatAbstractResource.ComputeResourcePreferenceConstants.GATEWAY_ID, gatewayId);
for (AppCatalogResource resource : computePrefList){
- ComputeHostPreferenceAppCatalogResourceAppCat cmP = (ComputeHostPreferenceAppCatalogResourceAppCat) resource;
+ ComputeHostPreferenceResource cmP = (ComputeHostPreferenceResource) resource;
if (cmP.getResourceId() != null && !cmP.getResourceId().equals("")){
if (cmP.getResourceId().equals(hostId)){
return AppCatalogThriftConversion.getComputeResourcePreference(cmP);
@@ -202,7 +202,7 @@ public class GwyResourceProfileImpl implements GwyResourceProfile {
@Override
public List<ComputeResourcePreference> getAllComputeResourcePreferences(String gatewayId) throws AppCatalogException {
try {
- ComputeHostPreferenceAppCatalogResourceAppCat prefResource = new ComputeHostPreferenceAppCatalogResourceAppCat();
+ ComputeHostPreferenceResource prefResource = new ComputeHostPreferenceResource();
List<AppCatalogResource> computePrefList = prefResource.get(AppCatAbstractResource.ComputeResourcePreferenceConstants.GATEWAY_ID, gatewayId);
return AppCatalogThriftConversion.getComputeResourcePreferences(computePrefList);
}catch (Exception e) {
@@ -214,12 +214,12 @@ public class GwyResourceProfileImpl implements GwyResourceProfile {
@Override
public List<String> getGatewayProfileIds(String gatewayName) throws AppCatalogException {
try {
- GatewayProfileAppCatalogResourceAppCat profileResource = new GatewayProfileAppCatalogResourceAppCat();
+ GatewayProfileResource profileResource = new GatewayProfileResource();
List<AppCatalogResource> resourceList = profileResource.get(AppCatAbstractResource.GatewayProfileConstants.GATEWAY_ID, gatewayName);
List<String> gatewayIds = new ArrayList<String>();
if (resourceList != null && !resourceList.isEmpty()){
for (AppCatalogResource resource : resourceList){
- gatewayIds.add(((GatewayProfileAppCatalogResourceAppCat)resource).getGatewayID());
+ gatewayIds.add(((GatewayProfileResource)resource).getGatewayID());
}
}
return gatewayIds;
@@ -233,11 +233,11 @@ public class GwyResourceProfileImpl implements GwyResourceProfile {
public List<GatewayResourceProfile> getAllGatewayProfiles() throws AppCatalogException {
try {
List<GatewayResourceProfile> gatewayResourceProfileList = new ArrayList<GatewayResourceProfile>();
- GatewayProfileAppCatalogResourceAppCat profileResource = new GatewayProfileAppCatalogResourceAppCat();
+ GatewayProfileResource profileResource = new GatewayProfileResource();
List<AppCatalogResource> resourceList = profileResource.getAll();
if (resourceList != null && !resourceList.isEmpty()){
for (AppCatalogResource resource : resourceList){
- GatewayProfileAppCatalogResourceAppCat gatewayProfileResource = (GatewayProfileAppCatalogResourceAppCat)resource;
+ GatewayProfileResource gatewayProfileResource = (GatewayProfileResource)resource;
List<ComputeResourcePreference> computeResourcePreferences = getAllComputeResourcePreferences(gatewayProfileResource.getGatewayID());
GatewayResourceProfile gatewayResourceProfile = AppCatalogThriftConversion.getGatewayResourceProfile(gatewayProfileResource, computeResourcePreferences);
gatewayResourceProfileList.add(gatewayResourceProfile);
http://git-wip-us.apache.org/repos/asf/airavata/blob/4045c094/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/WorkflowCatalogImpl.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/WorkflowCatalogImpl.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/WorkflowCatalogImpl.java
index 3a400cc..da3d66b 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/WorkflowCatalogImpl.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/WorkflowCatalogImpl.java
@@ -44,7 +44,7 @@ public class WorkflowCatalogImpl implements WorkflowCatalog {
public List<String> getAllWorkflows(String gatewayId) throws AppCatalogException {
List<String> workflowIds = new ArrayList<String>();
try {
- WorkflowAppCatalogResourceAppCat resource = new WorkflowAppCatalogResourceAppCat();
+ WorkflowResource resource = new WorkflowResource();
resource.setGatewayId(gatewayId);
workflowIds = resource.getAllIds();
} catch (Exception e) {
@@ -57,8 +57,8 @@ public class WorkflowCatalogImpl implements WorkflowCatalog {
@Override
public Workflow getWorkflow(String workflowTemplateId) throws AppCatalogException {
try {
- WorkflowAppCatalogResourceAppCat resource = new WorkflowAppCatalogResourceAppCat();
- WorkflowAppCatalogResourceAppCat wfResource = (WorkflowAppCatalogResourceAppCat)resource.get(workflowTemplateId);
+ WorkflowResource resource = new WorkflowResource();
+ WorkflowResource wfResource = (WorkflowResource)resource.get(workflowTemplateId);
return AppCatalogThriftConversion.getWorkflow(wfResource);
} catch (Exception e) {
logger.error("Error while retrieving the workflow...", e);
@@ -69,7 +69,7 @@ public class WorkflowCatalogImpl implements WorkflowCatalog {
@Override
public void deleteWorkflow(String workflowTemplateId) throws AppCatalogException {
try {
- WorkflowAppCatalogResourceAppCat resource = new WorkflowAppCatalogResourceAppCat();
+ WorkflowResource resource = new WorkflowResource();
resource.remove(workflowTemplateId);
} catch (Exception e) {
logger.error("Error while deleting the workflow...", e);
@@ -80,7 +80,7 @@ public class WorkflowCatalogImpl implements WorkflowCatalog {
@Override
public String registerWorkflow(Workflow workflow, String gatewayId) throws AppCatalogException {
try {
- WorkflowAppCatalogResourceAppCat resource = new WorkflowAppCatalogResourceAppCat();
+ WorkflowResource resource = new WorkflowResource();
resource.setWfTemplateId(AppCatalogUtils.getID(workflow.getName()));
resource.setWfName(workflow.getName());
resource.setGraph(workflow.getGraph());
@@ -93,7 +93,7 @@ public class WorkflowCatalogImpl implements WorkflowCatalog {
List<InputDataObjectType> workflowInputs = workflow.getWorkflowInputs();
if (workflowInputs != null && workflowInputs.size() != 0){
for (InputDataObjectType input : workflowInputs){
- WorkflowInputAppCatalogResourceAppCat wfInputResource = new WorkflowInputAppCatalogResourceAppCat();
+ WorkflowInputResource wfInputResource = new WorkflowInputResource();
wfInputResource.setWorkflowResource(resource);
wfInputResource.setInputKey(input.getName());
wfInputResource.setInputVal(input.getValue());
@@ -109,7 +109,7 @@ public class WorkflowCatalogImpl implements WorkflowCatalog {
List<OutputDataObjectType> workflowOutputs = workflow.getWorkflowOutputs();
if (workflowOutputs != null && workflowOutputs.size() != 0){
for (OutputDataObjectType output : workflowOutputs){
- WorkflowOutputAppCatalogResourceAppCat outputResource = new WorkflowOutputAppCatalogResourceAppCat();
+ WorkflowOutputResource outputResource = new WorkflowOutputResource();
outputResource.setWorkflowResource(resource);
outputResource.setOutputKey(output.getName());
outputResource.setOutputVal(output.getValue());
@@ -128,8 +128,8 @@ public class WorkflowCatalogImpl implements WorkflowCatalog {
@Override
public void updateWorkflow(String workflowTemplateId, Workflow workflow) throws AppCatalogException {
try {
- WorkflowAppCatalogResourceAppCat resource = new WorkflowAppCatalogResourceAppCat();
- WorkflowAppCatalogResourceAppCat existingWF = (WorkflowAppCatalogResourceAppCat)resource.get(workflowTemplateId);
+ WorkflowResource resource = new WorkflowResource();
+ WorkflowResource existingWF = (WorkflowResource)resource.get(workflowTemplateId);
existingWF.setWfName(workflow.getName());
existingWF.setGraph(workflow.getGraph());
if (workflow.getImage() != null){
@@ -139,11 +139,11 @@ public class WorkflowCatalogImpl implements WorkflowCatalog {
List<InputDataObjectType> existingwFInputs = workflow.getWorkflowInputs();
if (existingwFInputs != null && existingwFInputs.size() != 0){
for (InputDataObjectType input : existingwFInputs){
- WorkflowInputAppCatalogResourceAppCat wfInputResource = new WorkflowInputAppCatalogResourceAppCat();
+ WorkflowInputResource wfInputResource = new WorkflowInputResource();
Map<String, String> ids = new HashMap<String, String>();
ids.put(AppCatAbstractResource.WFInputConstants.WF_TEMPLATE_ID,existingWF.getWfTemplateId());
ids.put(AppCatAbstractResource.WFInputConstants.INPUT_KEY,input.getName());
- WorkflowInputAppCatalogResourceAppCat existingInput = (WorkflowInputAppCatalogResourceAppCat)wfInputResource.get(ids);
+ WorkflowInputResource existingInput = (WorkflowInputResource)wfInputResource.get(ids);
existingInput.setWorkflowResource(existingWF);
existingInput.setInputKey(input.getName());
existingInput.setInputVal(input.getValue());
@@ -159,11 +159,11 @@ public class WorkflowCatalogImpl implements WorkflowCatalog {
List<OutputDataObjectType> workflowOutputs = workflow.getWorkflowOutputs();
if (workflowOutputs != null && workflowOutputs.size() != 0){
for (OutputDataObjectType output : workflowOutputs){
- WorkflowOutputAppCatalogResourceAppCat outputResource = new WorkflowOutputAppCatalogResourceAppCat();
+ WorkflowOutputResource outputResource = new WorkflowOutputResource();
Map<String, String> ids = new HashMap<String, String>();
ids.put(AppCatAbstractResource.WFOutputConstants.WF_TEMPLATE_ID,existingWF.getWfTemplateId());
ids.put(AppCatAbstractResource.WFOutputConstants.OUTPUT_KEY,output.getName());
- WorkflowOutputAppCatalogResourceAppCat existingOutput = (WorkflowOutputAppCatalogResourceAppCat)outputResource.get(ids);
+ WorkflowOutputResource existingOutput = (WorkflowOutputResource)outputResource.get(ids);
existingOutput.setWorkflowResource(existingWF);
existingOutput.setOutputKey(output.getName());
existingOutput.setOutputVal(output.getValue());
@@ -181,10 +181,10 @@ public class WorkflowCatalogImpl implements WorkflowCatalog {
@Override
public String getWorkflowTemplateId(String workflowName) throws AppCatalogException {
try {
- WorkflowAppCatalogResourceAppCat resource = new WorkflowAppCatalogResourceAppCat();
+ WorkflowResource resource = new WorkflowResource();
List<AppCatalogResource> resourceList = resource.get(AppCatAbstractResource.WorkflowConstants.WF_NAME, workflowName);
if (resourceList != null && !resourceList.isEmpty()){
- WorkflowAppCatalogResourceAppCat wfResource = (WorkflowAppCatalogResourceAppCat)resourceList.get(0);
+ WorkflowResource wfResource = (WorkflowResource)resourceList.get(0);
return wfResource.getWfTemplateId();
}
} catch (Exception e) {
@@ -197,7 +197,7 @@ public class WorkflowCatalogImpl implements WorkflowCatalog {
@Override
public boolean isWorkflowExistWithName(String workflowName) throws AppCatalogException {
try {
- WorkflowAppCatalogResourceAppCat resource = new WorkflowAppCatalogResourceAppCat();
+ WorkflowResource resource = new WorkflowResource();
List<AppCatalogResource> resourceList = resource.get(AppCatAbstractResource.WorkflowConstants.WF_NAME, workflowName);
if (resourceList != null && !resourceList.isEmpty()){
return true;
@@ -211,15 +211,15 @@ public class WorkflowCatalogImpl implements WorkflowCatalog {
@Override
public void updateWorkflowOutputs(String workflowTemplateId, List<OutputDataObjectType> workflowOutputs) throws AppCatalogException {
- WorkflowAppCatalogResourceAppCat resource = new WorkflowAppCatalogResourceAppCat();
- WorkflowAppCatalogResourceAppCat existingWF = (WorkflowAppCatalogResourceAppCat)resource.get(workflowTemplateId);
+ WorkflowResource resource = new WorkflowResource();
+ WorkflowResource existingWF = (WorkflowResource)resource.get(workflowTemplateId);
if (workflowOutputs != null && workflowOutputs.size() != 0) {
for (OutputDataObjectType output : workflowOutputs) {
- WorkflowOutputAppCatalogResourceAppCat outputResource = new WorkflowOutputAppCatalogResourceAppCat();
+ WorkflowOutputResource outputResource = new WorkflowOutputResource();
Map<String, String> ids = new HashMap<String, String>();
ids.put(AppCatAbstractResource.WFOutputConstants.WF_TEMPLATE_ID, existingWF.getWfTemplateId());
ids.put(AppCatAbstractResource.WFOutputConstants.OUTPUT_KEY, output.getName());
- WorkflowOutputAppCatalogResourceAppCat existingOutput = (WorkflowOutputAppCatalogResourceAppCat) outputResource.get(ids);
+ WorkflowOutputResource existingOutput = (WorkflowOutputResource) outputResource.get(ids);
existingOutput.setWorkflowResource(existingWF);
existingOutput.setOutputKey(output.getName());
existingOutput.setOutputVal(output.getValue());