how to complie 4.3 in win7+eclipse

.gitignore

@@ -83,3 +83,6 @@ build-indep-stamp
 configure-stamp
 *_flymake.js
 engine/storage/integration-test/test-output
+tools/apidoc/log/
+log/
+scripts/vm/hypervisor/xenserver/vhd-util

CHANGES

@@ -5,13 +5,13 @@ Apache CloudStack CHANGES
 Full release notes for each release are located in the project's documentation website:  
 http://cloudstack.apache.org/docs
 
-Version 4.2.0
+Version 4.3.0
 ------------------------
+Please refer to release notes for list of changes 
 
-In progress
-
-
-
+Version 4.2.0
+-----------------------
+Released on October 1 2013. Please refer to Release Notes for list of changes
 
 Version 4.1.0
 ------------------------

README.md

@@ -1,4 +1,4 @@
-Apache CloudStack Version 4.2.0
+Apache CloudStack Version 4.3.0
 
 # About Apache CloudStack
 

agent/conf/agent.properties

@@ -114,3 +114,7 @@ domr.scripts.dir=scripts/network/domr/kvm
 # for examples:"Conroe" "Penryn", "Nehalem", "Westmere", "pentiumpro" and so
 # on,run virsh capabilities for more details.
 # guest.cpu.model=
+#
+# vm.memballoon.disable=true
+# Disable memory ballooning on vm guests for overcommit, by default overcommit
+# feature enables balloon and sets currentMemory to a minimum value

agent/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.3.0-SNAPSHOT</version>
+    <version>4.3.0</version>
   </parent>
   <dependencies>
     <dependency>

agent/src/com/cloud/agent/resource/DummyResource.java

@@ -169,7 +169,7 @@ public StartupCommand[] initialize() {
         final StartupRoutingCommand cmd = new StartupRoutingCommand(
                 (Integer) info.get(0), (Long) info.get(1), (Long) info.get(2),
                 (Long) info.get(4), (String) info.get(3), HypervisorType.KVM,
-                RouterPrivateIpStrategy.HostLocal, changes);
+                RouterPrivateIpStrategy.HostLocal, changes, null);
         fillNetworkInformation(cmd);
         cmd.getHostDetails().putAll(getVersionStrings());
         cmd.setCluster(getConfiguredProperty("cluster", "1"));

api/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.3.0-SNAPSHOT</version>
+    <version>4.3.0</version>
   </parent>
   <dependencies>
     <dependency>

api/src/com/cloud/agent/api/HostVmStateReportEntry.java

@@ -19,16 +19,29 @@
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachine.PowerState;
 
