airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject git commit: adding util classes to create experiment thrift models - AIRAVATA-1006
Date Tue, 11 Feb 2014 19:40:30 GMT
Updated Branches:
  refs/heads/master b1c360366 -> daa536fb2


adding util classes to create experiment thrift models - AIRAVATA-1006


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

Branch: refs/heads/master
Commit: daa536fb2a4c9e0ba021d11d026789626ed4cca2
Parents: b1c3603
Author: chathuri <chathuri@apache.org>
Authored: Tue Feb 11 14:40:21 2014 -0500
Committer: chathuri <chathuri@apache.org>
Committed: Tue Feb 11 14:40:21 2014 -0500

----------------------------------------------------------------------
 .../model/util/ExperimentModelUtil.java         | 126 +++++++++++++++++++
 .../core/impl/EmbeddedGFACJobSubmitter.java     |   2 -
 .../orchestrator/core/NewOrchestratorTest.java  |   8 +-
 .../registry/jpa/impl/RegistryImpl.java         |   8 +-
 modules/registry/airavata-registry-test/pom.xml |  16 ++-
 .../api/test/AiravataRegistryAPITest.java       |   2 +-
 .../registry/api/test/util/Initialize.java      |   9 +-
 .../airavata/registry/cpi/ChildDataType.java    |  10 ++
 .../registry/cpi/DependentDataType.java         |  10 --
 .../airavata/registry/cpi/ParentDataType.java   |  12 ++
 .../apache/airavata/registry/cpi/Registry.java  |  21 +---
 .../airavata/registry/cpi/TopLevelDataType.java |  12 --
 12 files changed, 175 insertions(+), 61 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/daa536fb/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/util/ExperimentModelUtil.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/util/ExperimentModelUtil.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/util/ExperimentModelUtil.java
