cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [23/96] [abbrv] [partial] merge master
Date Mon, 13 May 2013 18:01:14 GMT
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/core/src/com/cloud/storage/VolumeVO.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/VolumeVO.java b/core/src/com/cloud/storage/VolumeVO.java
deleted file mode 100755
index 1699afd..0000000
--- a/core/src/com/cloud/storage/VolumeVO.java
+++ /dev/null
@@ -1,466 +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.
-package com.cloud.storage;
-
-import java.util.Date;
-import java.util.UUID;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.TableGenerator;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.persistence.Transient;
-
-import com.cloud.storage.Storage.StoragePoolType;
-import com.cloud.utils.NumbersUtil;
-import com.cloud.utils.db.GenericDao;
-
-@Entity
-@Table(name = "volumes")
-public class VolumeVO implements Volume {
-    @Id
-    @TableGenerator(name = "volume_sq", table = "sequence", pkColumnName = "name", valueColumnName = "value", pkColumnValue = "volume_seq", allocationSize = 1)
-    @GeneratedValue(strategy = GenerationType.TABLE)
-    @Column(name = "id")
-    long id;
-
-    @Column(name = "name")
-    String name;
-
-    @Column(name = "pool_id")
-    Long poolId;
-    
-    @Column(name = "last_pool_id")
-    Long lastPoolId;
-    
-    @Column(name = "account_id")
-    long accountId;
-
-    @Column(name = "domain_id")
-    long domainId;
-
-    @Column(name = "instance_id")
-    Long instanceId = null;
-
-    @Column(name = "device_id")
-    Long deviceId = null;
-
-    @Column(name = "size")
-    Long size;
-
-    @Column(name = "folder")
-    String folder;
-
-    @Column(name = "path")
-    String path;
-
-    @Column(name = "pod_id")
-    Long podId;
-
-    @Column(name = "created")
-    Date created;
-
-    @Column(name = "attached")
-    @Temporal(value = TemporalType.TIMESTAMP)
-    Date attached;
-
-    @Column(name = "data_center_id")
-    long dataCenterId;
-
-    @Column(name = "host_ip")
-    String hostip;
-
-    @Column(name = "disk_offering_id")
-    long diskOfferingId;
-
-    @Column(name = "template_id")
-    Long templateId;
-
-    @Column(name = "first_snapshot_backup_uuid")
-    String firstSnapshotBackupUuid;
-
-    @Column(name = "volume_type")
-    @Enumerated(EnumType.STRING)
-    Type volumeType = Volume.Type.UNKNOWN;
-
-    @Column(name = "pool_type")
-    @Enumerated(EnumType.STRING)
-    StoragePoolType poolType;
-
-    @Column(name = GenericDao.REMOVED_COLUMN)
-    Date removed;
-
-    @Column(name = "updated")
-    @Temporal(value = TemporalType.TIMESTAMP)
-    Date updated;
-    
-    @Column(name="update_count", updatable = true, nullable=false)
-    protected long updatedCount;	// This field should be updated everytime the state is updated.  There's no set method in the vo object because it is done with in the dao code.
-
-    @Column(name = "recreatable")
-    boolean recreatable;
-
-    @Column(name = "state")
-    @Enumerated(value = EnumType.STRING)
-    private State state;
-
-    @Column(name = "chain_info")
-    String chainInfo;
-
-    @Column(name = "uuid")
-    String uuid;
-
-    @Column(name="display_volume", updatable=true, nullable=false)
-    protected boolean displayVolume;
-
-    @Transient
-    // @Column(name="reservation")
-    String reservationId;
-    
-    // Real Constructor
-    public VolumeVO(Type type, String name, long dcId, long domainId, long accountId, long diskOfferingId, long size) {
-        this.volumeType = type;
-        this.name = name;
-        this.dataCenterId = dcId;
-        this.accountId = accountId;
-        this.domainId = domainId;
-        this.size = size;
-        this.diskOfferingId = diskOfferingId;
-        this.state = State.Allocated;
-        this.uuid = UUID.randomUUID().toString();
-    }
-
-    public VolumeVO(String name, long dcId, long podId, long accountId, long domainId, Long instanceId, String folder, String path, long size, Volume.Type vType) {
-        this.name = name;
-        this.accountId = accountId;
-        this.domainId = domainId;
-        this.instanceId = instanceId;
-        this.folder = folder;
-        this.path = path;
-        this.size = size;
-        this.podId = podId;
-        this.dataCenterId = dcId;
-        this.volumeType = vType;
-        this.state = Volume.State.Allocated;
-        this.recreatable = false;
-        this.uuid = UUID.randomUUID().toString();
-    }
-
-    // Copy Constructor
-    public VolumeVO(Volume that) {
-        this(that.getName(), that.getDataCenterId(), that.getPodId(), that.getAccountId(), that.getDomainId(), that.getInstanceId(), that.getFolder(), that.getPath(), that.getSize(), that
-                .getVolumeType());
-        this.recreatable = that.isRecreatable();
-        this.state = that.getState();
-        this.size = that.getSize();
-        this.diskOfferingId = that.getDiskOfferingId();
-        this.poolId = that.getPoolId();
-        this.attached = that.getAttached();
-        this.chainInfo = that.getChainInfo();
-        this.templateId = that.getTemplateId();
-        this.deviceId = that.getDeviceId();
-        this.uuid = UUID.randomUUID().toString();
-    }
-
-    @Override
-    public long getUpdatedCount() {
-    	return this.updatedCount;
-    }
-    
-    @Override
-    public void incrUpdatedCount() {
-    	this.updatedCount++;
-    }
-    
-    public void decrUpdatedCount() {
-    	this.updatedCount--;
-    }
-    
-    @Override
-    public boolean isRecreatable() {
-        return recreatable;
-    }
-
-    public void setRecreatable(boolean recreatable) {
-        this.recreatable = recreatable;
-    }
-
-    @Override
-    public long getId() {
-        return id;
-    }
-
-    @Override
-    public Long getPodId() {
-        return podId;
-    }
-
-    @Override
-    public long getDataCenterId() {
-        return dataCenterId;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public long getAccountId() {
-        return accountId;
-    }
-
-    public void setPoolType(StoragePoolType poolType) {
-        this.poolType = poolType;
-    }
-
-    public StoragePoolType getPoolType() {
-        return poolType;
-    }
-
-    @Override
-    public long getDomainId() {
-        return domainId;
-    }
-
-    @Override
-    public String getFolder() {
-        return folder;
-    }
-
-    @Override
-    public String getPath() {
-        return path;
-    }
-
-    protected VolumeVO() {
-    }
-
-    @Override
-    public Long getSize() {
-        return size;
-    }
-
-    public void setSize(Long size) {
-        this.size = size;
-    }
-
-    @Override
-    public Long getInstanceId() {
-        return instanceId;
-    }
-
-    @Override
-    public Long getDeviceId() {
-        return deviceId;
-    }
-
-    public void setDeviceId(Long deviceId) {
-        this.deviceId = deviceId;
-    }
-
-    @Override
-    public Type getVolumeType() {
-        return volumeType;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setFolder(String folder) {
-        this.folder = folder;
-    }
-
-    public void setAccountId(long accountId) {
-        this.accountId = accountId;
-    }
-
-    public void setDomainId(long domainId) {
-        this.domainId = domainId;
-    }
-
-    public void setInstanceId(Long instanceId) {
-        this.instanceId = instanceId;
-    }
-
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    public String getHostIp() {
-        return hostip;
-    }
-
-    public void setHostIp(String hostip) {
-        this.hostip = hostip;
-    }
-
-    public void setPodId(Long podId) {
-        this.podId = podId;
-    }
-
-    public void setDataCenterId(long dataCenterId) {
-        this.dataCenterId = dataCenterId;
-    }
-
-    public void setVolumeType(Type type) {
-        volumeType = type;
-    }
-
-    @Override
-    public Date getCreated() {
-        return created;
-    }
-
-    public Date getRemoved() {
-        return removed;
-    }
-
-    public void setRemoved(Date removed) {
-        this.removed = removed;
-    }
-
-    @Override
-    public long getDiskOfferingId() {
-        return diskOfferingId;
-    }
-
-    public void setDiskOfferingId(long diskOfferingId) {
-        this.diskOfferingId = diskOfferingId;
-    }
-
-    @Override
-    public Long getTemplateId() {
-        return templateId;
-    }
-
-    public void setTemplateId(Long templateId) {
-        this.templateId = templateId;
-    }
-
-    public String getFirstSnapshotBackupUuid() {
-        return firstSnapshotBackupUuid;
-    }
-
-    public void setFirstSnapshotBackupUuid(String firstSnapshotBackupUuid) {
-        this.firstSnapshotBackupUuid = firstSnapshotBackupUuid;
-    }
-
-    @Override
-    public Long getPoolId() {
-        return poolId;
-    }
-
-    public void setPoolId(Long poolId) {
-        this.poolId = poolId;
-    }
-
-    @Override
-    public Date getUpdated() {
-        return updated;
-    }
-
-    @Override
-    public State getState() {
-        return state;
-    }
-
-    public void setUpdated(Date updated) {
-        this.updated = updated;
-    }
-
-    @Override
-    public String toString() {
-        return new StringBuilder("Vol[").append(id).append("|vm=").append(instanceId).append("|").append(volumeType).append("]").toString();
-    }
-
-    @Override
-    public Date getAttached() {
-        return this.attached;
-    }
-
-    public void setAttached(Date attached) {
-        this.attached = attached;
-    }
-
-    @Override
-    public String getChainInfo() {
-        return this.chainInfo;
-    }
-
-    public void setChainInfo(String chainInfo) {
-        this.chainInfo = chainInfo;
-    }
-    
-    public Long getLastPoolId() {
-    	return this.lastPoolId;
-    }
-    
-    public void setLastPoolId(Long poolId) {
-    	this.lastPoolId = poolId;
-    }
-
-    @Override
-    public int hashCode() {
-        return NumbersUtil.hash(id);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof VolumeVO) {
-            return id == ((VolumeVO) obj).id;
-        } else {
-            return false;
-        }
-    }
-    
-    @Override
-    public String getReservationId() {
-    	return this.reservationId;
-    }
-    
-    @Override
-    public void setReservationId(String reserv) {
-    	this.reservationId = reserv;
-    }
-    
-    @Override
-    public String getUuid() {
-    	return this.uuid;
-    }
-    
-    public void setUuid(String uuid) {
-    	this.uuid = uuid;
-    }
-
-
-    public boolean isDisplayVolume() {
-        return displayVolume;
-    }
-
-    public void setDisplayVolume(boolean displayVolume) {
-        this.displayVolume = displayVolume;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/core/src/com/cloud/storage/resource/StoragePoolResource.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/resource/StoragePoolResource.java b/core/src/com/cloud/storage/resource/StoragePoolResource.java
index 5d352b0..fccfd0f 100644
--- a/core/src/com/cloud/storage/resource/StoragePoolResource.java
+++ b/core/src/com/cloud/storage/resource/StoragePoolResource.java
@@ -21,6 +21,8 @@ import com.cloud.agent.api.storage.CopyVolumeAnswer;
 import com.cloud.agent.api.storage.CopyVolumeCommand;
 import com.cloud.agent.api.storage.CreateAnswer;
 import com.cloud.agent.api.storage.CreateCommand;
+import com.cloud.agent.api.storage.CreateVolumeOVAAnswer;
+import com.cloud.agent.api.storage.CreateVolumeOVACommand;
 import com.cloud.agent.api.storage.DestroyCommand;
 import com.cloud.agent.api.storage.PrimaryStorageDownloadAnswer;
 import com.cloud.agent.api.storage.PrimaryStorageDownloadCommand;
@@ -34,5 +36,7 @@ public interface StoragePoolResource {
     
     CopyVolumeAnswer execute(CopyVolumeCommand cmd);
     
+    CreateVolumeOVAAnswer execute(CreateVolumeOVACommand cmd);
+
     CreateAnswer execute(CreateCommand cmd);
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/core/src/com/cloud/storage/snapshot/SnapshotSchedule.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/snapshot/SnapshotSchedule.java b/core/src/com/cloud/storage/snapshot/SnapshotSchedule.java
deleted file mode 100644
index 6f3d2ce..0000000
--- a/core/src/com/cloud/storage/snapshot/SnapshotSchedule.java
+++ /dev/null
@@ -1,46 +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.
-package com.cloud.storage.snapshot;
-
-import org.apache.cloudstack.api.Identity;
-import org.apache.cloudstack.api.InternalIdentity;
-
-import java.util.Date;
-
-public interface SnapshotSchedule extends InternalIdentity, Identity {
-
-    Long getVolumeId();
-
-    Long getPolicyId();
-
-    void setPolicyId(long policyId);
-
-    /**
-     * @return the scheduledTimestamp
-     */
-    Date getScheduledTimestamp();
-
-    void setScheduledTimestamp(Date scheduledTimestamp);
-
-    Long getAsyncJobId();
-
-    void setAsyncJobId(Long asyncJobId);
-
-    Long getSnapshotId();
-
-    void setSnapshotId(Long snapshotId);
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/core/src/com/cloud/user/AccountVO.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/user/AccountVO.java b/core/src/com/cloud/user/AccountVO.java
deleted file mode 100644
index 77110ae..0000000
--- a/core/src/com/cloud/user/AccountVO.java
+++ /dev/null
@@ -1,189 +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.
-package com.cloud.user;
-
-import java.util.Date;
-import java.util.UUID;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-import com.cloud.utils.db.GenericDao;
-
-@Entity
-@Table(name="account")
-public class AccountVO implements Account {
-    @Id
-    @GeneratedValue(strategy=GenerationType.IDENTITY)
-    @Column(name="id")
-    private long id;
-
-    @Column(name="account_name")
-    private String accountName = null;
-
-    @Column(name="type")
-    private short type = ACCOUNT_TYPE_NORMAL;
-
-    @Column(name="domain_id")
-    private long domainId;
-
-    @Column(name="state")
-    @Enumerated(value=EnumType.STRING)
-    private State state;
-
-    @Column(name=GenericDao.REMOVED_COLUMN)
-    private Date removed;
-
-    @Column(name="cleanup_needed")
-    private boolean needsCleanup = false;
-
-    @Column(name="network_domain")
-    private String networkDomain;
-
-    @Column(name="uuid")
-    private String uuid;
-
-    @Column(name="default_zone_id")
-    private Long defaultZoneId = null;
-    
-    @Column(name = "default")
-    boolean isDefault;
-
-    public AccountVO() {
-    	this.uuid = UUID.randomUUID().toString();
-    }
-
-    public AccountVO(long id) {
-        this.id = id;
-    	this.uuid = UUID.randomUUID().toString();
-    }
-    
-    public AccountVO(String accountName, long domainId, String networkDomain, short type, String uuid) {
-        this.accountName = accountName;
-        this.domainId = domainId;
-        this.networkDomain = networkDomain;
-        this.type = type;
-        this.state = State.enabled;
-        this.uuid = uuid;
-    }
-
-    public void setNeedsCleanup(boolean value) {
-    	needsCleanup = value;
-    }
-
-    public boolean getNeedsCleanup() {
-    	return needsCleanup;
-    }
-
-    @Override
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-		this.id = id;
-	}
-
-	@Override
-    public String getAccountName() {
-        return accountName;
-    }
-
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
-    @Override
-    public short getType() {
-        return type;
-    }
-
-    public void setType(short type) {
-        this.type = type;
-    }
-
-    @Override
-    public long getDomainId() {
-        return domainId;
-    }
-
-    public void setDomainId(long domainId) {
-        this.domainId = domainId;
-    }
-
-    @Override
-    public Long getDefaultZoneId() {
-    	return defaultZoneId;
-    }
-
-    public void setDefaultZoneId(Long defaultZoneId) {
-    	this.defaultZoneId = defaultZoneId;
-    }
-
-    @Override
-    public State getState() {
-        return state;
-    }
-
-    public void setState(State state) {
-        this.state = state;
-    }
-
-    @Override
-    public Date getRemoved() {
-        return removed;
-    }
-
-    @Override
-    public long getAccountId() {
-        return id;
-    }
-
-    @Override
-    public String toString() {
-        return new StringBuilder("Acct[").append(id).append("-").append(accountName).append("]").toString();
-    }
-
-    @Override
-    public String getNetworkDomain() {
-        return networkDomain;
-    }
-
-    public void setNetworkDomain(String networkDomain) {
-        this.networkDomain = networkDomain;
-    }
-
-    @Override
-    public String getUuid() {
-    	return this.uuid;
-    }
-
-    public void setUuid(String uuid) {
-    	this.uuid = uuid;
-    }
-
-    @Override
-    public boolean isDefault() {
-        return isDefault;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/core/src/com/cloud/user/SSHKeyPairVO.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/user/SSHKeyPairVO.java b/core/src/com/cloud/user/SSHKeyPairVO.java
deleted file mode 100644
index ab7eb8e..0000000
--- a/core/src/com/cloud/user/SSHKeyPairVO.java
+++ /dev/null
@@ -1,119 +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.
-package com.cloud.user;
-
-import org.apache.cloudstack.api.InternalIdentity;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
-@Entity
-@Table(name="ssh_keypairs")
-public class SSHKeyPairVO implements SSHKeyPair {
-	
-	@Id
-	@GeneratedValue(strategy=GenerationType.IDENTITY)
-	@Column(name="id")
-	private Long id = null;
-	
-	@Column(name="account_id")
-	private long accountId;
-	
-    @Column(name="domain_id")
-    private long domainId;
-    
-    @Column(name="keypair_name")
-    private String name;
-    
-    @Column(name="fingerprint")
-    private String fingerprint;
-    
-    @Column(name="public_key", length=5120)
-    private String publicKey;
-    
-    @Transient
-    private String privateKey;
-
-	@Override
-	public long getId() {
-		return id;
-	}
-	
-	@Override
-	public long getAccountId() {
-		return accountId;
-	}
-
-	@Override
-	public long getDomainId() {
-		return domainId;
-	}
-	
-	@Override
-	public String getFingerprint() {
-		return fingerprint;
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	public String getPublicKey() {
-		return publicKey;
-	}
-	
-	@Override
-	public String getPrivateKey() {
-		return privateKey;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public void setAccountId(long accountId) {
-		this.accountId = accountId;
-	}
-
-	public void setDomainId(long domainId) {
-		this.domainId = domainId;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public void setFingerprint(String fingerprint) {
-		this.fingerprint = fingerprint;
-	}
-
-	public void setPublicKey(String publicKey) {
-		this.publicKey = publicKey;
-	}
-	
-	public void setPrivateKey(String privateKey) {
-		this.privateKey = privateKey;
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/core/src/com/cloud/user/UserAccountVO.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/user/UserAccountVO.java b/core/src/com/cloud/user/UserAccountVO.java
deleted file mode 100644
index cfad617..0000000
--- a/core/src/com/cloud/user/UserAccountVO.java
+++ /dev/null
@@ -1,284 +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.
-package com.cloud.user;
-
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.PrimaryKeyJoinColumn;
-import javax.persistence.SecondaryTable;
-import javax.persistence.Table;
-
-import com.cloud.utils.db.Encrypt;
-import com.cloud.utils.db.GenericDao;
-import org.apache.cloudstack.api.InternalIdentity;
-
-@Entity
-@Table(name="user")
-@SecondaryTable(name="account",
-pkJoinColumns={@PrimaryKeyJoinColumn(name="account_id", referencedColumnName="id")})
-public class UserAccountVO implements UserAccount, InternalIdentity {
-    @Id
-    @GeneratedValue(strategy=GenerationType.IDENTITY)
-    @Column(name="id")
-    private Long id = null;
-
-    @Column(name="username")
-    private String username = null;
-
-    @Column(name="password")
-    private String password = null;
-
-    @Column(name="firstname")
-    private String firstname = null;
-
-    @Column(name="lastname")
-    private String lastname = null;
-
-    @Column(name="account_id")
-    private long accountId;
-
-    @Column(name="email")
-    private String email = null;
-
-    @Column(name="state")
-    private String state;
-
-    @Column(name="api_key")
-    private String apiKey = null;
-
-    @Encrypt
-    @Column(name="secret_key")
-    private String secretKey = null;
-
-    @Column(name=GenericDao.CREATED_COLUMN)
-    private Date created;
-
-    @Column(name=GenericDao.REMOVED_COLUMN)
-    private Date removed;
-
-    @Column(name="timezone")
-    private String timezone;
-
-    @Column(name="registration_token")
-    private String registrationToken = null;
-
-    @Column(name="is_registered")
-    boolean registered;
-
-    @Column (name="incorrect_login_attempts")
-    int loginAttempts;
-
-    @Column(name="account_name", table="account", insertable=false, updatable=false)
-    private String accountName = null;
-
-    @Column(name="type", table="account", insertable=false, updatable=false)
-    private short type;
-
-    @Column(name="domain_id", table="account", insertable=false, updatable=false)
-    private Long domainId = null;
-
-    @Column(name="state", table="account", insertable=false, updatable=false)
-    private String accountState;
-
-    public UserAccountVO() {}
-
-    @Override
-    public long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    @Override
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    @Override
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    @Override
-    public String getFirstname() {
-        return firstname;
-    }
-
-    public void setFirstname(String firstname) {
-        this.firstname = firstname;
-    }
-
-    @Override
-    public String getLastname() {
-        return lastname;
-    }
-
-    public void setLastname(String lastname) {
-        this.lastname = lastname;
-    }
-
-    @Override
-    public long getAccountId() {
-        return accountId;
-    }
-
-    public void setAccountId(long accountId) {
-        this.accountId = accountId;
-    }
-
-    @Override
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    @Override
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    @Override
-    public String getApiKey() {
-        return apiKey;
-    }
-
-    public void setApiKey(String apiKey) {
-        this.apiKey = apiKey;
-    }
-
-    @Override
-    public String getSecretKey() {
-        return secretKey;
-    }
-
-    public void setSecretKey(String secretKey) {
-        this.secretKey = secretKey;
-    }
-
-    @Override
-    public Date getCreated() {
-        return created;
-    }
-
-//    public void setCreated(Date created) {
-//        this.created = created;
-//    }
-
-    @Override
-    public Date getRemoved() {
-        return removed;
-    }
-
-    public void setRemoved(Date removed) {
-        this.removed = removed;
-    }
-
-    @Override
-    public String getAccountName() {
-        return accountName;
-    }
-
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
-    @Override
-    public short getType() {
-        return type;
-    }
-
-    public void setType(short type) {
-        this.type = type;
-    }
-
-    @Override
-    public Long getDomainId() {
-        return domainId;
-    }
-
-    public void setDomainId(Long domainId) {
-        this.domainId = domainId;
-    }
-
-    @Override
-    public String getAccountState() {
-        return accountState;
-    }
-
-    public void setAccountDisabled(String accountState) {
-        this.accountState = accountState;
-    }
-
-    @Override
-    public String getTimezone(){
-        return timezone;
-    }
-
-    public void setTimezone(String timezone)
-    {
-        this.timezone = timezone; 
-    }
-
-    @Override
-    public String getRegistrationToken(){
-        return registrationToken;
-    }
-
-    public void setRegistrationToken(String registrationToken)
-    {
-        this.registrationToken = registrationToken; 
-    }
-
-    @Override 
-    public boolean isRegistered() {
-        return registered;
-    }
-
-    public void setRegistered(boolean registered) {
-        this.registered = registered;
-    }
-
-    public void setLoginAttempts(int loginAttempts) {
-        this.loginAttempts = loginAttempts;
-    }
-
-    public int getLoginAttempts() {
-        return loginAttempts;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/core/src/com/cloud/user/UserStatisticsVO.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/user/UserStatisticsVO.java b/core/src/com/cloud/user/UserStatisticsVO.java
deleted file mode 100644
index eb59a74..0000000
--- a/core/src/com/cloud/user/UserStatisticsVO.java
+++ /dev/null
@@ -1,165 +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.
-package com.cloud.user;
-
-import org.apache.cloudstack.api.InternalIdentity;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-@Entity
-@Table(name="user_statistics")
-public class UserStatisticsVO implements InternalIdentity {
-	@Id
-	@GeneratedValue(strategy=GenerationType.IDENTITY)
-	@Column(name="id")
-	private Long id;
-	
-	@Column(name="data_center_id", updatable=false)
-	private long dataCenterId;
-	
-	@Column(name="account_id", updatable=false)
-	private long accountId;
-	
-	@Column(name="public_ip_address")
-	private String publicIpAddress;
-	
-	@Column(name="device_id")
-	private Long deviceId;
-	
-	@Column(name="device_type")
-	private String deviceType;
-	
-	@Column(name="network_id")
-	private Long networkId;
-
-	
-	@Column(name="net_bytes_received")
-	private long netBytesReceived;
-	
-	@Column(name="net_bytes_sent")
-	private long netBytesSent;
-	
-	@Column(name="current_bytes_received")
-	private long currentBytesReceived;
-	
-	@Column(name="current_bytes_sent")
-	private long currentBytesSent;
-	
-	@Column(name="agg_bytes_received")
-	private long aggBytesReceived;
-	
-	@Column(name="agg_bytes_sent")
-	private long aggBytesSent;
-	
-	protected UserStatisticsVO() {
-	}
-	
-	public UserStatisticsVO(long accountId, long dcId, String publicIpAddress, Long deviceId, String deviceType, Long networkId) {
-		this.accountId = accountId;
-		this.dataCenterId = dcId;
-		this.publicIpAddress = publicIpAddress;
-		this.deviceId = deviceId;
-		this.deviceType = deviceType;
-		this.networkId = networkId;
-		this.netBytesReceived = 0;
-		this.netBytesSent = 0;
-		this.currentBytesReceived = 0;
-		this.currentBytesSent = 0;
-	}
-
-	public long getAccountId() {
-		return accountId;
-	}
-
-	public long getId() {
-        return id;
-    }
-
-    public long getDataCenterId() {
-        return dataCenterId;
-    }
-    
-    public String getPublicIpAddress() {
-    	return publicIpAddress;
-    }
-    
-    public Long getDeviceId() {
-    	return deviceId;
-    }
-
-    public String getDeviceType() {
-        return deviceType;
-    }
-    
-    public Long getNetworkId() {
-        return networkId;
-    }
-    
-    public long getCurrentBytesReceived() {
-        return currentBytesReceived;
-    }
-
-    public void setCurrentBytesReceived(long currentBytesReceived) {
-        this.currentBytesReceived = currentBytesReceived;
-    }
-
-    public long getCurrentBytesSent() {
-        return currentBytesSent;
-    }
-
-    public void setCurrentBytesSent(long currentBytesSent) {
-        this.currentBytesSent = currentBytesSent;
-    }
-
-    public long getNetBytesReceived() {
-		return netBytesReceived;
-	}
-
-	public long getNetBytesSent() {
-		return netBytesSent;
-	}
-
-	public void setNetBytesReceived(long netBytesReceived) {
-		this.netBytesReceived = netBytesReceived;
-	}
-
-	public void setNetBytesSent(long netBytesSent) {
-		this.netBytesSent = netBytesSent;
-	}
-
-	public long getAggBytesReceived() {
-		return aggBytesReceived;
-	}
-
-	public void setAggBytesReceived(long aggBytesReceived) {
-		this.aggBytesReceived = aggBytesReceived;
-	}
-
-	public long getAggBytesSent() {
-		return aggBytesSent;
-	}
-
-	public void setAggBytesSent(long aggBytesSent) {
-		this.aggBytesSent = aggBytesSent;
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/core/src/com/cloud/user/UserStatsLogVO.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/user/UserStatsLogVO.java b/core/src/com/cloud/user/UserStatsLogVO.java
deleted file mode 100644
index 6f97795..0000000
--- a/core/src/com/cloud/user/UserStatsLogVO.java
+++ /dev/null
@@ -1,132 +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.
-package com.cloud.user;
-
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-
-@Entity
-@Table(name="op_user_stats_log")
-public class UserStatsLogVO {
-	@Id
-	@Column(name="user_stats_id")
-	private long userStatsId;
-	
-	@Column(name="net_bytes_received")
-	private long netBytesReceived;
-	
-	@Column(name="net_bytes_sent")
-	private long netBytesSent;
-	
-	@Column(name="current_bytes_received")
-	private long currentBytesReceived;
-	
-	@Column(name="current_bytes_sent")
-	private long currentBytesSent;
-	
-	@Column(name="agg_bytes_received")
-	private long aggBytesReceived;
-	
-	@Column(name="agg_bytes_sent")
-	private long aggBytesSent;
-	
-	@Column(name="updated")
-	@Temporal(value=TemporalType.TIMESTAMP)
-	private Date updatedTime;
-	
-	public UserStatsLogVO(){
-	}
-	
-	public UserStatsLogVO(long userStatsId, long netBytesReceived, long netBytesSent, long currentBytesReceived, long currentBytesSent, 
-							long aggBytesReceived, long aggBytesSent, Date updatedTime) {
-		this.userStatsId = userStatsId;
-		this.netBytesReceived = netBytesReceived;
-		this.netBytesSent = netBytesSent;
-		this.currentBytesReceived = currentBytesReceived;
-		this.currentBytesSent = currentBytesSent;
-		this.aggBytesReceived = aggBytesReceived;
-		this.aggBytesSent = aggBytesSent;
-		this.updatedTime = updatedTime;
-	}
-
-	public Long getUserStatsId() {
-        return userStatsId;
-    }
-    
-    public long getCurrentBytesReceived() {
-        return currentBytesReceived;
-    }
-
-    public void setCurrentBytesReceived(long currentBytesReceived) {
-        this.currentBytesReceived = currentBytesReceived;
-    }
-
-    public long getCurrentBytesSent() {
-        return currentBytesSent;
-    }
-
-    public void setCurrentBytesSent(long currentBytesSent) {
-        this.currentBytesSent = currentBytesSent;
-    }
-
-    public long getNetBytesReceived() {
-		return netBytesReceived;
-	}
-
-	public long getNetBytesSent() {
-		return netBytesSent;
-	}
-
-	public void setNetBytesReceived(long netBytesReceived) {
-		this.netBytesReceived = netBytesReceived;
-	}
-
-	public void setNetBytesSent(long netBytesSent) {
-		this.netBytesSent = netBytesSent;
-	}
-
-	public long getAggBytesReceived() {
-		return aggBytesReceived;
-	}
-
-	public void setAggBytesReceived(long aggBytesReceived) {
-		this.aggBytesReceived = aggBytesReceived;
-	}
-
-	public long getAggBytesSent() {
-		return aggBytesSent;
-	}
-
-	public void setAggBytesSent(long aggBytesSent) {
-		this.aggBytesSent = aggBytesSent;
-	}
-
-	public Date getUpdatedTime() {
-		return updatedTime;
-	}
-
-	public void setUpdatedTime(Date updatedTime) {
-		this.updatedTime = updatedTime;
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/core/src/com/cloud/user/UserVO.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/user/UserVO.java b/core/src/com/cloud/user/UserVO.java
deleted file mode 100644
index 2a85758..0000000
--- a/core/src/com/cloud/user/UserVO.java
+++ /dev/null
@@ -1,274 +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.
-package com.cloud.user;
-
-import java.util.Date;
-import java.util.UUID;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-import org.apache.cloudstack.api.Identity;
-import org.apache.cloudstack.api.InternalIdentity;
-
-import com.cloud.user.Account.State;
-import com.cloud.utils.db.Encrypt;
-import com.cloud.utils.db.GenericDao;
-
-/**
- * A bean representing a user
- * 
- */
-@Entity
-@Table(name = "user")
-public class UserVO implements User, Identity, InternalIdentity {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private long id;
-
-    @Column(name = "username")
-    private String username = null;
-
-    @Column(name = "password")
-    private String password = null;
-
-    @Column(name = "firstname")
-    private String firstname = null;
-
-    @Column(name = "lastname")
-    private String lastname = null;
-
-    @Column(name = "account_id")
-    private long accountId;
-
-    @Column(name = "email")
-    private String email = null;
-
-    @Column(name = "state")
-    @Enumerated(value=EnumType.STRING)
-    private State state;
-
-    @Column(name = "api_key")
-    private String apiKey = null;
-
-    @Encrypt
-    @Column(name = "secret_key")
-    private String secretKey = null;
-
-    @Column(name = GenericDao.CREATED_COLUMN)
-    private Date created;
-
-    @Column(name = GenericDao.REMOVED_COLUMN)
-    private Date removed;
-
-    @Column(name = "timezone")
-    private String timezone;
-
-    @Column(name="registration_token")
-    private String registrationToken = null;
-
-    @Column(name="is_registered")
-    boolean registered;
-
-    @Column(name="uuid")
-    private String uuid;
-    
-    @Column(name = "default")
-    boolean isDefault;
-
-    public UserVO() {
-        this.uuid = UUID.randomUUID().toString();
-    }
-
-    public UserVO(long id) {
-        this.id = id;
-        this.uuid = UUID.randomUUID().toString();
-    }
-    
-    public UserVO(long accountId, String username, String password, String firstName, String lastName, String email, String timezone, String uuid) {
-        this.accountId = accountId;
-        this.username = username;
-        this.password = password;
-        this.firstname = firstName;
-        this.lastname = lastName;
-        this.email = email;
-        this.timezone = timezone;
-        this.state = State.enabled;
-    	this.uuid = uuid;
-    }
-    
-    @Override
-    public long getId() {
-        return id;
-    }
-
-    @Override
-    public Date getCreated() {
-        return created;
-    }
-
-    @Override
-    public Date getRemoved() {
-        return removed;
-    }
-
-    @Override
-    public String getUsername() {
-        return username;
-    }
-
-    @Override
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    @Override
-    public String getPassword() {
-        return password;
-    }
-
-    @Override
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    @Override
-    public String getFirstname() {
-        return firstname;
-    }
-
-    @Override
-    public void setFirstname(String firstname) {
-        this.firstname = firstname;
-    }
-
-    @Override
-    public String getLastname() {
-        return lastname;
-    }
-
-    @Override
-    public void setLastname(String lastname) {
-        this.lastname = lastname;
-    }
-
-    @Override
-    public long getAccountId() {
-        return accountId;
-    }
-
-    @Override
-    public void setAccountId(long accountId) {
-        this.accountId = accountId;
-    }
-
-    @Override
-    public String getEmail() {
-        return email;
-    }
-
-    @Override
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    @Override
-    public State getState() {
-        return state;
-    }
-
-    @Override
-    public void setState(State state) {
-        this.state = state;
-    }
-
-    @Override
-    public String getApiKey() {
-        return apiKey;
-    }
-
-    @Override
-    public void setApiKey(String apiKey) {
-        this.apiKey = apiKey;
-    }
-
-    @Override
-    public String getSecretKey() {
-        return secretKey;
-    }
-
-    @Override
-    public void setSecretKey(String secretKey) {
-        this.secretKey = secretKey;
-    }
-
-    @Override
-    public String getTimezone() {
-        return timezone;
-    }
-
-    @Override
-    public void setTimezone(String timezone) {
-        this.timezone = timezone;
-    }
-
-    @Override
-    public String getRegistrationToken(){
-        return registrationToken;
-    }
-
-    public void setRegistrationToken(String registrationToken)
-    {
-        this.registrationToken = registrationToken; 
-    }
-
-    @Override 
-    public boolean isRegistered() {
-        return registered;
-    }
-
-    public void setRegistered(boolean registered) {
-        this.registered = registered;
-    }
-
-    @Override
-    public String toString() {
-        return new StringBuilder("User[").append(id).append("-").append(username).append("]").toString();
-    }
-
-    @Override
-    public String getUuid() {
-        return this.uuid;
-    }
-
-    public void setUuid(String uuid) {
-        this.uuid = uuid;
-    }
-    
-    @Override
-    public boolean isDefault() {
-        return isDefault;
-    }
-    
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/core/src/com/cloud/vm/ConsoleProxy.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/vm/ConsoleProxy.java b/core/src/com/cloud/vm/ConsoleProxy.java
deleted file mode 100644
index 1d4fcb1..0000000
--- a/core/src/com/cloud/vm/ConsoleProxy.java
+++ /dev/null
@@ -1,27 +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.
-package com.cloud.vm;
-
-/**
- *  ConsoleProxy is a system VM instance that is used 
- *  to proxy VNC traffic
- */
-public interface ConsoleProxy extends SystemVm {
-    public int getActiveSession();
-    public byte[] getSessionDetails();
-}
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/core/src/com/cloud/vm/ConsoleProxyVO.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/vm/ConsoleProxyVO.java b/core/src/com/cloud/vm/ConsoleProxyVO.java
deleted file mode 100644
index c57b44f..0000000
--- a/core/src/com/cloud/vm/ConsoleProxyVO.java
+++ /dev/null
@@ -1,151 +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.
-package com.cloud.vm;
-
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
-import javax.persistence.PrimaryKeyJoinColumn;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.persistence.Transient;
-
-import com.cloud.hypervisor.Hypervisor.HypervisorType;
-
-/**
- * ConsoleProxyVO domain object
- */
-
-@Entity
-@Table(name = "console_proxy")
-@PrimaryKeyJoinColumn(name = "id")
-@DiscriminatorValue(value = "ConsoleProxy")
-public class ConsoleProxyVO extends VMInstanceVO implements ConsoleProxy {
-
-    @Column(name = "public_ip_address", nullable = false)
-    private String publicIpAddress;
-
-    @Column(name = "public_mac_address", nullable = false)
-    private String publicMacAddress;
-
-    @Column(name = "public_netmask", nullable = false)
-    private String publicNetmask;
-
-    @Column(name = "active_session", updatable = true, nullable = false)
-    private int activeSession;
-
-    @Temporal(TemporalType.TIMESTAMP)
-    @Column(name = "last_update", updatable = true, nullable = true)
-    private Date lastUpdateTime;
-
-    @Column(name = "session_details", updatable = true, nullable = true)
-    private byte[] sessionDetails;
-
-    @Transient
-    private boolean sslEnabled = false;
-
-    @Transient
-    private int port;
-
-    /**
-     * Correct constructor to use.
-     * 
-     */
-    public ConsoleProxyVO(long id, long serviceOfferingId, String name, long templateId, HypervisorType hypervisorType, long guestOSId, long dataCenterId, long domainId, long accountId,
-            int activeSession, boolean haEnabled) {
-        super(id, serviceOfferingId, name, name, Type.ConsoleProxy, templateId, hypervisorType, guestOSId, domainId, accountId, haEnabled);
-        this.activeSession = activeSession;
-    }
-
-    protected ConsoleProxyVO() {
-        super();
-    }
-
-    public void setPublicIpAddress(String publicIpAddress) {
-        this.publicIpAddress = publicIpAddress;
-    }
-
-    public void setPublicNetmask(String publicNetmask) {
-        this.publicNetmask = publicNetmask;
-    }
-
-    public void setPublicMacAddress(String publicMacAddress) {
-        this.publicMacAddress = publicMacAddress;
-    }
-
-    public void setActiveSession(int activeSession) {
-        this.activeSession = activeSession;
-    }
-
-    public void setLastUpdateTime(Date time) {
-        this.lastUpdateTime = time;
-    }
-
-    public void setSessionDetails(byte[] details) {
-        this.sessionDetails = details;
-    }
-
-    @Override
-    public String getPublicIpAddress() {
-        return this.publicIpAddress;
-    }
-
-    @Override
-    public String getPublicNetmask() {
-        return this.publicNetmask;
-    }
-
-    @Override
-    public String getPublicMacAddress() {
-        return this.publicMacAddress;
-    }
-
-    @Override
-    public int getActiveSession() {
-        return this.activeSession;
-    }
-
-    @Override
-    public Date getLastUpdateTime() {
-        return this.lastUpdateTime;
-    }
-
-    @Override
-    public byte[] getSessionDetails() {
-        return this.sessionDetails;
-    }
-
-    public boolean isSslEnabled() {
-        return sslEnabled;
-    }
-
-    public void setSslEnabled(boolean sslEnabled) {
-        this.sslEnabled = sslEnabled;
-    }
-
-    public void setPort(int port) {
-        this.port = port;
-    }
-
-    public int getPort() {
-        return port;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/core/src/com/cloud/vm/DomainRouterVO.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/vm/DomainRouterVO.java b/core/src/com/cloud/vm/DomainRouterVO.java
deleted file mode 100755
index 2cc9364..0000000
--- a/core/src/com/cloud/vm/DomainRouterVO.java
+++ /dev/null
@@ -1,246 +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.
-package com.cloud.vm;
-
-import javax.persistence.Column;
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.PrimaryKeyJoinColumn;
-import javax.persistence.Table;
-
-import com.cloud.hypervisor.Hypervisor.HypervisorType;
-import com.cloud.network.router.VirtualRouter;
-
-/**
- */
-@Entity
-@Table(name="domain_router")
-@PrimaryKeyJoinColumn(name="id")
-@DiscriminatorValue(value="DomainRouter")
-public class DomainRouterVO extends VMInstanceVO implements VirtualRouter {
-    @Column(name="element_id")
-    private long elementId;
-
-    @Column(name="public_ip_address")
-    private String publicIpAddress;
-
-    @Column(name="public_mac_address")
-    private String publicMacAddress;
-
-    @Column(name="public_netmask")
-    private String publicNetmask;
-
-    @Column(name="is_redundant_router")
-    boolean isRedundantRouter;
-
-    @Column(name="priority")
-    int priority;
-
-    @Column(name="is_priority_bumpup")
-    boolean isPriorityBumpUp;
-
-    @Column(name="redundant_state")
-    @Enumerated(EnumType.STRING)
-    private RedundantState redundantState;
-
-    @Column(name="stop_pending")
-    boolean stopPending;
-
-    @Column(name="role")
-    @Enumerated(EnumType.STRING)
-    private Role role = Role.VIRTUAL_ROUTER;
-
-    @Column(name="template_version")
-    private String templateVersion;
-
-    @Column(name="scripts_version")
-    private String scriptsVersion;
-
-    @Column(name="vpc_id")
-    private Long vpcId;
-
-    public DomainRouterVO(long id,
-            long serviceOfferingId,
-            long elementId,
-            String name,
-            long templateId,
-            HypervisorType hypervisorType,
-            long guestOSId,
-            long domainId,
-            long accountId,
-            boolean isRedundantRouter,
-            int priority,
-            boolean isPriorityBumpUp,
-            RedundantState redundantState,
-            boolean haEnabled,
-            boolean stopPending, Long vpcId) {
-        super(id, serviceOfferingId, name, name, Type.DomainRouter, templateId, hypervisorType, guestOSId, domainId, accountId, haEnabled);
-        this.elementId = elementId;
-        this.isRedundantRouter = isRedundantRouter;
-        this.priority = priority;
-        this.redundantState = redundantState;
-        this.isPriorityBumpUp = isPriorityBumpUp;
-        this.stopPending = stopPending;
-        this.vpcId = vpcId;
-    }
-
-    public DomainRouterVO(long id,
-            long serviceOfferingId,
-            long elementId,
-            String name,
-            long templateId,
-            HypervisorType hypervisorType,
-            long guestOSId,
-            long domainId,
-            long accountId,
-            boolean isRedundantRouter,
-            int priority,
-            boolean isPriorityBumpUp,
-            RedundantState redundantState,
-            boolean haEnabled,
-            boolean stopPending,
-            VirtualMachine.Type vmType, Long vpcId) {
-        super(id, serviceOfferingId, name, name, vmType, templateId, hypervisorType, guestOSId, domainId, accountId, haEnabled);
-        this.elementId = elementId;
-        this.isRedundantRouter = isRedundantRouter;
-        this.priority = priority;
-        this.redundantState = redundantState;
-        this.isPriorityBumpUp = isPriorityBumpUp;
-        this.stopPending = stopPending;
-        this.vpcId = vpcId;
-    }
-
-    public long getElementId() {
-        return elementId;
-    }
-
-    public void setPublicIpAddress(String publicIpAddress) {
-        this.publicIpAddress = publicIpAddress;
-    }
-
-    public void setPublicMacAddress(String publicMacAddress) {
-        this.publicMacAddress = publicMacAddress;
-    }
-
-    public void setPublicNetmask(String publicNetmask) {
-        this.publicNetmask = publicNetmask;
-    }
-
-    @Override
-    public long getDataCenterId() {
-        return dataCenterId;
-    }
-
-    public String getPublicNetmask() {
-        return publicNetmask;
-    }
-
-    public String getPublicMacAddress() {
-        return publicMacAddress;
-    }
-
-    protected DomainRouterVO() {
-        super();
-    }
-
-    @Override
-    public String getPublicIpAddress() {
-        return publicIpAddress;
-    }
-
-    @Override
-    public Role getRole() {
-        return role;
-    }
-
-    public void setRole(Role role) {
-        this.role = role;
-    }
-
-    @Override
-    public boolean getIsRedundantRouter() {
-        return this.isRedundantRouter;
-    }
-
-    public void setIsRedundantRouter(boolean isRedundantRouter) {
-        this.isRedundantRouter = isRedundantRouter;
-    }
-
-    @Override
-    public long getServiceOfferingId() {
-        return serviceOfferingId;
-    }
-
-    public int getPriority() {
-        return this.priority;
-    }
-
-    public void setPriority(int priority) {
-        this.priority = priority;
-    }
-
-    @Override
-    public RedundantState getRedundantState() {
-        return this.redundantState;
-    }
-
-    public void setRedundantState(RedundantState redundantState) {
-        this.redundantState = redundantState;
-    }
-
-    public boolean getIsPriorityBumpUp() {
-        return this.isPriorityBumpUp;
-    }
-
-    public void setIsPriorityBumpUp(boolean isPriorityBumpUp) {
-        this.isPriorityBumpUp = isPriorityBumpUp;
-    }
-
-    @Override
-    public boolean isStopPending() {
-        return this.stopPending;
-    }
-
-    @Override
-    public void setStopPending(boolean stopPending) {
-        this.stopPending = stopPending;
-    }
-
-    public String getTemplateVersion() {
-        return this.templateVersion;
-    }
-
-    public void setTemplateVersion(String templateVersion) {
-        this.templateVersion = templateVersion;
-    }
-
-    public String getScriptsVersion() {
-        return this.scriptsVersion;
-    }
-
-    public void setScriptsVersion(String scriptsVersion) {
-        this.scriptsVersion = scriptsVersion;
-    }
-
-    @Override
-    public Long getVpcId() {
-        return vpcId;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/core/src/com/cloud/vm/InstanceGroupVMMapVO.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/vm/InstanceGroupVMMapVO.java b/core/src/com/cloud/vm/InstanceGroupVMMapVO.java
deleted file mode 100644
index 996655d..0000000
--- a/core/src/com/cloud/vm/InstanceGroupVMMapVO.java
+++ /dev/null
@@ -1,71 +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.
-package com.cloud.vm;
-
-import org.apache.cloudstack.api.InternalIdentity;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.PrimaryKeyJoinColumn;
-import javax.persistence.SecondaryTable;
-import javax.persistence.SecondaryTables;
-import javax.persistence.Table;
-
-@Entity
-@Table(name=("instance_group_vm_map"))
-@SecondaryTables({
-@SecondaryTable(name="user_vm",
-        pkJoinColumns={@PrimaryKeyJoinColumn(name="instance_id", referencedColumnName="id")}),      
-@SecondaryTable(name="instance_group", 
-		pkJoinColumns={@PrimaryKeyJoinColumn(name="group_id", referencedColumnName="id")})
-		})
-public class InstanceGroupVMMapVO implements InternalIdentity {
-    @Id
-    @GeneratedValue(strategy=GenerationType.IDENTITY)
-    @Column(name="id")
-    private Long id;
-
-    @Column(name="group_id")
-    private long groupId;
-
-    @Column(name="instance_id")
-    private long instanceId;
-    
-
-    public InstanceGroupVMMapVO() { }
-
-    public InstanceGroupVMMapVO(long groupId, long instanceId) {
-        this.groupId = groupId;
-        this.instanceId = instanceId;
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public long getGroupId() {
-        return groupId;
-    }
-
-    public long getInstanceId() {
-        return instanceId;
-    }
-
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/core/src/com/cloud/vm/InstanceGroupVO.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/vm/InstanceGroupVO.java b/core/src/com/cloud/vm/InstanceGroupVO.java
deleted file mode 100644
index ad66b5a..0000000
--- a/core/src/com/cloud/vm/InstanceGroupVO.java
+++ /dev/null
@@ -1,120 +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.
-package com.cloud.vm;
-
-import java.util.Date;
-import java.util.UUID;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.PrimaryKeyJoinColumn;
-import javax.persistence.SecondaryTable;
-import javax.persistence.Table;
-
-import org.apache.cloudstack.api.Identity;
-import com.cloud.utils.db.GenericDao;
-import org.apache.cloudstack.api.InternalIdentity;
-
-@Entity
-@Table(name="instance_group")
-@SecondaryTable(name="account",
-        pkJoinColumns={@PrimaryKeyJoinColumn(name="account_id", referencedColumnName="id")})
-public class InstanceGroupVO implements InstanceGroup {
-    @Id
-    @GeneratedValue(strategy=GenerationType.IDENTITY)
-    @Column(name="id")
-    private long id;
-    
-    @Column(name="name")
-    String name;
-    
-    @Column(name="account_id")
-    private long accountId;
-    
-    @Column(name="domain_id", table="account", insertable=false, updatable=false)
-    private long domainId;
-    
-    @Column(name=GenericDao.REMOVED_COLUMN)
-    private Date removed;
-
-    @Column(name=GenericDao.CREATED_COLUMN)
-    private Date created;
-
-    @Column(name="uuid")
-    private String uuid;
-    
-	@Column(name="type", table="account", insertable=false, updatable=false)
-	private short accountType;
-    
-    public InstanceGroupVO(String name, long accountId) {
-        this.name = name;
-        this.accountId = accountId;
-        this.uuid = UUID.randomUUID().toString();
-    }
-    
-    protected InstanceGroupVO() {
-        super();
-    }
-    
-    @Override
-    public long getId() {
-    	return id;
-    }
-    
-    @Override
-    public String getName() {
-    	return name; 
-    }
-    
-    @Override
-    public long getAccountId() {
-        return accountId;
-    }
-    
-    public long getDomainId() {
-        return domainId;
-    }
-    
-    public Date getRemoved() {
-        return removed;
-    }
-    
-	public Date getCreated() {
-		return created;
-	}
-    
-    public void setName(String name) {
-    	this.name = name;
-    }
-
-    @Override
-    public String getUuid() {
-    	return this.uuid;
-    }
-    
-    public void setUuid(String uuid) {
-    	this.uuid = uuid;
-    }
-    
-	@Override
-	public Short getAccountType() {
-		return accountType;
-	}
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/core/src/com/cloud/vm/SecondaryStorageVm.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/vm/SecondaryStorageVm.java b/core/src/com/cloud/vm/SecondaryStorageVm.java
deleted file mode 100644
index 9acff14..0000000
--- a/core/src/com/cloud/vm/SecondaryStorageVm.java
+++ /dev/null
@@ -1,26 +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.
-package com.cloud.vm;
-
-/**
- *  Secondary Storage VM is a system VM instance that is used 
- *  to interface the management server to secondary storage
- */
-public interface SecondaryStorageVm extends SystemVm {
-	enum Role { templateProcessor, commandExecutor } 
-}
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/core/src/com/cloud/vm/SecondaryStorageVmVO.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/vm/SecondaryStorageVmVO.java b/core/src/com/cloud/vm/SecondaryStorageVmVO.java
deleted file mode 100644
index aa2efa5..0000000
--- a/core/src/com/cloud/vm/SecondaryStorageVmVO.java
+++ /dev/null
@@ -1,135 +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.
-package com.cloud.vm;
-
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.PrimaryKeyJoinColumn;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-
-import com.cloud.hypervisor.Hypervisor.HypervisorType;
-
-/**
- * SecondaryStorageVmVO domain object
- */
-
-@Entity
-@Table(name = "secondary_storage_vm")
-@PrimaryKeyJoinColumn(name = "id")
-@DiscriminatorValue(value = "SecondaryStorageVm")
-public class SecondaryStorageVmVO extends VMInstanceVO implements SecondaryStorageVm {
-
-    @Column(name = "public_ip_address", nullable = false)
-    private String publicIpAddress;
-
-    @Column(name = "public_mac_address", nullable = false)
-    private String publicMacAddress;
-
-    @Column(name = "public_netmask", nullable = false)
-    private String publicNetmask;
-
-    @Column(name = "guid", nullable = false)
-    private String guid;
-
-    @Column(name = "nfs_share", nullable = false)
-    private String nfsShare;
-
-    @Column(name = "role", nullable = false)
-    @Enumerated(value = EnumType.STRING)
-    private Role role;
-
-    @Temporal(TemporalType.TIMESTAMP)
-    @Column(name = "last_update", updatable = true, nullable = true)
-    private Date lastUpdateTime;
-
-    public SecondaryStorageVmVO(long id, long serviceOfferingId, String name, long templateId, HypervisorType hypervisorType, long guestOSId, long dataCenterId, long domainId, long accountId,
-            Role role, boolean haEnabled) {
-        super(id, serviceOfferingId, name, name, Type.SecondaryStorageVm, templateId, hypervisorType, guestOSId, domainId, accountId, haEnabled);
-        this.role = role;
-    }
-
-    protected SecondaryStorageVmVO() {
-        super();
-    }
-
-    public void setPublicIpAddress(String publicIpAddress) {
-        this.publicIpAddress = publicIpAddress;
-    }
-
-    public void setPublicNetmask(String publicNetmask) {
-        this.publicNetmask = publicNetmask;
-    }
-
-    public void setPublicMacAddress(String publicMacAddress) {
-        this.publicMacAddress = publicMacAddress;
-    }
-
-    public void setLastUpdateTime(Date time) {
-        this.lastUpdateTime = time;
-    }
-
-    @Override
-    public String getPublicIpAddress() {
-        return this.publicIpAddress;
-    }
-
-    @Override
-    public String getPublicNetmask() {
-        return this.publicNetmask;
-    }
-
-    @Override
-    public String getPublicMacAddress() {
-        return this.publicMacAddress;
-    }
-
-    @Override
-    public Date getLastUpdateTime() {
-        return this.lastUpdateTime;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid;
-    }
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setNfsShare(String nfsShare) {
-        this.nfsShare = nfsShare;
-    }
-
-    public String getNfsShare() {
-        return nfsShare;
-    }
-
-    public Role getRole() {
-        return this.role;
-    }
-
-    public void setRole(Role role) {
-        this.role = role;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/core/src/com/cloud/vm/SystemVm.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/vm/SystemVm.java b/core/src/com/cloud/vm/SystemVm.java
deleted file mode 100644
index a697d08..0000000
--- a/core/src/com/cloud/vm/SystemVm.java
+++ /dev/null
@@ -1,26 +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.
-package com.cloud.vm;
-
-import java.util.Date;
-
-public interface SystemVm extends VirtualMachine {
-    public String getPublicIpAddress();
-    public String getPublicNetmask();
-    public String getPublicMacAddress();
-    public Date getLastUpdateTime();
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/core/src/com/cloud/vm/UserVmCloneSettingVO.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/vm/UserVmCloneSettingVO.java b/core/src/com/cloud/vm/UserVmCloneSettingVO.java
deleted file mode 100644
index 24bb1e8..0000000
--- a/core/src/com/cloud/vm/UserVmCloneSettingVO.java
+++ /dev/null
@@ -1,50 +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.
-package com.cloud.vm;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-@Entity
-@Table(name="user_vm_clone_setting")
-public class UserVmCloneSettingVO {
-
-    @Column(name="vm_id")
-    private Long vmId;
-
-    @Column(name="clone_type")
-    private String cloneType;
-
-    public UserVmCloneSettingVO() {
-
-    }
-
-    public UserVmCloneSettingVO(long id,
-            String cloneType) {
-        this.vmId = id;
-        this.cloneType = cloneType;
-    }
-
-    public long getVmId() {
-        return this.vmId;
-    }
-
-    public String getCloneType() {
-        return this.cloneType;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/core/src/com/cloud/vm/UserVmDetailVO.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/vm/UserVmDetailVO.java b/core/src/com/cloud/vm/UserVmDetailVO.java
deleted file mode 100644
index 245b577..0000000
--- a/core/src/com/cloud/vm/UserVmDetailVO.java
+++ /dev/null
@@ -1,85 +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.
-package com.cloud.vm;
-
-import org.apache.cloudstack.api.InternalIdentity;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-@Entity
-@Table(name="user_vm_details")
-public class UserVmDetailVO implements InternalIdentity {
-    @Id
-    @GeneratedValue(strategy=GenerationType.IDENTITY)
-    @Column(name="id")
-    private long id;
-    
-    @Column(name="vm_id")
-    private long vmId;
-    
-    @Column(name="name")
-    private String name;
-    
-    @Column(name="value", length=1024)
-    private String value;
-    
-    public UserVmDetailVO() {}
-    
-    public UserVmDetailVO(long vmId, String name, String value) {
-    	this.vmId = vmId;
-    	this.name = name;
-    	this.value = value;
-    }
-
-	public long getId() {
-		return id;
-	}
-
-	public long getVmId() {
-		return vmId;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public String getValue() {
-		return value;
-	}
-
-	public void setId(long id) {
-		this.id = id;
-	}
-
-	public void setVmId(long vmId) {
-		this.vmId = vmId;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public void setValue(String value) {
-		this.value = value;
-	}
-	
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/core/src/com/cloud/vm/UserVmVO.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/vm/UserVmVO.java b/core/src/com/cloud/vm/UserVmVO.java
deleted file mode 100755
index 2e9bdf5..0000000
--- a/core/src/com/cloud/vm/UserVmVO.java
+++ /dev/null
@@ -1,141 +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.
-package com.cloud.vm;
-
-import java.util.HashMap;
-
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.PrimaryKeyJoinColumn;
-import javax.persistence.Table;
-
-import com.cloud.hypervisor.Hypervisor.HypervisorType;
-import com.cloud.uservm.UserVm;
-
-@Entity
-@Table(name="user_vm")
-@DiscriminatorValue(value="User")
-@PrimaryKeyJoinColumn(name="id")
-public class UserVmVO extends VMInstanceVO implements UserVm {
-
-    @Column(name="iso_id", nullable=true, length=17)
-    private Long isoId = null;
-    
-    @Column(name="user_data", updatable=true, nullable=true, length=32768)
-    @Basic(fetch = FetchType.LAZY)
-    private String userData;
-    
-    @Column(name="display_name", updatable=true, nullable=true)
-    private String displayName;
-    
-    @Column(name="update_parameters", updatable=true)
-    protected boolean updateParameters = true;
-    
-    transient String password;
-
-    @Override
-    public String getPassword() {
-        return password;
-    }
-    
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    @Override
-    public Long getIsoId() {
-        return isoId;
-    }
-    
-    @Override
-    public long getServiceOfferingId() {
-        return serviceOfferingId;
-    }
-
-    public UserVmVO(long id,
-                    String instanceName,
-                    String displayName,
-                    long templateId,
-                    HypervisorType hypervisorType,
-                    long guestOsId,
-                    boolean haEnabled,
-                    boolean limitCpuUse,
-                    long domainId,
-                    long accountId,
-                    long serviceOfferingId,
-                    String userData,
-                    String name, Long diskOfferingId) {
-        super(id, serviceOfferingId, name, instanceName, Type.User, templateId, hypervisorType, guestOsId, domainId, accountId, haEnabled, limitCpuUse, diskOfferingId);
-        this.userData = userData;
-        this.displayName = displayName;
-    	this.details = new HashMap<String, String>();
-    }
-    
-    protected UserVmVO() {
-        super();
-    }
-
-	public void setIsoId(Long id) {
-	    this.isoId = id;
-	}
-	
-    @Override
-	public void setUserData(String userData) {
-		this.userData = userData;
-	}
-
-    @Override
-	public String getUserData() {
-		return userData;
-	}
-	
-	@Override
-	public String getDisplayName() {
-	    return displayName;
-	}
-	
-	public void setDisplayName(String displayName) {
-	    this.displayName = displayName;
-	}
-	
-    @Override
-    public String getDetail(String name) {
-        assert (details != null) : "Did you forget to load the details?";
-        
-        return details != null ? details.get(name) : null;
-    }
-    
-    @Override
-    public void setAccountId(long accountId){
-        this.accountId = accountId;
-    }
-    
-    public void setDomainId(long domainId){
-        this.domainId = domainId;
-    }
-
-    public void setUpdateParameters(boolean updateParameters) {
-        this.updateParameters = updateParameters;
-    }
-
-    public boolean isUpdateParameters() {
-        return updateParameters;
-    }
-}


Mime
View raw message