+//
+// TODO vmsync
+// We should also have a HostVmStateReport class instead of using raw Map<> data structure,
+// for now, we store host-specific info at each VM entry and host fields are fixed
+// 
+// This needs to be refactor-ed afterwards
+//
 public class HostVmStateReportEntry {
     VirtualMachine.PowerState state;
+
+    // host name or host uuid
     String host;
+
+    // XS needs Xen Tools version info
+    String hostToolsVersion;
 
     public HostVmStateReportEntry() {
     }
 
-    public HostVmStateReportEntry(PowerState state, String host) {
+    public HostVmStateReportEntry(PowerState state, String host, String hostToolsVersion) {
         this.state = state;
         this.host = host;
+        this.hostToolsVersion = hostToolsVersion;
     }
 
     public PowerState getState() {
@@ -38,4 +51,8 @@ public PowerState getState() {
     public String getHost() {
         return host;
     }
+
+    public String getHostToolsVersion() {
+    	return hostToolsVersion;
+    }
 }

api/src/com/cloud/agent/api/to/VirtualMachineTO.java

@@ -60,6 +60,7 @@ public class VirtualMachineTO {
 
     DiskTO[] disks;
     NicTO[] nics;
+    Integer vcpuMaxLimit;
 
     public VirtualMachineTO(long id, String instanceName, VirtualMachine.Type type, int cpus, Integer speed, long minRam, long maxRam, BootloaderType bootloader, String os, boolean enableHA, boolean limitCpuUse, String vncPassword) {
         this.id = id;
@@ -263,5 +264,13 @@ public void setUuid(String uuid) {
         this.uuid = uuid;
     }
 
+    public Integer getVcpuMaxLimit() {
+        return vcpuMaxLimit;
+    }
+
+    public void setVcpuMaxLimit(Integer vcpuMaxLimit) {
+        this.vcpuMaxLimit = vcpuMaxLimit;
+    }
+
 
 }

api/src/com/cloud/alert/Alert.java

@@ -31,4 +31,5 @@ public interface Alert extends Identity, InternalIdentity {
     Date getLastSent();
     Date getResolved();
     boolean getArchived();
+    String getName();
 }

api/src/com/cloud/deploy/DeployDestination.java

@@ -16,6 +16,7 @@
 // under the License.
 package com.cloud.deploy;
 
+import java.io.Serializable;
 import java.util.Map;
 
 import com.cloud.dc.DataCenter;
@@ -26,7 +27,9 @@
 import com.cloud.storage.Volume;
 import com.cloud.utils.NumbersUtil;
 
-public class DeployDestination {
+public class DeployDestination implements Serializable {
+    private static final long serialVersionUID = 7113840781939014695L;
+
     DataCenter _dc;
     Pod _pod;
     Cluster _cluster;
@@ -76,28 +79,28 @@ public int hashCode() {
     @Override
     public boolean equals(Object obj) {
         DeployDestination that = (DeployDestination) obj;
-        if (this._dc == null || that._dc == null) {
+        if (_dc == null || that._dc == null) {
             return false;
         }
-        if (this._dc.getId() != that._dc.getId()) {
+        if (_dc.getId() != that._dc.getId()) {
             return false;
         }
-        if (this._pod == null || that._pod == null) {
+        if (_pod == null || that._pod == null) {
             return false;
         }
-        if (this._pod.getId() != that._pod.getId()) {
+        if (_pod.getId() != that._pod.getId()) {
             return false;
         }
-        if (this._cluster == null || that._cluster == null) {
+        if (_cluster == null || that._cluster == null) {
             return false;
         }
-        if (this._cluster.getId() != that._cluster.getId()) {
+        if (_cluster.getId() != that._cluster.getId()) {
             return false;
         }
-        if (this._host == null || that._host == null) {
+        if (_host == null || that._host == null) {
             return false;
         }
-        return this._host.getId() == that._host.getId();
+        return _host.getId() == that._host.getId();
     }
 
     @Override

api/src/com/cloud/deploy/DeploymentClusterPlanner.java

@@ -20,10 +20,20 @@
 
 import com.cloud.exception.InsufficientServerCapacityException;
 import com.cloud.vm.VirtualMachineProfile;
+import org.apache.cloudstack.framework.config.ConfigKey;
 
 /**
  */
 public interface DeploymentClusterPlanner extends DeploymentPlanner {
+
+    static final String ClusterCPUCapacityDisableThresholdCK = "cluster.cpu.allocated.capacity.disablethreshold";
+    static final String ClusterMemoryCapacityDisableThresholdCK = "cluster.memory.allocated.capacity.disablethreshold";
+
+    static final ConfigKey<Float> ClusterCPUCapacityDisableThreshold = new ConfigKey<Float>(Float.class, ClusterCPUCapacityDisableThresholdCK, "Alert", "0.85",
+            "Percentage (as a value between 0 and 1) of cpu utilization above which allocators will disable using the cluster for low cpu available. Keep the corresponding notification threshold lower than this to be notified beforehand.", true, ConfigKey.Scope.Cluster, null);
+    static final ConfigKey<Float> ClusterMemoryCapacityDisableThreshold = new ConfigKey<Float>(Float.class, ClusterMemoryCapacityDisableThresholdCK, "Alert", "0.85",
+            "Percentage (as a value between 0 and 1) of memory utilization above which allocators will disable using the cluster for low memory available. Keep the corresponding notification threshold lower than this to be notified beforehand.", true, ConfigKey.Scope.Cluster, null);
+
     /**
      * This is called to determine list of possible clusters where a virtual
      * machine can be deployed.

api/src/com/cloud/deploy/DeploymentPlanner.java

@@ -16,6 +16,7 @@
 // under the License.
 package com.cloud.deploy;
 
+import java.io.Serializable;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
@@ -93,7 +94,9 @@ public enum PlannerResourceUsage {
         Shared, Dedicated;
     }
 
-    public static class ExcludeList {
+    public static class ExcludeList implements Serializable {
+        private static final long serialVersionUID = -482175549460148301L;
+
         private Set<Long> _dcIds;
         private Set<Long> _podIds;
         private Set<Long> _clusterIds;
@@ -177,6 +180,12 @@ public void addPool(long poolId) {
             _poolIds.add(poolId);
         }
 
+        public void removePool(long poolId) {
+            if (_poolIds != null) {
+                _poolIds.remove(poolId);
+            }
+        }
+
         public void addDataCenter(long dataCenterId) {
             if (_dcIds == null) {
                 _dcIds = new HashSet<Long>();

api/src/com/cloud/deploy/HAPlanner.java

@@ -0,0 +1,21 @@
+// 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.deploy;
+
+
+public interface HAPlanner extends DeploymentPlanner {
+}

api/src/com/cloud/event/EventTypes.java

@@ -452,10 +452,17 @@ public class EventTypes {
     public static final String EVENT_CLEANUP_VM_RESERVATION = "VM.RESERVATION.CLEANUP";
 
     public static final String EVENT_UCS_ASSOCIATED_PROFILE = "UCS.ASSOCIATEPROFILE";
+    public static final String EVENT_UCS_INSTANTIATE_TEMPLATE_AND_ASSOCIATE = "UCS.TEMPLATEASSOCIATION";
+    public static final String EVENT_UCS_DISASSOCIATED_PROFILE = "UCS.DISASSOCIATEPROFILE";
+    public static final String EVENT_UCS_REFRESH_BLADES = "UCS.REFRESHBLADES";
 
     // Object store migration
     public static final String EVENT_MIGRATE_PREPARE_SECONDARY_STORAGE = "MIGRATE.PREPARE.SS";
 
+    //Alert generation
+    public static final String ALERT_GENERATE = "ALERT.GENERATE";
+
+
     static {
 
         // TODO: need a way to force author adding event types to declare the entity details as well, with out braking

api/src/com/cloud/exception/CloudException.java

@@ -27,8 +27,9 @@
  */
 
 public class CloudException extends Exception {
+    private static final long serialVersionUID = 8784427323859682503L;
 
-	// This holds a list of uuids and their names. Add uuid:fieldname pairs
+    // This holds a list of uuids and their names. Add uuid:fieldname pairs
 	protected ArrayList<String> idList = new ArrayList<String>();
 
 	protected Integer csErrorCode;
@@ -43,8 +44,6 @@ public CloudException(String message, Throwable cause) {
         setCSErrorCode(CSExceptionErrorCode.getCSErrCode(this.getClass().getName()));
     }
 
-
-
 	public CloudException() {
 		super();
 		setCSErrorCode(CSExceptionErrorCode.getCSErrCode(this.getClass().getName()));
@@ -60,10 +59,10 @@ public ArrayList<String> getIdProxyList() {
 	}
 
 	public void setCSErrorCode(int cserrcode) {
-		this.csErrorCode = cserrcode;
+		csErrorCode = cserrcode;
 	}
 
 	public int getCSErrorCode() {
-		return this.csErrorCode;
+		return csErrorCode;
 	}
 }

api/src/com/cloud/exception/OperationTimedoutException.java

@@ -24,13 +24,21 @@
  */
 public class OperationTimedoutException extends CloudException {
     private static final long serialVersionUID = SerialVersionUID.OperationTimedoutException;
-    
+
     long _agentId;
     long _seqId;
     int _time;
-    Command[] _cmds;
+
+    // TODO
+    // I did a reference search on usage of getCommands() and found none
+    //
+    // to prevent serialization problems across boundaries, I'm disabling serialization of _cmds here
+    // getCommands() will still be available within the same serialization boundary, but it will be lost
+    // when exception is propagated across job boundaries.
+    //
+    transient Command[] _cmds;
     boolean _isActive;
-    
+
     public OperationTimedoutException(Command[] cmds, long agentId, long seqId, int time, boolean isActive) {
         super("Commands " + seqId + " to Host " + agentId + " timed out after " + time);
         _agentId = agentId;
@@ -39,23 +47,23 @@ public OperationTimedoutException(Command[] cmds, long agentId, long seqId, int
         _cmds = cmds;
         _isActive = isActive;
     }
-    
+
     public long getAgentId() {
         return _agentId;
     }
-    
+
     public long getSequenceId() {
         return _seqId;
     }
-    
+
     public int getWaitTime() {
         return _time;
     }
-    
+
     public Command[] getCommands() {
         return _cmds;
     }
-    
+
     public boolean isActive() {
     	return _isActive;
     }

api/src/com/cloud/host/Host.java

@@ -91,6 +91,11 @@ public static String[] toStrings(Host.Type... types) {
      */
     String getPrivateIpAddress();
 
+    /**
+     * @return the ip address of the host.
+     */
+    String getStorageUrl();
+
     /**
      * @return the ip address of the host attached to the storage network.
      */

api/src/com/cloud/hypervisor/HypervisorGuru.java

@@ -75,4 +75,6 @@ public interface HypervisorGuru extends Adapter {
      * 
      */
     List<Command> finalizeExpungeNics(VirtualMachine vm, List<NicProfile> nics);
+
+    List<Command> finalizeExpungeVolumes(VirtualMachine vm);
 }