Repository: airavata Updated Branches: refs/heads/master cf7290a28 -> 557aa6889
fixing data type Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/557aa688 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/557aa688 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/557aa688 Branch: refs/heads/master Commit: 557aa6889c81eac6f9624e1fc852c84e66010cfc Parents: cf7290a Author: Chathuri Wimalasena <[email protected]> Authored: Tue Dec 23 16:29:34 2014 -0500 Committer: Chathuri Wimalasena <[email protected]> Committed: Tue Dec 23 16:29:34 2014 -0500 ---------------------------------------------------------------------- .../data/impl/ApplicationInterfaceImpl.java | 28 ++++++ .../registry/jpa/impl/ExperimentRegistry.java | 92 ++++++++++++++++++++ 2 files changed, 120 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/557aa688/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationInterfaceImpl.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationInterfaceImpl.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationInterfaceImpl.java index 67bd1bc..c5bd9c6 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationInterfaceImpl.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationInterfaceImpl.java @@ -104,6 +104,12 @@ public class ApplicationInterfaceImpl implements ApplicationInterface { inputResource.setStandardInput(input.isStandardInput()); inputResource.setAppArgument(input.getApplicationArgument()); inputResource.setInputOrder(input.getInputOrder()); + if (input.getInputValid() != null){ + inputResource.setValidityType(input.getInputValid().toString()); + } + if (input.getAddedToCommandLine() != null){ + inputResource.setCommandLineType(input.getAddedToCommandLine().toString()); + } inputResource.save(); } } @@ -117,6 +123,14 @@ public class ApplicationInterfaceImpl implements ApplicationInterface { outputResource.setOutputKey(output.getName()); outputResource.setOutputVal(output.getValue()); outputResource.setDataType(output.getType().toString()); + if (output.getValidityType() != null){ + outputResource.setValidityType(output.getValidityType().toString()); + } + if (output.getAddedToCommandLine() != null){ + outputResource.setCommandLineType(output.getAddedToCommandLine().toString()); + } + outputResource.setDataMovement(output.isDataMovement()); + outputResource.setDataNameLocation(output.getDataNameLocation()); outputResource.save(); } } @@ -220,6 +234,12 @@ public class ApplicationInterfaceImpl implements ApplicationInterface { inputResource.setStandardInput(input.isStandardInput()); inputResource.setAppArgument(input.getApplicationArgument()); inputResource.setInputOrder(input.getInputOrder()); + if (input.getInputValid() != null){ + inputResource.setValidityType(input.getInputValid().toString()); + } + if (input.getAddedToCommandLine() != null){ + inputResource.setCommandLineType(input.getAddedToCommandLine().toString()); + } inputResource.save(); } } @@ -244,6 +264,14 @@ public class ApplicationInterfaceImpl implements ApplicationInterface { outputResource.setOutputKey(output.getName()); outputResource.setOutputVal(output.getValue()); outputResource.setDataType(output.getType().toString()); + if (output.getValidityType() != null){ + outputResource.setValidityType(output.getValidityType().toString()); + } + if (output.getAddedToCommandLine() != null){ + outputResource.setCommandLineType(output.getAddedToCommandLine().toString()); + } + outputResource.setDataMovement(output.isDataMovement()); + outputResource.setDataNameLocation(output.getDataNameLocation()); outputResource.save(); } } http://git-wip-us.apache.org/repos/asf/airavata/blob/557aa688/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java index 5768a0d..b790ea0 100644 --- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java +++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java @@ -276,6 +276,12 @@ public class ExperimentRegistry { resource.setMetadata(input.getMetaData()); resource.setAppArgument(input.getApplicationArgument()); resource.setInputOrder(input.getInputOrder()); + if (input.getInputValid() != null){ + resource.setValidityType(input.getInputValid().toString()); + } + if (input.getAddedToCommandLine() != null){ + resource.setCommandLineType(input.getAddedToCommandLine().toString()); + } resource.save(); } } catch (Exception e) { @@ -297,6 +303,12 @@ public class ExperimentRegistry { exinput.setMetadata(input.getMetaData()); exinput.setAppArgument(input.getApplicationArgument()); exinput.setInputOrder(input.getInputOrder()); + if (input.getInputValid() != null){ + exinput.setValidityType(input.getInputValid().toString()); + } + if (input.getAddedToCommandLine() != null){ + exinput.setCommandLineType(input.getAddedToCommandLine().toString()); + } exinput.save(); } } @@ -319,6 +331,14 @@ public class ExperimentRegistry { if (output.getType() != null){ resource.setDataType(output.getType().toString()); } + if (output.getValidityType() != null){ + resource.setValidityType(output.getValidityType().toString()); + } + if (output.getAddedToCommandLine() != null){ + resource.setCommandLineType(output.getAddedToCommandLine().toString()); + } + resource.setDataMovement(output.isDataMovement()); + resource.setDataNameLocation(output.getDataNameLocation()); // resource.setMetadata(output.get()); resource.save(); } @@ -342,6 +362,14 @@ public class ExperimentRegistry { if (output.getType() != null){ resource.setDataType(output.getType().toString()); } + if (output.getValidityType() != null){ + resource.setValidityType(output.getValidityType().toString()); + } + if (output.getAddedToCommandLine() != null){ + resource.setCommandLineType(output.getAddedToCommandLine().toString()); + } + resource.setDataMovement(output.isDataMovement()); + resource.setDataNameLocation(output.getDataNameLocation()); // resource.setMetadata(output.getMetaData()); resource.save(); } @@ -365,6 +393,14 @@ public class ExperimentRegistry { if (output.getType() != null){ resource.setDataType(output.getType().toString()); } + if (output.getValidityType() != null){ + resource.setValidityType(output.getValidityType().toString()); + } + if (output.getAddedToCommandLine() != null){ + resource.setCommandLineType(output.getAddedToCommandLine().toString()); + } + resource.setDataMovement(output.isDataMovement()); + resource.setDataNameLocation(output.getDataNameLocation()); // resource.setMetadata(output.getMetaData()); resource.save(); } @@ -388,6 +424,14 @@ public class ExperimentRegistry { if (output.getType() != null){ resource.setDataType(output.getType().toString()); } + if (output.getValidityType() != null){ + resource.setValidityType(output.getValidityType().toString()); + } + if (output.getAddedToCommandLine() != null){ + resource.setCommandLineType(output.getAddedToCommandLine().toString()); + } + resource.setDataMovement(output.isDataMovement()); + resource.setDataNameLocation(output.getDataNameLocation()); // resource.setMetadata(output.getMetaData()); resource.save(); } @@ -411,6 +455,14 @@ public class ExperimentRegistry { if (output.getType() != null){ resource.setDataType(output.getType().toString()); } + if (output.getValidityType() != null){ + resource.setValidityType(output.getValidityType().toString()); + } + if (output.getAddedToCommandLine() != null){ + resource.setCommandLineType(output.getAddedToCommandLine().toString()); + } + resource.setDataMovement(output.isDataMovement()); + resource.setDataNameLocation(output.getDataNameLocation()); // resource.setMetadata(output.getMetaData()); resource.save(); } @@ -822,6 +874,12 @@ public class ExperimentRegistry { resource.setMetadata(input.getMetaData()); resource.setAppArgument(input.getApplicationArgument()); resource.setInputOrder(input.getInputOrder()); + if (input.getInputValid() != null){ + resource.setValidityType(input.getInputValid().toString()); + } + if (input.getAddedToCommandLine() != null){ + resource.setCommandLineType(input.getAddedToCommandLine().toString()); + } resource.save(); } } catch (Exception e) { @@ -845,6 +903,12 @@ public class ExperimentRegistry { resource.setMetadata(input.getMetaData()); resource.setAppArgument(input.getApplicationArgument()); resource.setInputOrder(input.getInputOrder()); + if (input.getInputValid() != null){ + resource.setValidityType(input.getInputValid().toString()); + } + if (input.getAddedToCommandLine() != null){ + resource.setCommandLineType(input.getAddedToCommandLine().toString()); + } resource.save(); } } @@ -1004,6 +1068,12 @@ public class ExperimentRegistry { resource.setMetadata(input.getMetaData()); resource.setAppArgument(input.getApplicationArgument()); resource.setInputOrder(input.getInputOrder()); + if (input.getInputValid() != null){ + resource.setValidityType(input.getInputValid().toString()); + } + if (input.getAddedToCommandLine() != null){ + resource.setCommandLineType(input.getAddedToCommandLine().toString()); + } resource.save(); } } catch (Exception e) { @@ -1023,6 +1093,14 @@ public class ExperimentRegistry { if (output.getType() != null){ resource.setDataType(output.getType().toString()); } + if (output.getValidityType() != null){ + resource.setValidityType(output.getValidityType().toString()); + } + if (output.getAddedToCommandLine() != null){ + resource.setCommandLineType(output.getAddedToCommandLine().toString()); + } + resource.setDataMovement(output.isDataMovement()); + resource.setDataNameLocation(output.getDataNameLocation()); // resource.setMetadata(output.getMetaData()); resource.save(); } @@ -1047,6 +1125,14 @@ public class ExperimentRegistry { if (output.getType() != null){ resource.setDataType(output.getType().toString()); } + if (output.getValidityType() != null){ + resource.setValidityType(output.getValidityType().toString()); + } + if (output.getAddedToCommandLine() != null){ + resource.setCommandLineType(output.getAddedToCommandLine().toString()); + } + resource.setDataMovement(output.isDataMovement()); + resource.setDataNameLocation(output.getDataNameLocation()); // resource.setMetadata(output.getMetaData()); resource.save(); } @@ -1071,6 +1157,12 @@ public class ExperimentRegistry { resource.setMetadata(input.getMetaData()); resource.setAppArgument(input.getApplicationArgument()); resource.setInputOrder(input.getInputOrder()); + if (input.getInputValid() != null){ + resource.setValidityType(input.getInputValid().toString()); + } + if (input.getAddedToCommandLine() != null){ + resource.setCommandLineType(input.getAddedToCommandLine().toString()); + } resource.save(); }
