airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [42/44] airavata git commit: adding the initial version of the data catalog
Date Wed, 02 Dec 2015 22:55:39 GMT
http://git-wip-us.apache.org/repos/asf/airavata/blob/1a22de16/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataResourceModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataResourceModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataResourceModel.java
new file mode 100644
index 0000000..86bd878
--- /dev/null
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataResourceModel.java
@@ -0,0 +1,1086 @@
+/**
+ * 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.
+ */
+
+/**
+ * Autogenerated by Thrift Compiler (0.9.2)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+package org.apache.airavata.model.data.resource;
+
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import javax.annotation.Generated;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2")
+public class DataResourceModel implements org.apache.thrift.TBase<DataResourceModel, DataResourceModel._Fields>, java.io.Serializable, Cloneable, Comparable<DataResourceModel> {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataResourceModel");
+
+  private static final org.apache.thrift.protocol.TField RESOURCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceId", org.apache.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.thrift.protocol.TField RESOURCE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceName", org.apache.thrift.protocol.TType.STRING, (short)2);
+  private static final org.apache.thrift.protocol.TField RESOURCE_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceDescription", org.apache.thrift.protocol.TType.STRING, (short)3);
+  private static final org.apache.thrift.protocol.TField RESOURCE_SIZE_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceSize", org.apache.thrift.protocol.TType.I32, (short)4);
+  private static final org.apache.thrift.protocol.TField CREATION_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("creationTime", org.apache.thrift.protocol.TType.I64, (short)5);
+  private static final org.apache.thrift.protocol.TField LAST_MODIFIED_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("lastModifiedTime", org.apache.thrift.protocol.TType.I64, (short)6);
+  private static final org.apache.thrift.protocol.TField REPLICA_LOCATIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("replicaLocations", org.apache.thrift.protocol.TType.LIST, (short)7);
+
+  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+  static {
+    schemes.put(StandardScheme.class, new DataResourceModelStandardSchemeFactory());
+    schemes.put(TupleScheme.class, new DataResourceModelTupleSchemeFactory());
+  }
+
+  private String resourceId; // optional
+  private String resourceName; // optional
+  private String resourceDescription; // optional
+  private int resourceSize; // optional
+  private long creationTime; // optional
+  private long lastModifiedTime; // optional
+  private List<DataReplicaLocationModel> replicaLocations; // required
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    RESOURCE_ID((short)1, "resourceId"),
+    RESOURCE_NAME((short)2, "resourceName"),
+    RESOURCE_DESCRIPTION((short)3, "resourceDescription"),
+    RESOURCE_SIZE((short)4, "resourceSize"),
+    CREATION_TIME((short)5, "creationTime"),
+    LAST_MODIFIED_TIME((short)6, "lastModifiedTime"),
+    REPLICA_LOCATIONS((short)7, "replicaLocations");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // RESOURCE_ID
+          return RESOURCE_ID;
+        case 2: // RESOURCE_NAME
+          return RESOURCE_NAME;
+        case 3: // RESOURCE_DESCRIPTION
+          return RESOURCE_DESCRIPTION;
+        case 4: // RESOURCE_SIZE
+          return RESOURCE_SIZE;
+        case 5: // CREATION_TIME
+          return CREATION_TIME;
+        case 6: // LAST_MODIFIED_TIME
+          return LAST_MODIFIED_TIME;
+        case 7: // REPLICA_LOCATIONS
+          return REPLICA_LOCATIONS;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
+  }
+
+  // isset id assignments
+  private static final int __RESOURCESIZE_ISSET_ID = 0;
+  private static final int __CREATIONTIME_ISSET_ID = 1;
+  private static final int __LASTMODIFIEDTIME_ISSET_ID = 2;
+  private byte __isset_bitfield = 0;
+  private static final _Fields optionals[] = {_Fields.RESOURCE_ID,_Fields.RESOURCE_NAME,_Fields.RESOURCE_DESCRIPTION,_Fields.RESOURCE_SIZE,_Fields.CREATION_TIME,_Fields.LAST_MODIFIED_TIME};
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  static {
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.RESOURCE_ID, new org.apache.thrift.meta_data.FieldMetaData("resourceId", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.RESOURCE_NAME, new org.apache.thrift.meta_data.FieldMetaData("resourceName", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.RESOURCE_DESCRIPTION, new org.apache.thrift.meta_data.FieldMetaData("resourceDescription", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.RESOURCE_SIZE, new org.apache.thrift.meta_data.FieldMetaData("resourceSize", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.CREATION_TIME, new org.apache.thrift.meta_data.FieldMetaData("creationTime", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+    tmpMap.put(_Fields.LAST_MODIFIED_TIME, new org.apache.thrift.meta_data.FieldMetaData("lastModifiedTime", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+    tmpMap.put(_Fields.REPLICA_LOCATIONS, new org.apache.thrift.meta_data.FieldMetaData("replicaLocations", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT            , "DataReplicaLocationModel"))));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(DataResourceModel.class, metaDataMap);
+  }
+
+  public DataResourceModel() {
+  }
+
+  public DataResourceModel(
+    List<DataReplicaLocationModel> replicaLocations)
+  {
+    this();
+    this.replicaLocations = replicaLocations;
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public DataResourceModel(DataResourceModel other) {
+    __isset_bitfield = other.__isset_bitfield;
+    if (other.isSetResourceId()) {
+      this.resourceId = other.resourceId;
+    }
+    if (other.isSetResourceName()) {
+      this.resourceName = other.resourceName;
+    }
+    if (other.isSetResourceDescription()) {
+      this.resourceDescription = other.resourceDescription;
+    }
+    this.resourceSize = other.resourceSize;
+    this.creationTime = other.creationTime;
+    this.lastModifiedTime = other.lastModifiedTime;
+    if (other.isSetReplicaLocations()) {
+      List<DataReplicaLocationModel> __this__replicaLocations = new ArrayList<DataReplicaLocationModel>(other.replicaLocations.size());
+      for (DataReplicaLocationModel other_element : other.replicaLocations) {
+        __this__replicaLocations.add(other_element);
+      }
+      this.replicaLocations = __this__replicaLocations;
+    }
+  }
+
+  public DataResourceModel deepCopy() {
+    return new DataResourceModel(this);
+  }
+
+  @Override
+  public void clear() {
+    this.resourceId = null;
+    this.resourceName = null;
+    this.resourceDescription = null;
+    setResourceSizeIsSet(false);
+    this.resourceSize = 0;
+    setCreationTimeIsSet(false);
+    this.creationTime = 0;
+    setLastModifiedTimeIsSet(false);
+    this.lastModifiedTime = 0;
+    this.replicaLocations = null;
+  }
+
+  public String getResourceId() {
+    return this.resourceId;
+  }
+
+  public void setResourceId(String resourceId) {
+    this.resourceId = resourceId;
+  }
+
+  public void unsetResourceId() {
+    this.resourceId = null;
+  }
+
+  /** Returns true if field resourceId is set (has been assigned a value) and false otherwise */
+  public boolean isSetResourceId() {
+    return this.resourceId != null;
+  }
+
+  public void setResourceIdIsSet(boolean value) {
+    if (!value) {
+      this.resourceId = null;
+    }
+  }
+
+  public String getResourceName() {
+    return this.resourceName;
+  }
+
+  public void setResourceName(String resourceName) {
+    this.resourceName = resourceName;
+  }
+
+  public void unsetResourceName() {
+    this.resourceName = null;
+  }
+
+  /** Returns true if field resourceName is set (has been assigned a value) and false otherwise */
+  public boolean isSetResourceName() {
+    return this.resourceName != null;
+  }
+
+  public void setResourceNameIsSet(boolean value) {
+    if (!value) {
+      this.resourceName = null;
+    }
+  }
+
+  public String getResourceDescription() {
+    return this.resourceDescription;
+  }
+
+  public void setResourceDescription(String resourceDescription) {
+    this.resourceDescription = resourceDescription;
+  }
+
+  public void unsetResourceDescription() {
+    this.resourceDescription = null;
+  }
+
+  /** Returns true if field resourceDescription is set (has been assigned a value) and false otherwise */
+  public boolean isSetResourceDescription() {
+    return this.resourceDescription != null;
+  }
+
+  public void setResourceDescriptionIsSet(boolean value) {
+    if (!value) {
+      this.resourceDescription = null;
+    }
+  }
+
+  public int getResourceSize() {
+    return this.resourceSize;
+  }
+
+  public void setResourceSize(int resourceSize) {
+    this.resourceSize = resourceSize;
+    setResourceSizeIsSet(true);
+  }
+
+  public void unsetResourceSize() {
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __RESOURCESIZE_ISSET_ID);
+  }
+
+  /** Returns true if field resourceSize is set (has been assigned a value) and false otherwise */
+  public boolean isSetResourceSize() {
+    return EncodingUtils.testBit(__isset_bitfield, __RESOURCESIZE_ISSET_ID);
+  }
+
+  public void setResourceSizeIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __RESOURCESIZE_ISSET_ID, value);
+  }
+
+  public long getCreationTime() {
+    return this.creationTime;
+  }
+
+  public void setCreationTime(long creationTime) {
+    this.creationTime = creationTime;
+    setCreationTimeIsSet(true);
+  }
+
+  public void unsetCreationTime() {
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __CREATIONTIME_ISSET_ID);
+  }
+
+  /** Returns true if field creationTime is set (has been assigned a value) and false otherwise */
+  public boolean isSetCreationTime() {
+    return EncodingUtils.testBit(__isset_bitfield, __CREATIONTIME_ISSET_ID);
+  }
+
+  public void setCreationTimeIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __CREATIONTIME_ISSET_ID, value);
+  }
+
+  public long getLastModifiedTime() {
+    return this.lastModifiedTime;
+  }
+
+  public void setLastModifiedTime(long lastModifiedTime) {
+    this.lastModifiedTime = lastModifiedTime;
+    setLastModifiedTimeIsSet(true);
+  }
+
+  public void unsetLastModifiedTime() {
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __LASTMODIFIEDTIME_ISSET_ID);
+  }
+
+  /** Returns true if field lastModifiedTime is set (has been assigned a value) and false otherwise */
+  public boolean isSetLastModifiedTime() {
+    return EncodingUtils.testBit(__isset_bitfield, __LASTMODIFIEDTIME_ISSET_ID);
+  }
+
+  public void setLastModifiedTimeIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __LASTMODIFIEDTIME_ISSET_ID, value);
+  }
+
+  public int getReplicaLocationsSize() {
+    return (this.replicaLocations == null) ? 0 : this.replicaLocations.size();
+  }
+
+  public java.util.Iterator<DataReplicaLocationModel> getReplicaLocationsIterator() {
+    return (this.replicaLocations == null) ? null : this.replicaLocations.iterator();
+  }
+
+  public void addToReplicaLocations(DataReplicaLocationModel elem) {
+    if (this.replicaLocations == null) {
+      this.replicaLocations = new ArrayList<DataReplicaLocationModel>();
+    }
+    this.replicaLocations.add(elem);
+  }
+
+  public List<DataReplicaLocationModel> getReplicaLocations() {
+    return this.replicaLocations;
+  }
+
+  public void setReplicaLocations(List<DataReplicaLocationModel> replicaLocations) {
+    this.replicaLocations = replicaLocations;
+  }
+
+  public void unsetReplicaLocations() {
+    this.replicaLocations = null;
+  }
+
+  /** Returns true if field replicaLocations is set (has been assigned a value) and false otherwise */
+  public boolean isSetReplicaLocations() {
+    return this.replicaLocations != null;
+  }
+
+  public void setReplicaLocationsIsSet(boolean value) {
+    if (!value) {
+      this.replicaLocations = null;
+    }
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case RESOURCE_ID:
+      if (value == null) {
+        unsetResourceId();
+      } else {
+        setResourceId((String)value);
+      }
+      break;
+
+    case RESOURCE_NAME:
+      if (value == null) {
+        unsetResourceName();
+      } else {
+        setResourceName((String)value);
+      }
+      break;
+
+    case RESOURCE_DESCRIPTION:
+      if (value == null) {
+        unsetResourceDescription();
+      } else {
+        setResourceDescription((String)value);
+      }
+      break;
+
+    case RESOURCE_SIZE:
+      if (value == null) {
+        unsetResourceSize();
+      } else {
+        setResourceSize((Integer)value);
+      }
+      break;
+
+    case CREATION_TIME:
+      if (value == null) {
+        unsetCreationTime();
+      } else {
+        setCreationTime((Long)value);
+      }
+      break;
+
+    case LAST_MODIFIED_TIME:
+      if (value == null) {
+        unsetLastModifiedTime();
+      } else {
+        setLastModifiedTime((Long)value);
+      }
+      break;
+
+    case REPLICA_LOCATIONS:
+      if (value == null) {
+        unsetReplicaLocations();
+      } else {
+        setReplicaLocations((List<DataReplicaLocationModel>)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case RESOURCE_ID:
+      return getResourceId();
+
+    case RESOURCE_NAME:
+      return getResourceName();
+
+    case RESOURCE_DESCRIPTION:
+      return getResourceDescription();
+
+    case RESOURCE_SIZE:
+      return Integer.valueOf(getResourceSize());
+
+    case CREATION_TIME:
+      return Long.valueOf(getCreationTime());
+
+    case LAST_MODIFIED_TIME:
+      return Long.valueOf(getLastModifiedTime());
+
+    case REPLICA_LOCATIONS:
+      return getReplicaLocations();
+
+    }
+    throw new IllegalStateException();
+  }
+
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
+    case RESOURCE_ID:
+      return isSetResourceId();
+    case RESOURCE_NAME:
+      return isSetResourceName();
+    case RESOURCE_DESCRIPTION:
+      return isSetResourceDescription();
+    case RESOURCE_SIZE:
+      return isSetResourceSize();
+    case CREATION_TIME:
+      return isSetCreationTime();
+    case LAST_MODIFIED_TIME:
+      return isSetLastModifiedTime();
+    case REPLICA_LOCATIONS:
+      return isSetReplicaLocations();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof DataResourceModel)
+      return this.equals((DataResourceModel)that);
+    return false;
+  }
+
+  public boolean equals(DataResourceModel that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_resourceId = true && this.isSetResourceId();
+    boolean that_present_resourceId = true && that.isSetResourceId();
+    if (this_present_resourceId || that_present_resourceId) {
+      if (!(this_present_resourceId && that_present_resourceId))
+        return false;
+      if (!this.resourceId.equals(that.resourceId))
+        return false;
+    }
+
+    boolean this_present_resourceName = true && this.isSetResourceName();
+    boolean that_present_resourceName = true && that.isSetResourceName();
+    if (this_present_resourceName || that_present_resourceName) {
+      if (!(this_present_resourceName && that_present_resourceName))
+        return false;
+      if (!this.resourceName.equals(that.resourceName))
+        return false;
+    }
+
+    boolean this_present_resourceDescription = true && this.isSetResourceDescription();
+    boolean that_present_resourceDescription = true && that.isSetResourceDescription();
+    if (this_present_resourceDescription || that_present_resourceDescription) {
+      if (!(this_present_resourceDescription && that_present_resourceDescription))
+        return false;
+      if (!this.resourceDescription.equals(that.resourceDescription))
+        return false;
+    }
+
+    boolean this_present_resourceSize = true && this.isSetResourceSize();
+    boolean that_present_resourceSize = true && that.isSetResourceSize();
+    if (this_present_resourceSize || that_present_resourceSize) {
+      if (!(this_present_resourceSize && that_present_resourceSize))
+        return false;
+      if (this.resourceSize != that.resourceSize)
+        return false;
+    }
+
+    boolean this_present_creationTime = true && this.isSetCreationTime();
+    boolean that_present_creationTime = true && that.isSetCreationTime();
+    if (this_present_creationTime || that_present_creationTime) {
+      if (!(this_present_creationTime && that_present_creationTime))
+        return false;
+      if (this.creationTime != that.creationTime)
+        return false;
+    }
+
+    boolean this_present_lastModifiedTime = true && this.isSetLastModifiedTime();
+    boolean that_present_lastModifiedTime = true && that.isSetLastModifiedTime();
+    if (this_present_lastModifiedTime || that_present_lastModifiedTime) {
+      if (!(this_present_lastModifiedTime && that_present_lastModifiedTime))
+        return false;
+      if (this.lastModifiedTime != that.lastModifiedTime)
+        return false;
+    }
+
+    boolean this_present_replicaLocations = true && this.isSetReplicaLocations();
+    boolean that_present_replicaLocations = true && that.isSetReplicaLocations();
+    if (this_present_replicaLocations || that_present_replicaLocations) {
+      if (!(this_present_replicaLocations && that_present_replicaLocations))
+        return false;
+      if (!this.replicaLocations.equals(that.replicaLocations))
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_resourceId = true && (isSetResourceId());
+    list.add(present_resourceId);
+    if (present_resourceId)
+      list.add(resourceId);
+
+    boolean present_resourceName = true && (isSetResourceName());
+    list.add(present_resourceName);
+    if (present_resourceName)
+      list.add(resourceName);
+
+    boolean present_resourceDescription = true && (isSetResourceDescription());
+    list.add(present_resourceDescription);
+    if (present_resourceDescription)
+      list.add(resourceDescription);
+
+    boolean present_resourceSize = true && (isSetResourceSize());
+    list.add(present_resourceSize);
+    if (present_resourceSize)
+      list.add(resourceSize);
+
+    boolean present_creationTime = true && (isSetCreationTime());
+    list.add(present_creationTime);
+    if (present_creationTime)
+      list.add(creationTime);
+
+    boolean present_lastModifiedTime = true && (isSetLastModifiedTime());
+    list.add(present_lastModifiedTime);
+    if (present_lastModifiedTime)
+      list.add(lastModifiedTime);
+
+    boolean present_replicaLocations = true && (isSetReplicaLocations());
+    list.add(present_replicaLocations);
+    if (present_replicaLocations)
+      list.add(replicaLocations);
+
+    return list.hashCode();
+  }
+
+  @Override
+  public int compareTo(DataResourceModel other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+
+    lastComparison = Boolean.valueOf(isSetResourceId()).compareTo(other.isSetResourceId());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetResourceId()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceId, other.resourceId);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetResourceName()).compareTo(other.isSetResourceName());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetResourceName()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceName, other.resourceName);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetResourceDescription()).compareTo(other.isSetResourceDescription());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetResourceDescription()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceDescription, other.resourceDescription);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetResourceSize()).compareTo(other.isSetResourceSize());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetResourceSize()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceSize, other.resourceSize);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetCreationTime()).compareTo(other.isSetCreationTime());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetCreationTime()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.creationTime, other.creationTime);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetLastModifiedTime()).compareTo(other.isSetLastModifiedTime());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetLastModifiedTime()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lastModifiedTime, other.lastModifiedTime);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetReplicaLocations()).compareTo(other.isSetReplicaLocations());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetReplicaLocations()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.replicaLocations, other.replicaLocations);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+  }
+
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder("DataResourceModel(");
+    boolean first = true;
+
+    if (isSetResourceId()) {
+      sb.append("resourceId:");
+      if (this.resourceId == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.resourceId);
+      }
+      first = false;
+    }
+    if (isSetResourceName()) {
+      if (!first) sb.append(", ");
+      sb.append("resourceName:");
+      if (this.resourceName == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.resourceName);
+      }
+      first = false;
+    }
+    if (isSetResourceDescription()) {
+      if (!first) sb.append(", ");
+      sb.append("resourceDescription:");
+      if (this.resourceDescription == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.resourceDescription);
+      }
+      first = false;
+    }
+    if (isSetResourceSize()) {
+      if (!first) sb.append(", ");
+      sb.append("resourceSize:");
+      sb.append(this.resourceSize);
+      first = false;
+    }
+    if (isSetCreationTime()) {
+      if (!first) sb.append(", ");
+      sb.append("creationTime:");
+      sb.append(this.creationTime);
+      first = false;
+    }
+    if (isSetLastModifiedTime()) {
+      if (!first) sb.append(", ");
+      sb.append("lastModifiedTime:");
+      sb.append(this.lastModifiedTime);
+      first = false;
+    }
+    if (!first) sb.append(", ");
+    sb.append("replicaLocations:");
+    if (this.replicaLocations == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.replicaLocations);
+    }
+    first = false;
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws org.apache.thrift.TException {
+    // check for required fields
+    // check for sub-struct validity
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+      __isset_bitfield = 0;
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private static class DataResourceModelStandardSchemeFactory implements SchemeFactory {
+    public DataResourceModelStandardScheme getScheme() {
+      return new DataResourceModelStandardScheme();
+    }
+  }
+
+  private static class DataResourceModelStandardScheme extends StandardScheme<DataResourceModel> {
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot, DataResourceModel struct) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField schemeField;
+      iprot.readStructBegin();
+      while (true)
+      {
+        schemeField = iprot.readFieldBegin();
+        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (schemeField.id) {
+          case 1: // RESOURCE_ID
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.resourceId = iprot.readString();
+              struct.setResourceIdIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 2: // RESOURCE_NAME
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.resourceName = iprot.readString();
+              struct.setResourceNameIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 3: // RESOURCE_DESCRIPTION
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.resourceDescription = iprot.readString();
+              struct.setResourceDescriptionIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 4: // RESOURCE_SIZE
+            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+              struct.resourceSize = iprot.readI32();
+              struct.setResourceSizeIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 5: // CREATION_TIME
+            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+              struct.creationTime = iprot.readI64();
+              struct.setCreationTimeIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 6: // LAST_MODIFIED_TIME
+            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+              struct.lastModifiedTime = iprot.readI64();
+              struct.setLastModifiedTimeIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 7: // REPLICA_LOCATIONS
+            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+              {
+                org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
+                struct.replicaLocations = new ArrayList<DataReplicaLocationModel>(_list0.size);
+                DataReplicaLocationModel _elem1;
+                for (int _i2 = 0; _i2 < _list0.size; ++_i2)
+                {
+                  _elem1 = new DataReplicaLocationModel();
+                  _elem1.read(iprot);
+                  struct.replicaLocations.add(_elem1);
+                }
+                iprot.readListEnd();
+              }
+              struct.setReplicaLocationsIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+      struct.validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot, DataResourceModel struct) throws org.apache.thrift.TException {
+      struct.validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (struct.resourceId != null) {
+        if (struct.isSetResourceId()) {
+          oprot.writeFieldBegin(RESOURCE_ID_FIELD_DESC);
+          oprot.writeString(struct.resourceId);
+          oprot.writeFieldEnd();
+        }
+      }
+      if (struct.resourceName != null) {
+        if (struct.isSetResourceName()) {
+          oprot.writeFieldBegin(RESOURCE_NAME_FIELD_DESC);
+          oprot.writeString(struct.resourceName);
+          oprot.writeFieldEnd();
+        }
+      }
+      if (struct.resourceDescription != null) {
+        if (struct.isSetResourceDescription()) {
+          oprot.writeFieldBegin(RESOURCE_DESCRIPTION_FIELD_DESC);
+          oprot.writeString(struct.resourceDescription);
+          oprot.writeFieldEnd();
+        }
+      }
+      if (struct.isSetResourceSize()) {
+        oprot.writeFieldBegin(RESOURCE_SIZE_FIELD_DESC);
+        oprot.writeI32(struct.resourceSize);
+        oprot.writeFieldEnd();
+      }
+      if (struct.isSetCreationTime()) {
+        oprot.writeFieldBegin(CREATION_TIME_FIELD_DESC);
+        oprot.writeI64(struct.creationTime);
+        oprot.writeFieldEnd();
+      }
+      if (struct.isSetLastModifiedTime()) {
+        oprot.writeFieldBegin(LAST_MODIFIED_TIME_FIELD_DESC);
+        oprot.writeI64(struct.lastModifiedTime);
+        oprot.writeFieldEnd();
+      }
+      if (struct.replicaLocations != null) {
+        oprot.writeFieldBegin(REPLICA_LOCATIONS_FIELD_DESC);
+        {
+          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.replicaLocations.size()));
+          for (DataReplicaLocationModel _iter3 : struct.replicaLocations)
+          {
+            _iter3.write(oprot);
+          }
+          oprot.writeListEnd();
+        }
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+  }
+
+  private static class DataResourceModelTupleSchemeFactory implements SchemeFactory {
+    public DataResourceModelTupleScheme getScheme() {
+      return new DataResourceModelTupleScheme();
+    }
+  }
+
+  private static class DataResourceModelTupleScheme extends TupleScheme<DataResourceModel> {
+
+    @Override
+    public void write(org.apache.thrift.protocol.TProtocol prot, DataResourceModel struct) throws org.apache.thrift.TException {
+      TTupleProtocol oprot = (TTupleProtocol) prot;
+      BitSet optionals = new BitSet();
+      if (struct.isSetResourceId()) {
+        optionals.set(0);
+      }
+      if (struct.isSetResourceName()) {
+        optionals.set(1);
+      }
+      if (struct.isSetResourceDescription()) {
+        optionals.set(2);
+      }
+      if (struct.isSetResourceSize()) {
+        optionals.set(3);
+      }
+      if (struct.isSetCreationTime()) {
+        optionals.set(4);
+      }
+      if (struct.isSetLastModifiedTime()) {
+        optionals.set(5);
+      }
+      if (struct.isSetReplicaLocations()) {
+        optionals.set(6);
+      }
+      oprot.writeBitSet(optionals, 7);
+      if (struct.isSetResourceId()) {
+        oprot.writeString(struct.resourceId);
+      }
+      if (struct.isSetResourceName()) {
+        oprot.writeString(struct.resourceName);
+      }
+      if (struct.isSetResourceDescription()) {
+        oprot.writeString(struct.resourceDescription);
+      }
+      if (struct.isSetResourceSize()) {
+        oprot.writeI32(struct.resourceSize);
+      }
+      if (struct.isSetCreationTime()) {
+        oprot.writeI64(struct.creationTime);
+      }
+      if (struct.isSetLastModifiedTime()) {
+        oprot.writeI64(struct.lastModifiedTime);
+      }
+      if (struct.isSetReplicaLocations()) {
+        {
+          oprot.writeI32(struct.replicaLocations.size());
+          for (DataReplicaLocationModel _iter4 : struct.replicaLocations)
+          {
+            _iter4.write(oprot);
+          }
+        }
+      }
+    }
+
+    @Override
+    public void read(org.apache.thrift.protocol.TProtocol prot, DataResourceModel struct) throws org.apache.thrift.TException {
+      TTupleProtocol iprot = (TTupleProtocol) prot;
+      BitSet incoming = iprot.readBitSet(7);
+      if (incoming.get(0)) {
+        struct.resourceId = iprot.readString();
+        struct.setResourceIdIsSet(true);
+      }
+      if (incoming.get(1)) {
+        struct.resourceName = iprot.readString();
+        struct.setResourceNameIsSet(true);
+      }
+      if (incoming.get(2)) {
+        struct.resourceDescription = iprot.readString();
+        struct.setResourceDescriptionIsSet(true);
+      }
+      if (incoming.get(3)) {
+        struct.resourceSize = iprot.readI32();
+        struct.setResourceSizeIsSet(true);
+      }
+      if (incoming.get(4)) {
+        struct.creationTime = iprot.readI64();
+        struct.setCreationTimeIsSet(true);
+      }
+      if (incoming.get(5)) {
+        struct.lastModifiedTime = iprot.readI64();
+        struct.setLastModifiedTimeIsSet(true);
+      }
+      if (incoming.get(6)) {
+        {
+          org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          struct.replicaLocations = new ArrayList<DataReplicaLocationModel>(_list5.size);
+          DataReplicaLocationModel _elem6;
+          for (int _i7 = 0; _i7 < _list5.size; ++_i7)
+          {
+            _elem6 = new DataReplicaLocationModel();
+            _elem6.read(iprot);
+            struct.replicaLocations.add(_elem6);
+          }
+        }
+        struct.setReplicaLocationsIsSet(true);
+      }
+    }
+  }
+
+}
+

