Fixed additon of the WebDAV datamovement

apache · Aug 6, 2018 · 380e81b · 380e81b
1 parent 50baa2f
commit 380e81b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...pi-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/...pi-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
@@ -3380,7 +3380,7 @@ public boolean updateWebDAVDataMovementDetails(AuthzToken authzToken, String dat
             registryClientPool.returnResource(regClient);
             return result;
         } catch (Exception e) {
-            logger.error(dataMovementInterfaceId, "Error while adding job submission interface to resource compute resource...", e);
+            logger.error(dataMovementInterfaceId, "Error while updating data movement interface to resource compute resource. More info : \"", e);
             AiravataSystemException exception = new AiravataSystemException();
             exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
             exception.setMessage("Error while adding job submission interface to resource compute resource. More info : " + e.getMessage());
@@ -3409,7 +3409,7 @@ public WebDAVDataMovement getWebDAVDataMovement(AuthzToken authzToken, String da
             registryClientPool.returnResource(regClient);
             return result;
         } catch (Exception e) {
-            String errorMsg = "Error while retrieving WebDAV data movement interface to resource compute resource...";
+            String errorMsg = "Error while retrieving WebDAV data movement interface from compute resource...";
             logger.error(dataMovementId, errorMsg, e);
             AiravataSystemException exception = new AiravataSystemException();
             exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);

diff --git a/...src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java b/...src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java
@@ -1768,8 +1768,8 @@ public String addWebDAVDataMovementDetails(String resourceId, DMType dataMoveTyp
             appCatalog = RegistryFactory.getAppCatalog();
             ComputeResource computeResource = appCatalog.getComputeResource();
             String movementInterface = addDataMovementInterface(computeResource, resourceId, dataMoveType,
-                    computeResource.addWebDAVDataMovement(davDataMovement), DataMovementProtocol.SCP, priorityOrder);
-            logger.debug("Airavata registered SCP data movement for resource Id: " + resourceId);
+                    computeResource.addWebDAVDataMovement(davDataMovement), DataMovementProtocol.WebDAV, priorityOrder);
+            logger.debug("Airavata registered WebDAV data movement for resource Id: " + resourceId);
             return movementInterface;
         } catch (AppCatalogException e) {
             logger.error(resourceId, "Error while adding data movement interface to resource compute resource...", e);