new file mode 100644
index 0000000..2f1bc6d
--- /dev/null
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/util/ExperimentModelUtil.java
@@ -0,0 +1,126 @@
+/*
+ *
+ * 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.model.util;
+
+import org.apache.airavata.model.experiment.*;
+
+import java.util.Map;
+
+
+public class ExperimentModelUtil {
+    public static BasicMetadata createExperimentBasicMetadata (String experimentName,
+                                                               String expDescription,
+                                                               String userName,
+                                                               String projectID,
+                                                               boolean shareExp){
+        BasicMetadata basicMetadata = new BasicMetadata();
+        basicMetadata.setUserName(userName);
+        basicMetadata.setExperimentDescription(expDescription);
+        basicMetadata.setExperimentName(experimentName);
+        basicMetadata.setProjectID(projectID);
+        basicMetadata.setShareExperimentPublicly(shareExp);
+        return basicMetadata;
+    }
+
+    public static  ConfigurationData createConfigData (String applicationId,
+                                                       String applicationVersion,
+                                                       String workflowId,
+                                                       String workflowVersion,
+                                                       BasicMetadata basicMetadata,
+                                                       Map<String, String> experimentInputs,
+                                                       ComputationalResourceScheduling resourceScheduling,
+                                                       AdvancedInputDataHandling inputDataHandling,
+                                                       AdvancedOutputDataHandling outputDataHandling,
+                                                       QualityOfServiceParams qosParms){
+        ConfigurationData configData = new ConfigurationData();
+        configData.setApplicationId(applicationId);
+        configData.setApplicationVersion(applicationVersion);
+        configData.setWorkflowTemplateId(workflowId);
+        configData.setWorklfowTemplateVersion(workflowVersion);
+        configData.setBasicMetadata(basicMetadata);
+        configData.setExperimentInputs(experimentInputs);
+        configData.setComputationalResourceScheduling(resourceScheduling);
+        configData.setAdvanceInputDataHandling(inputDataHandling);
+        configData.setAdvanceOutputDataHandling(outputDataHandling);
+        configData.setQosParams(qosParms);
+        return configData;
+    }
+
+    public static ComputationalResourceScheduling createComputationResourceScheduling (boolean
airavataAutoSchedule,
+                                                       boolean overrideManualSchedulingParams,
+                                                       String resourceHostId,
+                                                       int cpuCount,
+                                                       int nodeCount,
+                                                       int numberOfThreads,
+                                                       String queueName,
+                                                       int wallTimeLimit,
+                                                       long jobstartTime,
+                                                       int totalPhysicalMemory,
+                                                       String projectAccount){
+
+        ComputationalResourceScheduling cmRS = new ComputationalResourceScheduling();
+        cmRS.setAiravataAutoSchedule(airavataAutoSchedule);
+        cmRS.setOverrideManualScheduledParams(overrideManualSchedulingParams);
+        cmRS.setResourceHostId(resourceHostId);
+        cmRS.setTotalCPUCount(cpuCount);
+        cmRS.setNodeCount(nodeCount);
+        cmRS.setNumberOfThreads(numberOfThreads);
+        cmRS.setQueueName(queueName);
+        cmRS.setWallTimeLimit(wallTimeLimit);
+        cmRS.setJobStartTime((int)jobstartTime);
+        cmRS.setTotalPhysicalMemory(totalPhysicalMemory);
+        cmRS.setComputationalProjectAccount(projectAccount);
+        return cmRS;
+    }
+
+    public static AdvancedInputDataHandling createAdvancedInputHandling (boolean stageInputFilesToWorkingDir,
+                                                                         String workingDirParent,
+                                                                         String uniqueWorkingDir,
+                                                                         boolean cleanupAfterJob){
+        AdvancedInputDataHandling inputDataHandling = new AdvancedInputDataHandling();
+        inputDataHandling.setStageInputFilesToWorkingDir(stageInputFilesToWorkingDir);
+        inputDataHandling.setWorkingDirectoryParent(workingDirParent);
+        inputDataHandling.setUniqueWorkingDirectory(uniqueWorkingDir);
+        inputDataHandling.setCleanUpWorkingDirAfterJob(cleanupAfterJob);
+        return inputDataHandling;
+    }
+
+    public static AdvancedOutputDataHandling createOutputDataHandling (String outputDatadir,
+                                                                       String dataRegUrl,
+                                                                       boolean persistOutput){
+        AdvancedOutputDataHandling outputDataHandling = new AdvancedOutputDataHandling();
+        outputDataHandling.setOutputdataDir(outputDatadir);
+        outputDataHandling.setDataRegistryURL(dataRegUrl);
+        outputDataHandling.setPersistOutputData(persistOutput);
+        return outputDataHandling;
+    }
+
+    public static QualityOfServiceParams createQOSParams (String startExecutionAt,
+                                                          String executeBefore,
+                                                          int numberOfRetires){
+        QualityOfServiceParams qosParams = new QualityOfServiceParams();
+        qosParams.setStartExecutionAt(startExecutionAt);
+        qosParams.setExecuteBefore(executeBefore);
+        qosParams.setNumberofRetries(numberOfRetires);
+        return qosParams;
+    }
+}

http://git-wip-us.apache.org/repos/asf/airavata/blob/daa536fb/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/impl/EmbeddedGFACJobSubmitter.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/impl/EmbeddedGFACJobSubmitter.java
b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/impl/EmbeddedGFACJobSubmitter.java
index cde97bd..6806989 100644
--- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/impl/EmbeddedGFACJobSubmitter.java
+++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/impl/EmbeddedGFACJobSubmitter.java
@@ -47,8 +47,6 @@ import org.apache.airavata.orchestrator.core.job.JobSubmitter;
 import org.apache.airavata.orchestrator.core.utils.OrchestratorUtils;
 import org.apache.airavata.registry.api.JobRequest;
 import org.apache.airavata.registry.cpi.DataType;
-import org.apache.airavata.registry.cpi.DependentDataType;
-import org.apache.airavata.registry.cpi.TopLevelDataType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/daa536fb/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/NewOrchestratorTest.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/NewOrchestratorTest.java
b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/NewOrchestratorTest.java
index d37f7df..99654d4 100644
--- a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/NewOrchestratorTest.java
+++ b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/NewOrchestratorTest.java
@@ -35,9 +35,9 @@ import org.apache.airavata.orchestrator.cpi.Orchestrator;
 import org.apache.airavata.orchestrator.cpi.impl.SimpleOrchestratorImpl;
 import org.apache.airavata.persistance.registry.jpa.impl.RegistryImpl;
 import org.apache.airavata.registry.api.JobRequest;
-import org.apache.airavata.registry.cpi.DependentDataType;
+import org.apache.airavata.registry.cpi.ChildDataType;
+import org.apache.airavata.registry.cpi.ParentDataType;
 import org.apache.airavata.registry.cpi.Registry;
-import org.apache.airavata.registry.cpi.TopLevelDataType;
 import org.apache.airavata.schemas.gfac.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -144,8 +144,8 @@ public class NewOrchestratorTest extends AbstractOrchestratorTest{
            configurationData.setApplicationId("Echo");
 
            Registry registry = new RegistryImpl();
-           experimentID = (String) registry.add(TopLevelDataType.EXPERIMENT_BASIC_DATA, basicMetadata);
-           registry.add(DependentDataType.EXPERIMENT_CONFIGURATION_DATA, configurationData,
experimentID);
+           experimentID = (String) registry.add(ParentDataType.EXPERIMENT_BASIC_DATA, basicMetadata);
+           registry.add(ChildDataType.EXPERIMENT_CONFIGURATION_DATA, configurationData, experimentID);
        }
 
        @Test

http://git-wip-us.apache.org/repos/asf/airavata/blob/daa536fb/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/RegistryImpl.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/RegistryImpl.java
b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/RegistryImpl.java
index d2e661d..bc076b9 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/RegistryImpl.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/RegistryImpl.java
@@ -23,9 +23,9 @@ package org.apache.airavata.persistance.registry.jpa.impl;
 
 import org.apache.airavata.model.experiment.BasicMetadata;
 import org.apache.airavata.model.experiment.ConfigurationData;
+import org.apache.airavata.registry.cpi.ChildDataType;
 import org.apache.airavata.registry.cpi.DataType;
-import org.apache.airavata.registry.cpi.TopLevelDataType;
-import org.apache.airavata.registry.cpi.DependentDataType;
+import org.apache.airavata.registry.cpi.ParentDataType;
 import org.apache.airavata.registry.cpi.Registry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -47,7 +47,7 @@ public class RegistryImpl implements Registry {
      * @return return the identifier to identify the object
      */
     @Override