http://git-wip-us.apache.org/repos/asf/airavata/blob/1a22de16/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/ReplicaLocationModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/ReplicaLocationModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/ReplicaLocationModel.java
deleted file mode 100644
index f3af020..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/ReplicaLocationModel.java
+++ /dev/null
@@ -1,459 +0,0 @@
-/**
- * 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.
- */
-
-/**
- * Autogenerated by Thrift Compiler (0.9.2)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.airavata.model.data.resource;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2")
-public class ReplicaLocationModel implements org.apache.thrift.TBase<ReplicaLocationModel, ReplicaLocationModel._Fields>, java.io.Serializable, Cloneable, Comparable<ReplicaLocationModel> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ReplicaLocationModel");
-
-  private static final org.apache.thrift.protocol.TField PHYSICAL_LOCATIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("physicalLocations", org.apache.thrift.protocol.TType.LIST, (short)1);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new ReplicaLocationModelStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new ReplicaLocationModelTupleSchemeFactory());
-  }
-
-  private List<String> physicalLocations; // optional
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    PHYSICAL_LOCATIONS((short)1, "physicalLocations");
-
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
-    static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // PHYSICAL_LOCATIONS
-          return PHYSICAL_LOCATIONS;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final String _fieldName;
-
-    _Fields(short thriftId, String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  private static final _Fields optionals[] = {_Fields.PHYSICAL_LOCATIONS};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
-  static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.PHYSICAL_LOCATIONS, new org.apache.thrift.meta_data.FieldMetaData("physicalLocations", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ReplicaLocationModel.class, metaDataMap);
-  }
-
-  public ReplicaLocationModel() {
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public ReplicaLocationModel(ReplicaLocationModel other) {
-    if (other.isSetPhysicalLocations()) {
-      List<String> __this__physicalLocations = new ArrayList<String>(other.physicalLocations);
-      this.physicalLocations = __this__physicalLocations;
-    }
-  }
-
-  public ReplicaLocationModel deepCopy() {
-    return new ReplicaLocationModel(this);
-  }
-
-  @Override
-  public void clear() {
-    this.physicalLocations = null;
-  }
-
-  public int getPhysicalLocationsSize() {
-    return (this.physicalLocations == null) ? 0 : this.physicalLocations.size();
-  }
-
-  public java.util.Iterator<String> getPhysicalLocationsIterator() {
-    return (this.physicalLocations == null) ? null : this.physicalLocations.iterator();
-  }
-
-  public void addToPhysicalLocations(String elem) {
-    if (this.physicalLocations == null) {
-      this.physicalLocations = new ArrayList<String>();
-    }
-    this.physicalLocations.add(elem);
-  }
-
-  public List<String> getPhysicalLocations() {
-    return this.physicalLocations;
-  }
-
-  public void setPhysicalLocations(List<String> physicalLocations) {
-    this.physicalLocations = physicalLocations;
-  }
-
-  public void unsetPhysicalLocations() {
-    this.physicalLocations = null;
-  }
-
-  /** Returns true if field physicalLocations is set (has been assigned a value) and false otherwise */
-  public boolean isSetPhysicalLocations() {
-    return this.physicalLocations != null;
-  }
-
-  public void setPhysicalLocationsIsSet(boolean value) {
-    if (!value) {
-      this.physicalLocations = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case PHYSICAL_LOCATIONS:
-      if (value == null) {
-        unsetPhysicalLocations();
-      } else {
-        setPhysicalLocations((List<String>)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case PHYSICAL_LOCATIONS:
-      return getPhysicalLocations();
-
-    }
-    throw new IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new IllegalArgumentException();
-    }
-
-    switch (field) {
-    case PHYSICAL_LOCATIONS:
-      return isSetPhysicalLocations();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof ReplicaLocationModel)
-      return this.equals((ReplicaLocationModel)that);
-    return false;
-  }
-
-  public boolean equals(ReplicaLocationModel that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_physicalLocations = true && this.isSetPhysicalLocations();
-    boolean that_present_physicalLocations = true && that.isSetPhysicalLocations();
-    if (this_present_physicalLocations || that_present_physicalLocations) {
-      if (!(this_present_physicalLocations && that_present_physicalLocations))
-        return false;
-      if (!this.physicalLocations.equals(that.physicalLocations))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_physicalLocations = true && (isSetPhysicalLocations());
-    list.add(present_physicalLocations);
-    if (present_physicalLocations)
-      list.add(physicalLocations);
-
-    return list.hashCode();
-  }
-
-  @Override
-  public int compareTo(ReplicaLocationModel other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetPhysicalLocations()).compareTo(other.isSetPhysicalLocations());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetPhysicalLocations()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.physicalLocations, other.physicalLocations);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("ReplicaLocationModel(");
-    boolean first = true;
-
-    if (isSetPhysicalLocations()) {
-      sb.append("physicalLocations:");
-      if (this.physicalLocations == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.physicalLocations);
-      }
-      first = false;
-    }
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    // check for sub-struct validity
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
-    try {
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class ReplicaLocationModelStandardSchemeFactory implements SchemeFactory {
-    public ReplicaLocationModelStandardScheme getScheme() {
-      return new ReplicaLocationModelStandardScheme();
-    }
-  }
-
-  private static class ReplicaLocationModelStandardScheme extends StandardScheme<ReplicaLocationModel> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, ReplicaLocationModel struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // PHYSICAL_LOCATIONS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list8 = iprot.readListBegin();
-                struct.physicalLocations = new ArrayList<String>(_list8.size);
-                String _elem9;
-                for (int _i10 = 0; _i10 < _list8.size; ++_i10)
-                {
-                  _elem9 = iprot.readString();
-                  struct.physicalLocations.add(_elem9);
-                }
-                iprot.readListEnd();
-              }
-              struct.setPhysicalLocationsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, ReplicaLocationModel struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.physicalLocations != null) {
-        if (struct.isSetPhysicalLocations()) {
-          oprot.writeFieldBegin(PHYSICAL_LOCATIONS_FIELD_DESC);
-          {
-            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.physicalLocations.size()));
-            for (String _iter11 : struct.physicalLocations)
-            {
-              oprot.writeString(_iter11);
-            }
-            oprot.writeListEnd();
-          }
-          oprot.writeFieldEnd();
-        }
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class ReplicaLocationModelTupleSchemeFactory implements SchemeFactory {
-    public ReplicaLocationModelTupleScheme getScheme() {
-      return new ReplicaLocationModelTupleScheme();
-    }
-  }
-
-  private static class ReplicaLocationModelTupleScheme extends TupleScheme<ReplicaLocationModel> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, ReplicaLocationModel struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
-      if (struct.isSetPhysicalLocations()) {
-        optionals.set(0);
-      }
-      oprot.writeBitSet(optionals, 1);
-      if (struct.isSetPhysicalLocations()) {
-        {
-          oprot.writeI32(struct.physicalLocations.size());
-          for (String _iter12 : struct.physicalLocations)
-          {
-            oprot.writeString(_iter12);
-          }
-        }
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, ReplicaLocationModel struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        {
-          org.apache.thrift.protocol.TList _list13 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.physicalLocations = new ArrayList<String>(_list13.size);
-          String _elem14;
-          for (int _i15 = 0; _i15 < _list13.size; ++_i15)
-          {
-            _elem14 = iprot.readString();
-            struct.physicalLocations.add(_elem14);
-          }
-        }
-        struct.setPhysicalLocationsIsSet(true);
-      }
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/airavata/blob/1a22de16/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/ResourceModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/ResourceModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/ResourceModel.java
deleted file mode 100644
index bdaf535..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/ResourceModel.java
+++ /dev/null
@@ -1,679 +0,0 @@
-/**
- * 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.
- */
-
-/**
- * Autogenerated by Thrift Compiler (0.9.2)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.airavata.model.data.resource;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2")
-public class ResourceModel implements org.apache.thrift.TBase<ResourceModel, ResourceModel._Fields>, java.io.Serializable, Cloneable, Comparable<ResourceModel> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ResourceModel");
-
-  private static final org.apache.thrift.protocol.TField RESOURCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceId", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField RESOURCE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceName", org.apache.thrift.protocol.TType.STRING, (short)2);
-  private static final org.apache.thrift.protocol.TField REPLICA_LOCATIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("replicaLocations", org.apache.thrift.protocol.TType.LIST, (short)3);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new ResourceModelStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new ResourceModelTupleSchemeFactory());
-  }
-
-  private String resourceId; // optional
-  private String resourceName; // optional
-  private List<ReplicaLocationModel> replicaLocations; // required
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    RESOURCE_ID((short)1, "resourceId"),
-    RESOURCE_NAME((short)2, "resourceName"),
-    REPLICA_LOCATIONS((short)3, "replicaLocations");
-
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
-    static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // RESOURCE_ID
-          return RESOURCE_ID;
-        case 2: // RESOURCE_NAME
-          return RESOURCE_NAME;
-        case 3: // REPLICA_LOCATIONS
-          return REPLICA_LOCATIONS;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final String _fieldName;
-
-    _Fields(short thriftId, String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  private static final _Fields optionals[] = {_Fields.RESOURCE_ID,_Fields.RESOURCE_NAME};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
-  static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.RESOURCE_ID, new org.apache.thrift.meta_data.FieldMetaData("resourceId", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.RESOURCE_NAME, new org.apache.thrift.meta_data.FieldMetaData("resourceName", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.REPLICA_LOCATIONS, new org.apache.thrift.meta_data.FieldMetaData("replicaLocations", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT            , "ReplicaLocationModel"))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ResourceModel.class, metaDataMap);
-  }
-
-  public ResourceModel() {
-  }
-
-  public ResourceModel(
-    List<ReplicaLocationModel> replicaLocations)
-  {
-    this();
-    this.replicaLocations = replicaLocations;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public ResourceModel(ResourceModel other) {
-    if (other.isSetResourceId()) {
-      this.resourceId = other.resourceId;
-    }
-    if (other.isSetResourceName()) {
-      this.resourceName = other.resourceName;
-    }
-    if (other.isSetReplicaLocations()) {
-      List<ReplicaLocationModel> __this__replicaLocations = new ArrayList<ReplicaLocationModel>(other.replicaLocations.size());
-      for (ReplicaLocationModel other_element : other.replicaLocations) {
-        __this__replicaLocations.add(other_element);
-      }
-      this.replicaLocations = __this__replicaLocations;
-    }
-  }
-
-  public ResourceModel deepCopy() {
-    return new ResourceModel(this);
-  }
-
-  @Override
-  public void clear() {
-    this.resourceId = null;
-    this.resourceName = null;
-    this.replicaLocations = null;
-  }
-
-  public String getResourceId() {
-    return this.resourceId;
-  }
-
-  public void setResourceId(String resourceId) {
-    this.resourceId = resourceId;
-  }
-
-  public void unsetResourceId() {
-    this.resourceId = null;
-  }
-
-  /** Returns true if field resourceId is set (has been assigned a value) and false otherwise */
-  public boolean isSetResourceId() {
-    return this.resourceId != null;
-  }
-
-  public void setResourceIdIsSet(boolean value) {
-    if (!value) {
-      this.resourceId = null;
-    }
-  }
-
-  public String getResourceName() {
-    return this.resourceName;
-  }
-
-  public void setResourceName(String resourceName) {
-    this.resourceName = resourceName;
-  }
-
-  public void unsetResourceName() {
-    this.resourceName = null;
-  }
-
-  /** Returns true if field resourceName is set (has been assigned a value) and false otherwise */
-  public boolean isSetResourceName() {
-    return this.resourceName != null;
-  }
-
-  public void setResourceNameIsSet(boolean value) {
-    if (!value) {
-      this.resourceName = null;
-    }
-  }
-
-  public int getReplicaLocationsSize() {
-    return (this.replicaLocations == null) ? 0 : this.replicaLocations.size();
-  }
-
-  public java.util.Iterator<ReplicaLocationModel> getReplicaLocationsIterator() {
-    return (this.replicaLocations == null) ? null : this.replicaLocations.iterator();
-  }
-
-  public void addToReplicaLocations(ReplicaLocationModel elem) {
-    if (this.replicaLocations == null) {
-      this.replicaLocations = new ArrayList<ReplicaLocationModel>();
-    }
-    this.replicaLocations.add(elem);
-  }
-
-  public List<ReplicaLocationModel> getReplicaLocations() {
-    return this.replicaLocations;
-  }
-
-  public void setReplicaLocations(List<ReplicaLocationModel> replicaLocations) {
-    this.replicaLocations = replicaLocations;
-  }
-
-  public void unsetReplicaLocations() {
-    this.replicaLocations = null;
-  }
-
-  /** Returns true if field replicaLocations is set (has been assigned a value) and false otherwise */
-  public boolean isSetReplicaLocations() {
-    return this.replicaLocations != null;
-  }
-
-  public void setReplicaLocationsIsSet(boolean value) {
-    if (!value) {
-      this.replicaLocations = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case RESOURCE_ID:
-      if (value == null) {
-        unsetResourceId();
-      } else {
-        setResourceId((String)value);
-      }
-      break;
-
-    case RESOURCE_NAME:
-      if (value == null) {
-        unsetResourceName();
-      } else {
-        setResourceName((String)value);
-      }
-      break;
-
-    case REPLICA_LOCATIONS:
-      if (value == null) {
-        unsetReplicaLocations();
-      } else {
-        setReplicaLocations((List<ReplicaLocationModel>)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case RESOURCE_ID:
-      return getResourceId();
-
-    case RESOURCE_NAME:
-      return getResourceName();
-
-    case REPLICA_LOCATIONS:
-      return getReplicaLocations();
-
-    }
-    throw new IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new IllegalArgumentException();
-    }
-
-    switch (field) {
-    case RESOURCE_ID:
-      return isSetResourceId();
-    case RESOURCE_NAME:
-      return isSetResourceName();
-    case REPLICA_LOCATIONS:
-      return isSetReplicaLocations();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof ResourceModel)
-      return this.equals((ResourceModel)that);
-    return false;
-  }
-
-  public boolean equals(ResourceModel that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_resourceId = true && this.isSetResourceId();
-    boolean that_present_resourceId = true && that.isSetResourceId();
-    if (this_present_resourceId || that_present_resourceId) {
-      if (!(this_present_resourceId && that_present_resourceId))
-        return false;
-      if (!this.resourceId.equals(that.resourceId))
-        return false;
-    }
-
-    boolean this_present_resourceName = true && this.isSetResourceName();
-    boolean that_present_resourceName = true && that.isSetResourceName();
-    if (this_present_resourceName || that_present_resourceName) {
-      if (!(this_present_resourceName && that_present_resourceName))
-        return false;
-      if (!this.resourceName.equals(that.resourceName))
-        return false;
-    }
-
-    boolean this_present_replicaLocations = true && this.isSetReplicaLocations();
-    boolean that_present_replicaLocations = true && that.isSetReplicaLocations();
-    if (this_present_replicaLocations || that_present_replicaLocations) {
-      if (!(this_present_replicaLocations && that_present_replicaLocations))
-        return false;
-      if (!this.replicaLocations.equals(that.replicaLocations))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_resourceId = true && (isSetResourceId());
-    list.add(present_resourceId);
-    if (present_resourceId)
-      list.add(resourceId);
-
-    boolean present_resourceName = true && (isSetResourceName());
-    list.add(present_resourceName);
-    if (present_resourceName)
-      list.add(resourceName);
-
-    boolean present_replicaLocations = true && (isSetReplicaLocations());
-    list.add(present_replicaLocations);
-    if (present_replicaLocations)
-      list.add(replicaLocations);
-
-    return list.hashCode();
-  }
-
-  @Override
-  public int compareTo(ResourceModel other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetResourceId()).compareTo(other.isSetResourceId());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetResourceId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceId, other.resourceId);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetResourceName()).compareTo(other.isSetResourceName());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetResourceName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceName, other.resourceName);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetReplicaLocations()).compareTo(other.isSetReplicaLocations());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetReplicaLocations()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.replicaLocations, other.replicaLocations);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("ResourceModel(");
-    boolean first = true;
-
-    if (isSetResourceId()) {
-      sb.append("resourceId:");
-      if (this.resourceId == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.resourceId);
-      }
-      first = false;
-    }
-    if (isSetResourceName()) {
-      if (!first) sb.append(", ");
-      sb.append("resourceName:");
-      if (this.resourceName == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.resourceName);
-      }
-      first = false;
-    }
-    if (!first) sb.append(", ");
-    sb.append("replicaLocations:");
-    if (this.replicaLocations == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.replicaLocations);
-    }
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    // check for sub-struct validity
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
-    try {
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class ResourceModelStandardSchemeFactory implements SchemeFactory {
-    public ResourceModelStandardScheme getScheme() {
-      return new ResourceModelStandardScheme();
-    }
-  }
-
-  private static class ResourceModelStandardScheme extends StandardScheme<ResourceModel> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, ResourceModel struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // RESOURCE_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.resourceId = iprot.readString();
-              struct.setResourceIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // RESOURCE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.resourceName = iprot.readString();
-              struct.setResourceNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // REPLICA_LOCATIONS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
-                struct.replicaLocations = new ArrayList<ReplicaLocationModel>(_list0.size);
-                ReplicaLocationModel _elem1;
-                for (int _i2 = 0; _i2 < _list0.size; ++_i2)
-                {
-                  _elem1 = new ReplicaLocationModel();
-                  _elem1.read(iprot);
-                  struct.replicaLocations.add(_elem1);
-                }
-                iprot.readListEnd();
-              }
-              struct.setReplicaLocationsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, ResourceModel struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.resourceId != null) {
-        if (struct.isSetResourceId()) {
-          oprot.writeFieldBegin(RESOURCE_ID_FIELD_DESC);
-          oprot.writeString(struct.resourceId);
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.resourceName != null) {
-        if (struct.isSetResourceName()) {
-          oprot.writeFieldBegin(RESOURCE_NAME_FIELD_DESC);
-          oprot.writeString(struct.resourceName);
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.replicaLocations != null) {
-        oprot.writeFieldBegin(REPLICA_LOCATIONS_FIELD_DESC);
-        {
-          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.replicaLocations.size()));
-          for (ReplicaLocationModel _iter3 : struct.replicaLocations)
-          {
-            _iter3.write(oprot);
-          }
-          oprot.writeListEnd();
-        }
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class ResourceModelTupleSchemeFactory implements SchemeFactory {
-    public ResourceModelTupleScheme getScheme() {
-      return new ResourceModelTupleScheme();
-    }
-  }
-
-  private static class ResourceModelTupleScheme extends TupleScheme<ResourceModel> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, ResourceModel struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
-      if (struct.isSetResourceId()) {
-        optionals.set(0);
-      }
-      if (struct.isSetResourceName()) {
-        optionals.set(1);
-      }
-      if (struct.isSetReplicaLocations()) {
-        optionals.set(2);
-      }
-      oprot.writeBitSet(optionals, 3);
-      if (struct.isSetResourceId()) {
-        oprot.writeString(struct.resourceId);
-      }
-      if (struct.isSetResourceName()) {
-        oprot.writeString(struct.resourceName);
-      }
-      if (struct.isSetReplicaLocations()) {
-        {
-          oprot.writeI32(struct.replicaLocations.size());
-          for (ReplicaLocationModel _iter4 : struct.replicaLocations)
-          {
-            _iter4.write(oprot);
-          }
-        }
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, ResourceModel struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(3);
-      if (incoming.get(0)) {
-        struct.resourceId = iprot.readString();
-        struct.setResourceIdIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.resourceName = iprot.readString();
-        struct.setResourceNameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        {
-          org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.replicaLocations = new ArrayList<ReplicaLocationModel>(_list5.size);
-          ReplicaLocationModel _elem6;
-          for (int _i7 = 0; _i7 < _list5.size; ++_i7)
-          {
-            _elem6 = new ReplicaLocationModel();
-            _elem6.read(iprot);
-            struct.replicaLocations.add(_elem6);
-          }
-        }
-        struct.setReplicaLocationsIsSet(true);
-      }
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/airavata/blob/1a22de16/modules/configuration/server/src/main/resources/airavata-server.properties
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/airavata-server.properties b/modules/configuration/server/src/main/resources/airavata-server.properties
index cb4d93d..5654311 100644
--- a/modules/configuration/server/src/main/resources/airavata-server.properties
+++ b/modules/configuration/server/src/main/resources/airavata-server.properties
@@ -67,6 +67,19 @@ appcatalog.jdbc.password=airavata
 appcatalog.validationQuery=SELECT 1 from CONFIGURATION
 
 ###########################################################################
+#  Data Catalog DB Configuration
+###########################################################################
+#for derby [AiravataJPARegistry]
+datacatalog.jdbc.driver=org.apache.derby.jdbc.ClientDriver
+datacatalog.jdbc.url=jdbc:derby://localhost:1527/data_catalog;create=true;user=airavata;password=airavata
+# MySql database configuration
+#datacatalog.jdbc.driver=com.mysql.jdbc.Driver
+#datacatalog.jdbc.url=jdbc:mysql://localhost:3306/data_catalog
+datacatalog.jdbc.user=airavata
+datacatalog.jdbc.password=airavata
+datacatalog.validationQuery=SELECT 1 from CONFIGURATION
+
+###########################################################################
 #  Server module Configuration
 ###########################################################################
 servers=apiserver,orchestrator,gfac,credentialstore

http://git-wip-us.apache.org/repos/asf/airavata/blob/1a22de16/modules/credential-store/credential-store-service/src/test/resources/airavata-server.properties
----------------------------------------------------------------------
diff --git a/modules/credential-store/credential-store-service/src/test/resources/airavata-server.properties b/modules/credential-store/credential-store-service/src/test/resources/airavata-server.properties
index 1f3afd6..54f19f0 100644
--- a/modules/credential-store/credential-store-service/src/test/resources/airavata-server.properties
+++ b/modules/credential-store/credential-store-service/src/test/resources/airavata-server.properties
@@ -66,6 +66,19 @@ appcatalog.jdbc.password=airavata
 appcatalog.validationQuery=SELECT 1 from CONFIGURATION
 
 ###########################################################################
+#  Data Catalog DB Configuration
+###########################################################################
+#for derby [AiravataJPARegistry]
+datacatalog.jdbc.driver=org.apache.derby.jdbc.ClientDriver
+datacatalog.jdbc.url=jdbc:derby://localhost:1527/data_catalog;create=true;user=airavata;password=airavata
+# MySql database configuration
+#datacatalog.jdbc.driver=com.mysql.jdbc.Driver
+#datacatalog.jdbc.url=jdbc:mysql://localhost:3306/data_catalog
+datacatalog.jdbc.user=airavata
+datacatalog.jdbc.password=airavata
+datacatalog.validationQuery=SELECT 1 from CONFIGURATION
+
+###########################################################################
 #  Server module Configuration
 ###########################################################################
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/1a22de16/modules/data-manager/src/main/java/org/apache/airavata/data/manager/DataManager.java
----------------------------------------------------------------------
diff --git a/modules/data-manager/src/main/java/org/apache/airavata/data/manager/DataManager.java b/modules/data-manager/src/main/java/org/apache/airavata/data/manager/DataManager.java
index 7451a94..05afb90 100644
--- a/modules/data-manager/src/main/java/org/apache/airavata/data/manager/DataManager.java
+++ b/modules/data-manager/src/main/java/org/apache/airavata/data/manager/DataManager.java
@@ -20,7 +20,7 @@
  */
 package org.apache.airavata.data.manager;
 
-import org.apache.airavata.model.data.resource.ResourceModel;
+import org.apache.airavata.model.data.resource.DataResourceModel;
 
 public interface DataManager {
 
@@ -30,7 +30,7 @@ public interface DataManager {
      * @param resource
      * @return
      */
-    boolean publishResource(ResourceModel resource);
+    boolean publishResource(DataResourceModel resource);
 
     /**
      * To remove a resource entry from the replica catalog
@@ -53,5 +53,5 @@ public interface DataManager {
      * @param resourceId
      * @return
      */
-    ResourceModel getResource(String resourceId);
+    DataResourceModel getResource(String resourceId);
 }


Mime
View raw message