Merge branch 'master' into vpc
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/c5e34937 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c5e34937 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/c5e34937 Branch: refs/heads/master Commit: c5e3493792876090736f4e5ef42fa862508630ab Parents: 3a6d890 a25e20a Author: Alena Prokharchyk <[email protected]> Authored: Wed Aug 8 18:38:35 2012 -0700 Committer: Alena Prokharchyk <[email protected]> Committed: Wed Aug 8 18:38:35 2012 -0700 ---------------------------------------------------------------------- .gitignore | 1 + KEYS | 88 +++ LICENSE | 286 +++++++++ LICENSE_BIN | 498 +++++++++++++++ NOTICE | 9 +- NOTICE_BIN | 19 + agent/bindir/cloud-setup-agent.in | 32 +- agent/conf/agent.properties | 39 +- agent/conf/dummy.agent.properties | 34 - agent/src/com/cloud/agent/AgentShell.java | 2 +- api/src/com/cloud/user/UserContext.java | 15 +- cloud.spec | 1 - core/src/com/cloud/network/VpnUserVO.java | 94 ++-- .../network/security/SecurityGroupRulesVO.java | 9 +- core/src/com/cloud/user/UserAccountVO.java | 36 +- core/src/com/cloud/user/UserVO.java | 43 +- core/src/com/cloud/vm/VMInstanceVO.java | 7 +- deps/cloud-ejb-api-3.0.jar | Bin 0 -> 32941 bytes deps/cloud-javax.persistence-2.0.0.jar | Bin 0 -> 134684 bytes docs/en-US/about-physical-networks.xml | 24 + docs/en-US/about-pods.xml | 11 +- docs/en-US/about-zones.xml | 32 + docs/en-US/advanced-zone-guest-ip-addresses.xml | 9 + docs/en-US/advanced-zone-network-traffic-types.xml | 16 + docs/en-US/advanced-zone-public-ip-addresses.xml | 9 + docs/en-US/basic-zone-guest-ip-addresses.xml | 9 + docs/en-US/basic-zone-network-traffic-types.xml | 17 + .../physical-network-configuration-settings.xml | 18 + docs/en-US/provisioning.xml | 2 +- docs/en-US/system-reserved-ip-addresses.xml | 20 + .../kvm/resource/LibvirtComputingResource.java | 54 +-- .../com/cloud/network/CiscoNexusVSMDeviceVO.java | 147 +++-- server/src/com/cloud/user/AccountDetailVO.java | 17 +- server/src/com/cloud/user/AccountManagerImpl.java | 3 - utils/.classpath | 20 +- utils/src/com/cloud/utils/db/Attribute.java | 7 +- utils/src/com/cloud/utils/db/Encrypt.java | 32 + utils/src/com/cloud/utils/db/GenericDaoBase.java | 3 +- utils/src/com/cloud/utils/db/JoinType.java | 32 + utils/src/com/cloud/utils/db/SqlGenerator.java | 17 +- utils/src/javax/ejb/Local.java | 56 -- .../src/javax/persistence/AssociationOverride.java | 97 --- .../javax/persistence/AssociationOverrides.java | 88 --- utils/src/javax/persistence/AttributeOverride.java | 105 --- .../src/javax/persistence/AttributeOverrides.java | 70 -- utils/src/javax/persistence/Basic.java | 86 --- utils/src/javax/persistence/CascadeType.java | 62 -- utils/src/javax/persistence/CollectionTable.java | 22 - utils/src/javax/persistence/Column.java | 144 ----- utils/src/javax/persistence/ColumnResult.java | 80 --- .../src/javax/persistence/DiscriminatorColumn.java | 101 --- utils/src/javax/persistence/DiscriminatorType.java | 53 -- .../src/javax/persistence/DiscriminatorValue.java | 95 --- utils/src/javax/persistence/ElementCollection.java | 16 - utils/src/javax/persistence/Embeddable.java | 62 -- utils/src/javax/persistence/Embedded.java | 67 -- utils/src/javax/persistence/EmbeddedId.java | 62 -- utils/src/javax/persistence/Entity.java | 59 -- .../javax/persistence/EntityExistsException.java | 87 --- utils/src/javax/persistence/EntityListeners.java | 57 -- .../javax/persistence/EntityNotFoundException.java | 71 -- utils/src/javax/persistence/EntityResult.java | 86 --- utils/src/javax/persistence/EntityTransaction.java | 90 --- utils/src/javax/persistence/EnumType.java | 51 -- utils/src/javax/persistence/Enumerated.java | 73 --- utils/src/javax/persistence/FetchType.java | 65 -- utils/src/javax/persistence/FieldResult.java | 81 --- utils/src/javax/persistence/FlushModeType.java | 67 -- utils/src/javax/persistence/GeneratedValue.java | 90 --- utils/src/javax/persistence/GenerationType.java | 74 --- utils/src/javax/persistence/Id.java | 59 -- utils/src/javax/persistence/IdClass.java | 73 --- utils/src/javax/persistence/Inheritance.java | 70 -- utils/src/javax/persistence/InheritanceType.java | 58 -- utils/src/javax/persistence/JoinColumn.java | 139 ---- utils/src/javax/persistence/JoinColumns.java | 71 -- utils/src/javax/persistence/JoinTable.java | 122 ---- utils/src/javax/persistence/Lob.java | 68 -- utils/src/javax/persistence/LockModeType.java | 86 --- utils/src/javax/persistence/ManyToMany.java | 146 ----- utils/src/javax/persistence/ManyToOne.java | 99 --- utils/src/javax/persistence/MapKey.java | 120 ---- utils/src/javax/persistence/MappedSuperclass.java | 152 ----- utils/src/javax/persistence/OneToMany.java | 123 ---- utils/src/javax/persistence/OneToOne.java | 134 ---- utils/src/javax/persistence/OrderBy.java | 110 ---- .../javax/persistence/PersistenceException.java | 86 --- utils/src/javax/persistence/PostLoad.java | 54 -- utils/src/javax/persistence/PostPersist.java | 54 -- utils/src/javax/persistence/PostRemove.java | 54 -- utils/src/javax/persistence/PostUpdate.java | 54 -- .../javax/persistence/PrimaryKeyJoinColumn.java | 120 ---- .../javax/persistence/PrimaryKeyJoinColumns.java | 73 --- utils/src/javax/persistence/SecondaryTable.java | 120 ---- utils/src/javax/persistence/SecondaryTables.java | 80 --- utils/src/javax/persistence/SequenceGenerator.java | 91 --- .../src/javax/persistence/SqlResultSetMapping.java | 87 --- .../javax/persistence/SqlResultSetMappings.java | 54 -- utils/src/javax/persistence/Table.java | 91 --- utils/src/javax/persistence/TableGenerator.java | 157 ----- utils/src/javax/persistence/Temporal.java | 69 -- utils/src/javax/persistence/TemporalType.java | 54 -- utils/src/javax/persistence/Transient.java | 64 -- utils/src/javax/persistence/UniqueConstraint.java | 67 -- utils/src/javax/persistence/Version.java | 77 --- utils/src/javax/persistence/package.html | 19 - 106 files changed, 1409 insertions(+), 5675 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c5e34937/core/src/com/cloud/vm/VMInstanceVO.java ---------------------------------------------------------------------- diff --cc core/src/com/cloud/vm/VMInstanceVO.java index 22c29a7,4972909..8cb5816 --- a/core/src/com/cloud/vm/VMInstanceVO.java +++ b/core/src/com/cloud/vm/VMInstanceVO.java @@@ -47,20 -48,21 +48,21 @@@ import com.cloud.vm.VirtualMachine.Stat @Inheritance(strategy=InheritanceType.JOINED) @DiscriminatorColumn(name="type", discriminatorType=DiscriminatorType.STRING, length=32) public class VMInstanceVO implements VirtualMachine, FiniteStateObject<State, VirtualMachine.Event> { - @Id + @Id @TableGenerator(name="vm_instance_sq", table="sequence", pkColumnName="name", valueColumnName="value", pkColumnValue="vm_instance_seq", allocationSize=1) @Column(name="id", updatable=false, nullable = false) - protected long id; + protected long id; @Column(name="name", updatable=false, nullable=false, length=255) - protected String hostName = null; + protected String hostName = null; - @Column(name="vnc_password", updatable=true, nullable=false, length=255, encryptable=true) + @Encrypt + @Column(name="vnc_password", updatable=true, nullable=false, length=255) protected String vncPassword; - + @Column(name="proxy_id", updatable=true, nullable=true) protected Long proxyId; - + @Temporal(TemporalType.TIMESTAMP) @Column(name="proxy_assign_time", updatable=true, nullable=true) protected Date proxyAssignTime; @@@ -146,19 -148,19 +148,19 @@@ @Column(name="uuid") protected String uuid = UUID.randomUUID().toString(); - ; + ; - + public VMInstanceVO(long id, - long serviceOfferingId, - String name, - String instanceName, - Type type, - Long vmTemplateId, - HypervisorType hypervisorType, - long guestOSId, - long domainId, - long accountId, - boolean haEnabled) { + long serviceOfferingId, + String name, + String instanceName, + Type type, + Long vmTemplateId, + HypervisorType hypervisorType, + long guestOSId, + long domainId, + long accountId, + boolean haEnabled) { this.id = id; this.hostName = name != null ? name : this.uuid; if (vmTemplateId != null) { @@@ -404,14 -406,15 +406,15 @@@ haEnabled = value; } - public void setReservationId(String reservationId) { - this.reservationId = reservationId; - } - - public String getReservationId() { - return this.reservationId; - } - + public void setReservationId(String reservationId) { + this.reservationId = reservationId; + } + + public String getReservationId() { + return this.reservationId; + } + + @Override public Map<String, String> getDetails() { return details; }