-    public Object add(TopLevelDataType dataType, Object newObjectToAdd) {
+    public Object add(ParentDataType dataType, Object newObjectToAdd) {
         switch (dataType){
             case EXPERIMENT_BASIC_DATA:
                 return experimentRegistry.add((BasicMetadata) newObjectToAdd);
@@ -69,7 +69,7 @@ public class RegistryImpl implements Registry {
      *                            null
      */
     @Override
-    public void add(DependentDataType dataType, Object newObjectToAdd, Object dependentIdentifier)
{
+    public void add(ChildDataType dataType, Object newObjectToAdd, Object dependentIdentifier)
{
         switch (dataType){
             case EXPERIMENT_CONFIGURATION_DATA:
                 experimentRegistry.add((ConfigurationData)newObjectToAdd, (String)dependentIdentifier);

http://git-wip-us.apache.org/repos/asf/airavata/blob/daa536fb/modules/registry/airavata-registry-test/pom.xml
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-registry-test/pom.xml b/modules/registry/airavata-registry-test/pom.xml
index 6869a27..0008240 100644
--- a/modules/registry/airavata-registry-test/pom.xml
+++ b/modules/registry/airavata-registry-test/pom.xml
@@ -40,11 +40,11 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-        	<groupId>org.apache.openjpa</groupId>
-        	<artifactId>openjpa-all</artifactId>
-        	<version>2.2.0</version>
-        </dependency>
+        <!--<dependency>-->
+        	<!--<groupId>org.apache.openjpa</groupId>-->
+        	<!--<artifactId>openjpa-all</artifactId>-->
+        	<!--<version>2.2.0</version>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-registry-api</artifactId>
@@ -85,6 +85,12 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.airavata</groupId>
+            <artifactId>airavata-data-models</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
         <!--dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-workflow-model-core</artifactId>

http://git-wip-us.apache.org/repos/asf/airavata/blob/daa536fb/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/AiravataRegistryAPITest.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/AiravataRegistryAPITest.java
b/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/AiravataRegistryAPITest.java
index b075075..ff3c3d3 100644
--- a/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/AiravataRegistryAPITest.java
+++ b/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/AiravataRegistryAPITest.java
@@ -855,7 +855,7 @@ public class AiravataRegistryAPITest extends TestCase {
         registry.addWorkspaceProject(workspaceProject2);
 
         List<WorkspaceProject> workspaceProjects = registry.getWorkspaceProjects();
-        assertTrue("workspace projects retrieved successfully", workspaceProjects.size()
== 2);
+        assertTrue("workspace projects retrieved successfully", workspaceProjects.size()
== 3);
 
         registry.deleteWorkspaceProject("testProject1");
         registry.deleteWorkspaceProject("testProject2");

http://git-wip-us.apache.org/repos/asf/airavata/blob/daa536fb/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/util/Initialize.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/util/Initialize.java
b/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/util/Initialize.java
index 95238a6..af99b7e 100644
--- a/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/util/Initialize.java
+++ b/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/util/Initialize.java
@@ -23,10 +23,7 @@ package org.apache.airavata.registry.api.test.util;
 
 import org.apache.airavata.common.utils.DerbyUtil;
 import org.apache.airavata.persistance.registry.jpa.ResourceType;
-import org.apache.airavata.persistance.registry.jpa.resources.GatewayResource;
-import org.apache.airavata.persistance.registry.jpa.resources.UserResource;
-import org.apache.airavata.persistance.registry.jpa.resources.Utils;
-import org.apache.airavata.persistance.registry.jpa.resources.WorkerResource;
+import org.apache.airavata.persistance.registry.jpa.resources.*;
 import org.apache.airavata.registry.api.exception.RegistrySettingsException;
 import org.apache.airavata.registry.api.util.RegistrySettings;
 import org.slf4j.Logger;
@@ -125,6 +122,10 @@ public class Initialize {
             WorkerResource workerResource = (WorkerResource) gatewayResource.create(ResourceType.GATEWAY_WORKER);
             workerResource.setUser(userResource.getUserName());
             workerResource.save();
+
+            ProjectResource projectResource = workerResource.createProject("default");
+            projectResource.setGateway(gatewayResource);
+            projectResource.save();
         } catch (RegistrySettingsException e) {
             logger.error("Unable to read properties", e);
         }

http://git-wip-us.apache.org/repos/asf/airavata/blob/daa536fb/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ChildDataType.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ChildDataType.java
b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ChildDataType.java
new file mode 100644
index 0000000..749e974
--- /dev/null
+++ b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ChildDataType.java
@@ -0,0 +1,10 @@
+package org.apache.airavata.registry.cpi;
+
+public enum ChildDataType {
+    EXPERIMENT_SUMMARY,
+    EXPERIMENT_CONFIGURATION_DATA,
+    EXPERIMENT_GENERATED_DATA,
+    MONITORING_DATA,
+    PROVENANCE_DATA,
+    EXECUTION_ERROR
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/daa536fb/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/DependentDataType.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/DependentDataType.java
b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/DependentDataType.java
deleted file mode 100644
index 843f543..0000000
--- a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/DependentDataType.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.apache.airavata.registry.cpi;
-
-public enum DependentDataType {
-    EXPERIMENT_SUMMARY,
-    EXPERIMENT_CONFIGURATION_DATA,
-    EXPERIMENT_GENERATED_DATA,
-    MONITORING_DATA,
-    PROVENANCE_DATA,
-    EXECUTION_ERROR
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/daa536fb/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ParentDataType.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ParentDataType.java
b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ParentDataType.java
new file mode 100644
index 0000000..ea210d5
--- /dev/null
+++ b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ParentDataType.java
@@ -0,0 +1,12 @@
+package org.apache.airavata.registry.cpi;
+
+public enum ParentDataType {
+    APPLiCATION_CATALOG,
+    GROUP,
+    USER,
+    PROJECT,
+    EXPERIMENT_BASIC_DATA
+}
+
+
+

http://git-wip-us.apache.org/repos/asf/airavata/blob/daa536fb/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/Registry.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/Registry.java
b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/Registry.java
index 1ec2642..cae3e54 100644
--- a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/Registry.java
+++ b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/Registry.java
@@ -1,8 +1,5 @@
 package org.apache.airavata.registry.cpi;
 
-import org.apache.airavata.registry.cpi.utils.Constants;
-
-import javax.xml.crypto.Data;
 import java.util.List;
 
 /**
@@ -19,7 +16,7 @@ public interface Registry {
      *                       etc
      * @return return the identifier to identify the object
      */
-    public Object add(TopLevelDataType dataType, Object newObjectToAdd);
+    public Object add(ParentDataType dataType, Object newObjectToAdd);
 
     /**
      * This method is to add an object in to the registry
@@ -32,7 +29,7 @@ public interface Registry {
      *                            level object in the data model. If it is a top level object,
programmer can pass it as
      *                            null
      */
-    public void add(DependentDataType dataType, Object newObjectToAdd, Object dependentIdentifier);
+    public void add(ChildDataType dataType, Object newObjectToAdd, Object dependentIdentifier);
 
     /**
      * This method is to update the whole object in registry
@@ -46,20 +43,6 @@ public interface Registry {
      */
     public void update(DataType dataType, Object newObjectToUpdate, Object identifier);
 
-//    /**
-//     * This method is to update the whole object in registry
-//     * @param dataType Data type is a predefined type which the programmer should choose
according to the object he
-//     *                 is going to save in to registry
-//     * @param newObjectToUpdate Object which contains the fields that need to be updated
in to registry. This object is a
-//     *                       thrift model object. In experiment case this object can be
BasicMetadata, ConfigurationData
-//     *                       etc. CPI programmer can only fill necessary fields that need
to be updated. He does not
-//     *                       have to fill the whole object. He needs to only fill the mandatory
fields and whatever the
-//     *                       other fields that need to be updated.
-//     * @param dependentIdentifier Object which contains the identifier if the object that
is going to add is not a top
-//     *                            level object in the data model. If it is a top level
object, programmer can pass it as
-//     *                            null
-//     */
-//    public void update(DependentDataType dataType, Object newObjectToUpdate, Object dependentIdentifier);
 
     /**
      * This method is to update a specific field of the data model

http://git-wip-us.apache.org/repos/asf/airavata/blob/daa536fb/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/TopLevelDataType.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/TopLevelDataType.java
b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/TopLevelDataType.java
deleted file mode 100644
index 5262192..0000000
--- a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/TopLevelDataType.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.apache.airavata.registry.cpi;
-
-public enum TopLevelDataType {
-    APPLiCATION_CATALOG,
-    GROUP,
-    USER,
-    PROJECT,
-    EXPERIMENT_BASIC_DATA
-}
-
-
-


Mime
View raw message