cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject [09/57] [abbrv] git commit: updated refs/heads/object_store to a872d6d
Date Sat, 06 Apr 2013 00:34:42 GMT
Removing ^M's from code.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>


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

Branch: refs/heads/object_store
Commit: 469c4dd139ccd2c48767f664ec77b5280b4f819a
Parents: 21f953f
Author: Brian Spindler <darnoth@gmail.com>
Authored: Wed Apr 3 09:54:33 2013 -0700
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Thu Apr 4 00:53:20 2013 +0530

----------------------------------------------------------------------
 .../engine/datacenter/entity/api/HostEntity.java   |   89 +-
 .../rest/service/api/ClusterRestService.java       |  172 ++--
 .../rest/service/api/NetworkRestService.java       |  124 ++--
 .../engine/rest/service/api/PodRestService.java    |  158 ++--
 .../service/api/VirtualMachineRestService.java     |  112 +-
 .../engine/rest/service/api/VolumeRestService.java |  152 ++--
 .../engine/rest/service/api/ZoneRestService.java   |  174 ++--
 .../org/apache/cloudstack/compute/ComputeGuru.java |   68 +-
 .../engine/cloud/entity/api/VMEntityManager.java   |   50 +-
 .../cloud/entity/api/VirtualMachineEntityImpl.java |  444 ++++----
 .../engine/cloud/entity/api/db/VMComputeTagVO.java |  102 +-
 .../engine/cloud/entity/api/db/VMEntityVO.java     |    2 +-
 .../engine/cloud/entity/api/db/VMNetworkMapVO.java |  110 +-
 .../cloud/entity/api/db/VMReservationVO.java       |  222 ++--
 .../cloud/entity/api/db/VMRootDiskTagVO.java       |  102 +-
 .../cloud/entity/api/db/VolumeReservationVO.java   |  168 ++--
 .../cloud/entity/api/db/dao/VMComputeTagDao.java   |   30 +-
 .../entity/api/db/dao/VMComputeTagDaoImpl.java     |  146 ++--
 .../cloud/entity/api/db/dao/VMNetworkMapDao.java   |   30 +-
 .../entity/api/db/dao/VMNetworkMapDaoImpl.java     |  138 ++--
 .../cloud/entity/api/db/dao/VMReservationDao.java  |   36 +-
 .../entity/api/db/dao/VMReservationDaoImpl.java    |  190 ++--
 .../cloud/entity/api/db/dao/VMRootDiskTagDao.java  |   30 +-
 .../entity/api/db/dao/VMRootDiskTagDaoImpl.java    |  144 ++--
 .../entity/api/db/dao/VolumeReservationDao.java    |   30 +-
 .../api/db/dao/VolumeReservationDaoImpl.java       |  104 +-
 .../datacenter/entity/api/ClusterEntityImpl.java   |  386 ++++----
 .../entity/api/DataCenterResourceManager.java      |   68 +-
 .../entity/api/DataCenterResourceManagerImpl.java  |  226 ++--
 .../datacenter/entity/api/HostEntityImpl.java      |  398 ++++----
 .../datacenter/entity/api/PodEntityImpl.java       |  422 ++++----
 .../datacenter/entity/api/ZoneEntityImpl.java      |  402 ++++----
 .../datacenter/entity/api/db/EngineCluster.java    |   46 +-
 .../datacenter/entity/api/db/EngineDataCenter.java |   46 +-
 .../entity/api/db/EngineDataCenterVO.java          |  210 ++--
 .../datacenter/entity/api/db/EngineHost.java       |   48 +-
 .../datacenter/entity/api/db/EngineHostPodVO.java  |  170 ++--
 .../engine/datacenter/entity/api/db/EnginePod.java |   46 +-
 .../entity/api/db/dao/EngineHostDao.java           |    2 +-
 .../entity/api/db/dao/EngineHostPodDao.java        |   20 +-
 .../entity/api/db/dao/EngineHostPodDaoImpl.java    |  142 ++--
 .../service/api/ProvisioningServiceImpl.java       |  340 +++---
 .../engine/provisioning/test/ProvisioningTest.java |  242 +++---
 .../jackson/CSJacksonAnnotationIntrospector.java   |  120 ++--
 .../ws/jackson/CSJacksonAnnotationModule.java      |   94 +-
 .../framework/ws/jackson/UriSerializer.java        |  116 +-
 .../framework/ws/jackson/UrisSerializer.java       |  142 ++--
 .../cloudstack/framework/ws/jackson/Url.java       |  106 +-
 .../ws/jackson/CSJacksonAnnotationTest.java        |  166 ++--
 .../baremetal/manager/AddBaremetalHostCmd.java     |   48 +-
 .../baremetal/manager/BareMetalDiscoverer.java     |    2 +-
 .../cloud/baremetal/manager/BaremetalManager.java  |    2 +-
 .../manager/BaremetalPlannerSelector.java          |   78 +-
 .../AddBaremetalKickStartPxeCmd.java               |   28 +-
 .../networkservice/BareMetalResourceBase.java      |   28 +-
 .../networkservice/BaremetaNetworkGuru.java        |  208 ++--
 .../BaremetalKickStartPxeResource.java             |  322 +++---
 .../BaremetalKickStartServiceImpl.java             |  398 ++++----
 .../BaremetalPxeKickStartResponse.java             |   32 +-
 .../networkservice/BaremetalPxeManagerImpl.java    |    6 +-
 .../networkservice/BaremetalUserdataElement.java   |  256 +++---
 .../PrepareKickstartPxeServerCommand.java          |   92 +-
 .../networkservice/SecurityGroupHttpClient.java    |   76 +-
 .../src/com/cloud/ucs/database/UcsBladeDao.java    |   16 +-
 .../com/cloud/ucs/database/UcsBladeDaoImpl.java    |   22 +-
 .../ucs/src/com/cloud/ucs/database/UcsBladeVO.java |  140 ++--
 .../src/com/cloud/ucs/database/UcsManagerDao.java  |   32 +-
 .../com/cloud/ucs/database/UcsManagerDaoImpl.java  |   21 +-
 .../src/com/cloud/ucs/database/UcsManagerVO.java   |  140 ++--
 .../com/cloud/ucs/manager/AddUcsManagerCmd.java    |  198 ++--
 .../ucs/manager/AssociateUcsProfileToBladeCmd.java |  156 ++--
 .../src/com/cloud/ucs/manager/ListUcsBladeCmd.java |  174 ++--
 .../com/cloud/ucs/manager/ListUcsManagerCmd.java   |  114 +-
 .../com/cloud/ucs/manager/ListUcsProfileCmd.java   |  114 +-
 .../src/com/cloud/ucs/manager/StringTemplate.java  |   46 +-
 .../com/cloud/ucs/manager/UcsBladeResponse.java    |  168 ++--
 .../ucs/src/com/cloud/ucs/manager/UcsCommands.java |  168 ++--
 .../src/com/cloud/ucs/manager/UcsHttpClient.java   |   68 +-
 .../ucs/src/com/cloud/ucs/manager/UcsManager.java  |   32 +-
 .../src/com/cloud/ucs/manager/UcsManagerImpl.java  |  554 +++++-----
 .../com/cloud/ucs/manager/UcsManagerResponse.java  |  102 +-
 .../com/cloud/ucs/manager/UcsProfileResponse.java  |   38 +-
 .../src/com/cloud/ucs/structure/ComputeBlade.java  |  332 +++---
 .../src/com/cloud/ucs/structure/UcsProfile.java    |   76 +-
 .../cloudstack/network/element/DnsNotifier.java    |  244 +++---
 .../src/com/cloud/async/AsyncJobManagerImpl.java   |  494 +++++-----
 server/src/com/cloud/async/SyncQueueManager.java   |   16 +-
 .../src/com/cloud/async/SyncQueueManagerImpl.java  |   22 +-
 server/src/com/cloud/async/dao/SyncQueueDao.java   |    2 +-
 .../src/com/cloud/async/dao/SyncQueueItemDao.java  |    4 +-
 .../AgentBasedConsoleProxyManager.java             |    4 +-
 .../deploy/AbstractDeployPlannerSelector.java      |  168 ++--
 .../com/cloud/deploy/DeployPlannerSelector.java    |   48 +-
 .../cloud/deploy/HypervisorVmPlannerSelector.java  |  108 +-
 .../src/com/cloud/ha/UserVmDomRInvestigator.java   |    6 +-
 server/src/com/cloud/host/dao/HostDao.java         |    4 +-
 .../src/com/cloud/network/as/AutoScaleManager.java |   32 +-
 .../as/dao/AutoScalePolicyConditionMapDao.java     |   32 +-
 .../as/dao/AutoScalePolicyConditionMapDaoImpl.java |   38 +-
 .../cloud/network/as/dao/AutoScalePolicyDao.java   |   32 +-
 .../network/as/dao/AutoScalePolicyDaoImpl.java     |   38 +-
 .../cloud/network/as/dao/AutoScaleVmGroupDao.java  |   32 +-
 .../network/as/dao/AutoScaleVmGroupDaoImpl.java    |   38 +-
 .../as/dao/AutoScaleVmGroupPolicyMapDaoImpl.java   |   38 +-
 .../network/as/dao/AutoScaleVmProfileDao.java      |   32 +-
 .../network/as/dao/AutoScaleVmProfileDaoImpl.java  |   38 +-
 .../network/security/dao/SecurityGroupDaoImpl.java |   22 +-
 server/src/com/cloud/storage/StorageManager.java   |    2 +-
 .../src/com/cloud/storage/dao/VMTemplateDao.java   |   10 +-
 .../com/cloud/storage/dao/VMTemplateDaoImpl.java   |   20 +-
 .../src/com/cloud/upgrade/dao/Upgrade30xBase.java  |  622 ++++++------
 server/src/com/cloud/vm/dao/UserVmDaoImpl.java     |  824 +++++++-------
 .../test/com/cloud/async/TestSyncQueueManager.java |  306 +++---
 .../SecurityGroupManagerTestConfiguration.java     |  316 +++---
 .../snapshot/SnapshotDaoTestConfiguration.java     |  144 ++--
 .../dao/StoragePoolDaoTestConfiguration.java       |  106 +-
 .../cloud/vm/snapshot/VMSnapshotManagerTest.java   |  372 ++++----
 .../test/com/cloud/vpc/VpcTestConfiguration.java   |  462 ++++----
 .../utils/component/SpringComponentScanUtils.java  |   82 +-
 utils/src/com/cloud/utils/xmlobject/XmlObject.java |  354 +++---
 .../com/cloud/utils/xmlobject/XmlObjectParser.java |  214 ++--
 .../com/cloud/utils/xmlobject/TestXmlObject.java   |   66 +-
 .../com/cloud/utils/xmlobject/TestXmlObject2.java  |   74 +-
 123 files changed, 8418 insertions(+), 8420 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/469c4dd1/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/HostEntity.java
----------------------------------------------------------------------
diff --git a/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/HostEntity.java b/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/HostEntity.java
index 99f3120..68a2ed2 100644
--- a/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/HostEntity.java
+++ b/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/HostEntity.java
@@ -14,48 +14,47 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.engine.datacenter.entity.api;
-
-import com.cloud.hypervisor.Hypervisor.HypervisorType;
-
-public interface HostEntity extends DataCenterResourceEntity {
-	
-    /**
-     * @return total amount of memory.
-     */
-    Long getTotalMemory();
-
-    /**
-     * @return # of cores in a machine.  Note two cpus with two cores each returns 4.
-     */
-    Integer getCpus();
-
-    /**
-     * @return speed of each cpu in mhz.
-     */
-    Long getSpeed();
-
-    /**
-     * @return the pod.
-     */
-    Long getPodId();
-
-    /**
-     * @return availability zone.
-     */
-    long getDataCenterId();
-
-    /**
-     * @return type of hypervisor
-     */
-    HypervisorType getHypervisorType();
-    
-    /**
-     * @return the mac address of the host.
-     */
-    String getGuid();
-
-    Long getClusterId();
-
-}
-
+package org.apache.cloudstack.engine.datacenter.entity.api;
+
+import com.cloud.hypervisor.Hypervisor.HypervisorType;
+
+public interface HostEntity extends DataCenterResourceEntity {
+
+    /**
+     * @return total amount of memory.
+     */
+    Long getTotalMemory();
+
+    /**
+     * @return # of cores in a machine.  Note two cpus with two cores each returns 4.
+     */
+    Integer getCpus();
+
+    /**
+     * @return speed of each cpu in mhz.
+     */
+    Long getSpeed();
+
+    /**
+     * @return the pod.
+     */
+    Long getPodId();
+
+    /**
+     * @return availability zone.
+     */
+    long getDataCenterId();
+
+    /**
+     * @return type of hypervisor
+     */
+    HypervisorType getHypervisorType();
+
+    /**
+     * @return the mac address of the host.
+     */
+    String getGuid();
+
+    Long getClusterId();
+
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/469c4dd1/engine/api/src/org/apache/cloudstack/engine/rest/service/api/ClusterRestService.java
----------------------------------------------------------------------
diff --git a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/ClusterRestService.java b/engine/api/src/org/apache/cloudstack/engine/rest/service/api/ClusterRestService.java
index 216cfa8..2718e2f 100755
--- a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/ClusterRestService.java
+++ b/engine/api/src/org/apache/cloudstack/engine/rest/service/api/ClusterRestService.java
@@ -1,86 +1,86 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cloudstack.engine.rest.service.api;
-
-import java.util.List;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-
-import org.apache.cloudstack.engine.datacenter.entity.api.ClusterEntity;
-import org.apache.cloudstack.engine.service.api.ProvisioningService;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
-
-@Component
-@Service("ClusterRestService")
-@Produces("application/json")
-public class ClusterRestService {
-//    @Inject
-    ProvisioningService _provisioningService;
-
-    @GET @Path("/clusters")
-    public List<ClusterEntity> listAll() {
-        return null;
-    }
-
-
-    @GET @Path("/cluster/{clusterid}")
-    public ClusterEntity get(@PathParam("clusterid") String clusterId) {
-        return null;
-    }
-
-    @POST @Path("/cluster/{clusterid}/enable")
-    public String enable(@PathParam("clusterid") String clusterId) {
-        return null;
-    }
-
-    @POST @Path("/cluster/{clusterid}/disable")
-    public String disable(@PathParam("clusterid") String clusterId) {
-        return null;
-    }
-
-    @POST @Path("/cluster/{clusterid}/deactivate")
-    public String deactivate(@PathParam("clusterid") String clusterId) {
-        return null;
-    }
-
-    @POST @Path("/cluster/{clusterid}/reactivate")
-    public String reactivate(@PathParam("clusterid") String clusterId) {
-        return null;
-    }
-
-    @PUT @Path("/cluster/create")
-    public ClusterEntity create(
-            @QueryParam("xid") String xid, 
-            @QueryParam("display-name") String displayName) {
-        return null;
-    }
-
-    @PUT @Path("/cluster/{clusterid}/update") 
-    public ClusterEntity update(
-            @QueryParam("display-name") String displayName) {
-        return null;
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cloudstack.engine.rest.service.api;
+
+import java.util.List;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+
+import org.apache.cloudstack.engine.datacenter.entity.api.ClusterEntity;
+import org.apache.cloudstack.engine.service.api.ProvisioningService;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+
+@Component
+@Service("ClusterRestService")
+@Produces("application/json")
+public class ClusterRestService {
+//    @Inject
+    ProvisioningService _provisioningService;
+
+    @GET @Path("/clusters")
+    public List<ClusterEntity> listAll() {
+        return null;
+    }
+
+
+    @GET @Path("/cluster/{clusterid}")
+    public ClusterEntity get(@PathParam("clusterid") String clusterId) {
+        return null;
+    }
+
+    @POST @Path("/cluster/{clusterid}/enable")
+    public String enable(@PathParam("clusterid") String clusterId) {
+        return null;
+    }
+
+    @POST @Path("/cluster/{clusterid}/disable")
+    public String disable(@PathParam("clusterid") String clusterId) {
+        return null;
+    }
+
+    @POST @Path("/cluster/{clusterid}/deactivate")
+    public String deactivate(@PathParam("clusterid") String clusterId) {
+        return null;
+    }
+
+    @POST @Path("/cluster/{clusterid}/reactivate")
+    public String reactivate(@PathParam("clusterid") String clusterId) {
+        return null;
+    }
+
+    @PUT @Path("/cluster/create")
+    public ClusterEntity create(
+            @QueryParam("xid") String xid,
+            @QueryParam("display-name") String displayName) {
+        return null;
+    }
+
+    @PUT @Path("/cluster/{clusterid}/update")
+    public ClusterEntity update(
+            @QueryParam("display-name") String displayName) {
+        return null;
+    }
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/469c4dd1/engine/api/src/org/apache/cloudstack/engine/rest/service/api/NetworkRestService.java
----------------------------------------------------------------------
diff --git a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/NetworkRestService.java b/engine/api/src/org/apache/cloudstack/engine/rest/service/api/NetworkRestService.java
index 3e81a44..b75600e 100755
--- a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/NetworkRestService.java
+++ b/engine/api/src/org/apache/cloudstack/engine/rest/service/api/NetworkRestService.java
@@ -1,62 +1,62 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cloudstack.engine.rest.service.api;
-
-import java.util.List;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-
-import org.apache.cloudstack.engine.cloud.entity.api.NetworkEntity;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
-
-@Service("NetworkRestService")
-@Component
-@Produces("application/json")
-public class NetworkRestService {
-    @PUT @Path("/network/create")
-    public NetworkEntity create(
-            @QueryParam("xid") String xid,
-            @QueryParam("display-name") String displayName) {
-        return null;
-    }
-
-    @GET @Path("/network/{network-id}")
-    public NetworkEntity get(@PathParam("network-id") String networkId) {
-        return null;
-    }
-
-    @GET @Path("/networks")
-    public List<NetworkEntity> listAll() {
-        return null;
-    }
-
-    @POST @Path("/network/{network-id}/")
-    public String deploy(@PathParam("network-id") String networkId) {
-        return null;
-    }
-
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cloudstack.engine.rest.service.api;
+
+import java.util.List;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+
+import org.apache.cloudstack.engine.cloud.entity.api.NetworkEntity;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+
+@Service("NetworkRestService")
+@Component
+@Produces("application/json")
+public class NetworkRestService {
+    @PUT @Path("/network/create")
+    public NetworkEntity create(
+            @QueryParam("xid") String xid,
+            @QueryParam("display-name") String displayName) {
+        return null;
+    }
+
+    @GET @Path("/network/{network-id}")
+    public NetworkEntity get(@PathParam("network-id") String networkId) {
+        return null;
+    }
+
+    @GET @Path("/networks")
+    public List<NetworkEntity> listAll() {
+        return null;
+    }
+
+    @POST @Path("/network/{network-id}/")
+    public String deploy(@PathParam("network-id") String networkId) {
+        return null;
+    }
+
+
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/469c4dd1/engine/api/src/org/apache/cloudstack/engine/rest/service/api/PodRestService.java
----------------------------------------------------------------------
diff --git a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/PodRestService.java b/engine/api/src/org/apache/cloudstack/engine/rest/service/api/PodRestService.java
index 0811f0b..9c009b9 100755
--- a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/PodRestService.java
+++ b/engine/api/src/org/apache/cloudstack/engine/rest/service/api/PodRestService.java
@@ -1,79 +1,79 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cloudstack.engine.rest.service.api;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-
-import org.apache.cloudstack.engine.datacenter.entity.api.PodEntity;
-import org.apache.cloudstack.engine.service.api.ProvisioningService;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
-
-@Component
-@Service("PodService")
-@Produces({"application/json"})
-public class PodRestService {
-//  @Inject
-    ProvisioningService _provisioningService;
-
-    @GET @Path("/pod/{pod-id}")
-    public PodEntity getPod(@PathParam("pod-id") String podId) {
-        return null;
-    }
-
-    @POST @Path("/pod/{pod-id}/enable")
-    public String enable(@PathParam("pod-id") String podId) {
-        return null;
-    }
-
-    @POST @Path("/pod/{pod-id}/disable")
-    public String disable(@PathParam("pod-id") String podId) {
-        return null;
-    }
-
-    @POST @Path("/pod/{pod-id}/deactivate")
-    public String deactivate(@PathParam("pod-id") String podId) {
-        return null;
-    }
-
-    @POST @Path("/pod/{pod-id}/reactivate")
-    public String reactivate(@PathParam("pod-id") String podId) {
-        return null;
-    }
-
-    @PUT @Path("/pod/create")
-    public PodEntity create(
-            @QueryParam("xid") String xid, 
-            @QueryParam("display-name") String displayName) {
-        return null;
-    }
-
-    @PUT @Path("/pod/{pod-id}")
-    public PodEntity update(
-            @PathParam("pod-id") String podId,
-            @QueryParam("display-name") String displayName) {
-        return null;
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cloudstack.engine.rest.service.api;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+
+import org.apache.cloudstack.engine.datacenter.entity.api.PodEntity;
+import org.apache.cloudstack.engine.service.api.ProvisioningService;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+
+@Component
+@Service("PodService")
+@Produces({"application/json"})
+public class PodRestService {
+//  @Inject
+    ProvisioningService _provisioningService;
+
+    @GET @Path("/pod/{pod-id}")
+    public PodEntity getPod(@PathParam("pod-id") String podId) {
+        return null;
+    }
+
+    @POST @Path("/pod/{pod-id}/enable")
+    public String enable(@PathParam("pod-id") String podId) {
+        return null;
+    }
+
+    @POST @Path("/pod/{pod-id}/disable")
+    public String disable(@PathParam("pod-id") String podId) {
+        return null;
+    }
+
+    @POST @Path("/pod/{pod-id}/deactivate")
+    public String deactivate(@PathParam("pod-id") String podId) {
+        return null;
+    }
+
+    @POST @Path("/pod/{pod-id}/reactivate")
+    public String reactivate(@PathParam("pod-id") String podId) {
+        return null;
+    }
+
+    @PUT @Path("/pod/create")
+    public PodEntity create(
+            @QueryParam("xid") String xid,
+            @QueryParam("display-name") String displayName) {
+        return null;
+    }
+
+    @PUT @Path("/pod/{pod-id}")
+    public PodEntity update(
+            @PathParam("pod-id") String podId,
+            @QueryParam("display-name") String displayName) {
+        return null;
+    }
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/469c4dd1/engine/api/src/org/apache/cloudstack/engine/rest/service/api/VirtualMachineRestService.java
----------------------------------------------------------------------
diff --git a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/VirtualMachineRestService.java b/engine/api/src/org/apache/cloudstack/engine/rest/service/api/VirtualMachineRestService.java
index 2124a81..f3f7bad 100755
--- a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/VirtualMachineRestService.java
+++ b/engine/api/src/org/apache/cloudstack/engine/rest/service/api/VirtualMachineRestService.java
@@ -1,56 +1,56 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cloudstack.engine.rest.service.api;
-
-import java.util.List;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-
-import org.apache.cloudstack.engine.cloud.entity.api.VirtualMachineEntity;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
-
-@Component
-@Service("VirtualMachineRestService")
-@Produces("application/xml")
-public class VirtualMachineRestService {
-
-    @GET @Path("/vm/{vmid}")
-    public VirtualMachineEntity get(@PathParam("vmid") String vmId) {
-        return null;
-    }
-
-    @PUT @Path("/vm/create")
-    public VirtualMachineEntity create(
-            @QueryParam("xid") String xid,
-            @QueryParam("hostname") String hostname,
-            @QueryParam("display-name") String displayName) {
-        return null;
-    }
-
-    @GET @Path("/vms")
-    public List<VirtualMachineEntity> listAll() {
-        return null;
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cloudstack.engine.rest.service.api;
+
+import java.util.List;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+
+import org.apache.cloudstack.engine.cloud.entity.api.VirtualMachineEntity;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+
+@Component
+@Service("VirtualMachineRestService")
+@Produces("application/xml")
+public class VirtualMachineRestService {
+
+    @GET @Path("/vm/{vmid}")
+    public VirtualMachineEntity get(@PathParam("vmid") String vmId) {
+        return null;
+    }
+
+    @PUT @Path("/vm/create")
+    public VirtualMachineEntity create(
+            @QueryParam("xid") String xid,
+            @QueryParam("hostname") String hostname,
+            @QueryParam("display-name") String displayName) {
+        return null;
+    }
+
+    @GET @Path("/vms")
+    public List<VirtualMachineEntity> listAll() {
+        return null;
+    }
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/469c4dd1/engine/api/src/org/apache/cloudstack/engine/rest/service/api/VolumeRestService.java
----------------------------------------------------------------------
diff --git a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/VolumeRestService.java b/engine/api/src/org/apache/cloudstack/engine/rest/service/api/VolumeRestService.java
index 3e5174b..cb1a0d3 100755
--- a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/VolumeRestService.java
+++ b/engine/api/src/org/apache/cloudstack/engine/rest/service/api/VolumeRestService.java
@@ -1,76 +1,76 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cloudstack.engine.rest.service.api;
-
-import java.util.List;
-
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-
-import org.apache.cloudstack.engine.cloud.entity.api.VolumeEntity;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
-
-@Component
-@Service("VolumeRestService")
-@Produces("application/json")
-public class VolumeRestService {
-
-    @PUT @Path("/vol/create")
-    public VolumeEntity create(
-            @QueryParam("xid") String xid,
-            @QueryParam("display-name") String displayName) {
-        return null;
-    }
-
-    @POST @Path("/vol/{volid}/deploy")
-    public String deploy(@PathParam("volid") String volumeId) {
-        return null;
-    }
-
-    @GET @Path("/vols")
-    public List<VolumeEntity> listAll() {
-        return null;
-    }
-
-    @POST @Path("/vol/{volid}/attach-to")
-    public String attachTo(
-            @PathParam("volid") String volumeId,
-            @QueryParam("vmid") String vmId,
-            @QueryParam("device-order") short device) {
-        return null;
-    }
-
-    @DELETE @Path("/vol/{volid}")
-    public String delete(@PathParam("volid") String volumeId) {
-        return null;
-    }
-
-    @POST @Path("/vol/{volid}/detach")
-    public String detach(@QueryParam("volid") String volumeId) {
-        return null;
-    }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cloudstack.engine.rest.service.api;
+
+import java.util.List;
+
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+
+import org.apache.cloudstack.engine.cloud.entity.api.VolumeEntity;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+
+@Component
+@Service("VolumeRestService")
+@Produces("application/json")
+public class VolumeRestService {
+
+    @PUT @Path("/vol/create")
+    public VolumeEntity create(
+            @QueryParam("xid") String xid,
+            @QueryParam("display-name") String displayName) {
+        return null;
+    }
+
+    @POST @Path("/vol/{volid}/deploy")
+    public String deploy(@PathParam("volid") String volumeId) {
+        return null;
+    }
+
+    @GET @Path("/vols")
+    public List<VolumeEntity> listAll() {
+        return null;
+    }
+
+    @POST @Path("/vol/{volid}/attach-to")
+    public String attachTo(
+            @PathParam("volid") String volumeId,
+            @QueryParam("vmid") String vmId,
+            @QueryParam("device-order") short device) {
+        return null;
+    }
+
+    @DELETE @Path("/vol/{volid}")
+    public String delete(@PathParam("volid") String volumeId) {
+        return null;
+    }
+
+    @POST @Path("/vol/{volid}/detach")
+    public String detach(@QueryParam("volid") String volumeId) {
+        return null;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/469c4dd1/engine/api/src/org/apache/cloudstack/engine/rest/service/api/ZoneRestService.java
----------------------------------------------------------------------
diff --git a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/ZoneRestService.java b/engine/api/src/org/apache/cloudstack/engine/rest/service/api/ZoneRestService.java
index 7170f00..bd6980e 100755
--- a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/ZoneRestService.java
+++ b/engine/api/src/org/apache/cloudstack/engine/rest/service/api/ZoneRestService.java
@@ -1,87 +1,87 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cloudstack.engine.rest.service.api;
-
-import java.util.List;
-
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-
-import org.apache.cloudstack.engine.datacenter.entity.api.ZoneEntity;
-import org.apache.cloudstack.engine.service.api.ProvisioningService;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
-
-@Component
-@Service("zoneService")
-@Produces({"application/json"})
-public class ZoneRestService {
-//    @Inject
-    ProvisioningService _provisioningService;
-
-    @GET @Path("/zones")
-    public List<ZoneEntity> listAll() {
-        return _provisioningService.listZones();
-    }
-
-    @GET @Path("/zone/{zone-id}")
-    public ZoneEntity get(@PathParam("zone-id") String zoneId) {
-        return _provisioningService.getZone(zoneId);
-    }
-
-    @POST @Path("/zone/{zone-id}/enable")
-    public String enable(String zoneId) {
-        return null;
-    }
-
-    @POST @Path("/zone/{zone-id}/disable")
-    public String disable(@PathParam("zone-id") String zoneId) {
-        ZoneEntity zoneEntity = _provisioningService.getZone(zoneId);
-        zoneEntity.disable();
-        return null;
-    }
-
-    @POST @Path("/zone/{zone-id}/deactivate")
-    public String deactivate(@PathParam("zone-id") String zoneId) {
-        return null;
-    }
-
-    @POST @Path("/zone/{zone-id}/activate")
-    public String reactivate(@PathParam("zone-id") String zoneId) {
-        return null;
-    }
-
-
-    @PUT @Path("/zone/create")
-    public ZoneEntity createZone(@QueryParam("xid") String xid, 
-            @QueryParam("display-name") String displayName) {
-        return null;
-    }
-
-    @DELETE @Path("/zone/{zone-id}")
-    public String deleteZone(@QueryParam("zone-id") String xid) {
-        return null;
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cloudstack.engine.rest.service.api;
+
+import java.util.List;
+
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+
+import org.apache.cloudstack.engine.datacenter.entity.api.ZoneEntity;
+import org.apache.cloudstack.engine.service.api.ProvisioningService;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+
+@Component
+@Service("zoneService")
+@Produces({"application/json"})
+public class ZoneRestService {
+//    @Inject
+    ProvisioningService _provisioningService;
+
+    @GET @Path("/zones")
+    public List<ZoneEntity> listAll() {
+        return _provisioningService.listZones();
+    }
+
+    @GET @Path("/zone/{zone-id}")
+    public ZoneEntity get(@PathParam("zone-id") String zoneId) {
+        return _provisioningService.getZone(zoneId);
+    }
+
+    @POST @Path("/zone/{zone-id}/enable")
+    public String enable(String zoneId) {
+        return null;
+    }
+
+    @POST @Path("/zone/{zone-id}/disable")
+    public String disable(@PathParam("zone-id") String zoneId) {
+        ZoneEntity zoneEntity = _provisioningService.getZone(zoneId);
+        zoneEntity.disable();
+        return null;
+    }
+
+    @POST @Path("/zone/{zone-id}/deactivate")
+    public String deactivate(@PathParam("zone-id") String zoneId) {
+        return null;
+    }
+
+    @POST @Path("/zone/{zone-id}/activate")
+    public String reactivate(@PathParam("zone-id") String zoneId) {
+        return null;
+    }
+
+
+    @PUT @Path("/zone/create")
+    public ZoneEntity createZone(@QueryParam("xid") String xid,
+            @QueryParam("display-name") String displayName) {
+        return null;
+    }
+
+    @DELETE @Path("/zone/{zone-id}")
+    public String deleteZone(@QueryParam("zone-id") String xid) {
+        return null;
+    }
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/469c4dd1/engine/components-api/src/org/apache/cloudstack/compute/ComputeGuru.java
----------------------------------------------------------------------
diff --git a/engine/components-api/src/org/apache/cloudstack/compute/ComputeGuru.java b/engine/components-api/src/org/apache/cloudstack/compute/ComputeGuru.java
index 5dbe0c6..73aa84c 100644
--- a/engine/components-api/src/org/apache/cloudstack/compute/ComputeGuru.java
+++ b/engine/components-api/src/org/apache/cloudstack/compute/ComputeGuru.java
@@ -1,34 +1,34 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cloudstack.compute;
-
-import com.cloud.vm.VirtualMachineProfile;
-
-/**
- * ComputeGuru understands everything about the hypervisor.
- * 
- */
-public interface ComputeGuru {
-    String getVersion();
-    String getHypervisor();
-    void start(VirtualMachineProfile vm);
-    void stop(VirtualMachineProfile vm);
-
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cloudstack.compute;
+
+import com.cloud.vm.VirtualMachineProfile;
+
+/**
+ * ComputeGuru understands everything about the hypervisor.
+ *
+ */
+public interface ComputeGuru {
+    String getVersion();
+    String getHypervisor();
+    void start(VirtualMachineProfile vm);
+    void stop(VirtualMachineProfile vm);
+
+
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/469c4dd1/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManager.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManager.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManager.java
index a36ca3a..82c580f 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManager.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManager.java
@@ -14,32 +14,32 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.engine.cloud.entity.api;
-
-import org.apache.cloudstack.engine.cloud.entity.api.db.VMEntityVO;
-
-import com.cloud.deploy.DeploymentPlan;
-import com.cloud.deploy.DeploymentPlanner.ExcludeList;
-import com.cloud.exception.AgentUnavailableException;
-import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.OperationTimedoutException;
-import com.cloud.exception.ResourceUnavailableException;
+package org.apache.cloudstack.engine.cloud.entity.api;
+
+import org.apache.cloudstack.engine.cloud.entity.api.db.VMEntityVO;
+
+import com.cloud.deploy.DeploymentPlan;
+import com.cloud.deploy.DeploymentPlanner.ExcludeList;
+import com.cloud.exception.AgentUnavailableException;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.OperationTimedoutException;
+import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.vm.VirtualMachineProfile;
 
 import java.util.Map;
-
-public interface VMEntityManager {
-
-	VMEntityVO loadVirtualMachine(String vmId);
-
-	void saveVirtualMachine(VMEntityVO vmInstanceVO);
-
-	String reserveVirtualMachine(VMEntityVO vmEntityVO, String plannerToUse, DeploymentPlan plan, ExcludeList exclude) throws InsufficientCapacityException, ResourceUnavailableException;
-
+
+public interface VMEntityManager {
+
+	VMEntityVO loadVirtualMachine(String vmId);
+
+	void saveVirtualMachine(VMEntityVO vmInstanceVO);
+
+	String reserveVirtualMachine(VMEntityVO vmEntityVO, String plannerToUse, DeploymentPlan plan, ExcludeList exclude) throws InsufficientCapacityException, ResourceUnavailableException;
+
     void deployVirtualMachine(String reservationId, String caller, Map<VirtualMachineProfile.Param, Object> params) throws InsufficientCapacityException, ResourceUnavailableException;
-
-    boolean stopvirtualmachine(VMEntityVO vmEntityVO, String caller) throws ResourceUnavailableException;
-
-    boolean destroyVirtualMachine(VMEntityVO vmEntityVO, String caller) throws AgentUnavailableException, OperationTimedoutException, ConcurrentOperationException;
-}
+
+    boolean stopvirtualmachine(VMEntityVO vmEntityVO, String caller) throws ResourceUnavailableException;
+
+    boolean destroyVirtualMachine(VMEntityVO vmEntityVO, String caller) throws AgentUnavailableException, OperationTimedoutException, ConcurrentOperationException;
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/469c4dd1/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java
index 508b0b9..c2ca729 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java
@@ -14,33 +14,33 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.engine.cloud.entity.api;
-
-import java.lang.reflect.Method;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import org.apache.cloudstack.engine.cloud.entity.api.db.VMEntityVO;
+package org.apache.cloudstack.engine.cloud.entity.api;
+
+import java.lang.reflect.Method;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.engine.cloud.entity.api.db.VMEntityVO;
 import org.springframework.stereotype.Component;
-
-import com.cloud.deploy.DeploymentPlan;
-import com.cloud.deploy.DeploymentPlanner.ExcludeList;
-import com.cloud.exception.AgentUnavailableException;
-import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.OperationTimedoutException;
-import com.cloud.exception.ResourceUnavailableException;
+
+import com.cloud.deploy.DeploymentPlan;
+import com.cloud.deploy.DeploymentPlanner.ExcludeList;
+import com.cloud.exception.AgentUnavailableException;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.OperationTimedoutException;
+import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.vm.VirtualMachineProfile;
 
 @Component
-public class VirtualMachineEntityImpl implements VirtualMachineEntity {
-	
-	@Inject private VMEntityManager manager;
-
-	private VMEntityVO vmEntityVO;
+public class VirtualMachineEntityImpl implements VirtualMachineEntity {
+
+	@Inject private VMEntityManager manager;
+
+	private VMEntityVO vmEntityVO;
 
 	public VirtualMachineEntityImpl() {
 	}
@@ -61,204 +61,204 @@ public class VirtualMachineEntityImpl implements VirtualMachineEntity {
 
 		manager.saveVirtualMachine(vmEntityVO);
 	}
-	
-	public VirtualMachineEntityImpl(String vmId, VMEntityManager manager) {
-		this.manager = manager;
-    	this.vmEntityVO = this.manager.loadVirtualMachine(vmId);
-    }
-
-	public VirtualMachineEntityImpl(String vmId, String owner, String hostName, String displayName, int cpu, int speed, long memory, List<String> computeTags, List<String> rootDiskTags, List<String> networks, VMEntityManager manager) {
-		this(vmId, manager);
-		this.vmEntityVO.setOwner(owner);
-		this.vmEntityVO.setHostname(hostName);
-		this.vmEntityVO.setDisplayname(displayName);
-		this.vmEntityVO.setSpeed(speed);
-		this.vmEntityVO.setComputeTags(computeTags);
-		this.vmEntityVO.setRootDiskTags(rootDiskTags);
-		this.vmEntityVO.setNetworkIds(networks);
-		
-		manager.saveVirtualMachine(vmEntityVO);
-    }
-
-	@Override
-	public String getUuid() {
-		return vmEntityVO.getUuid();
-	}
-
-	@Override
-	public long getId() {
-		return vmEntityVO.getId();
-	}
-
-	@Override
-	public String getCurrentState() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public String getDesiredState() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public Date getCreatedTime() {
-		return vmEntityVO.getCreated();
-	}
-
-	@Override
-	public Date getLastUpdatedTime() {
-		return vmEntityVO.getUpdateTime();
-	}
-
-	@Override
-	public String getOwner() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public Map<String, String> getDetails() {
-		return vmEntityVO.getDetails();
-	}
-
-	@Override
-	public void addDetail(String name, String value) {
-		vmEntityVO.setDetail(name, value);
-	}
-
-	@Override
-	public void delDetail(String name, String value) {
-		// TODO Auto-generated method stub
-	}
-
-	@Override
-	public void updateDetail(String name, String value) {
-		// TODO Auto-generated method stub
-	}
-
-	@Override
-	public List<Method> getApplicableActions() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public List<String> listVolumeIds() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public List<VolumeEntity> listVolumes() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public List<String> listNicUuids() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public List<NicEntity> listNics() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public TemplateEntity getTemplate() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public List<String> listTags() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public void addTag() {
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	public void delTag() {
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	public String reserve(String plannerToUse, DeploymentPlan plan,
-			ExcludeList exclude, String caller) throws InsufficientCapacityException, ResourceUnavailableException {
-		return manager.reserveVirtualMachine(this.vmEntityVO, plannerToUse, plan, exclude);
-	}
-
-	@Override
-	public void migrateTo(String reservationId, String caller) {
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
+
+	public VirtualMachineEntityImpl(String vmId, VMEntityManager manager) {
+		this.manager = manager;
+	this.vmEntityVO = this.manager.loadVirtualMachine(vmId);
+    }
+
+	public VirtualMachineEntityImpl(String vmId, String owner, String hostName, String displayName, int cpu, int speed, long memory, List<String> computeTags, List<String> rootDiskTags, List<String> networks, VMEntityManager manager) {
+		this(vmId, manager);
+		this.vmEntityVO.setOwner(owner);
+		this.vmEntityVO.setHostname(hostName);
+		this.vmEntityVO.setDisplayname(displayName);
+		this.vmEntityVO.setSpeed(speed);
+		this.vmEntityVO.setComputeTags(computeTags);
+		this.vmEntityVO.setRootDiskTags(rootDiskTags);
+		this.vmEntityVO.setNetworkIds(networks);
+
+		manager.saveVirtualMachine(vmEntityVO);
+    }
+
+	@Override
+	public String getUuid() {
+		return vmEntityVO.getUuid();
+	}
+
+	@Override
+	public long getId() {
+		return vmEntityVO.getId();
+	}
+
+	@Override
+	public String getCurrentState() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String getDesiredState() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Date getCreatedTime() {
+		return vmEntityVO.getCreated();
+	}
+
+	@Override
+	public Date getLastUpdatedTime() {
+		return vmEntityVO.getUpdateTime();
+	}
+
+	@Override
+	public String getOwner() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Map<String, String> getDetails() {
+		return vmEntityVO.getDetails();
+	}
+
+	@Override
+	public void addDetail(String name, String value) {
+		vmEntityVO.setDetail(name, value);
+	}
+
+	@Override
+	public void delDetail(String name, String value) {
+		// TODO Auto-generated method stub
+	}
+
+	@Override
+	public void updateDetail(String name, String value) {
+		// TODO Auto-generated method stub
+	}
+
+	@Override
+	public List<Method> getApplicableActions() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public List<String> listVolumeIds() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public List<VolumeEntity> listVolumes() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public List<String> listNicUuids() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public List<NicEntity> listNics() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public TemplateEntity getTemplate() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public List<String> listTags() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void addTag() {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void delTag() {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public String reserve(String plannerToUse, DeploymentPlan plan,
+			ExcludeList exclude, String caller) throws InsufficientCapacityException, ResourceUnavailableException {
+		return manager.reserveVirtualMachine(this.vmEntityVO, plannerToUse, plan, exclude);
+	}
+
+	@Override
+	public void migrateTo(String reservationId, String caller) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
 	public void deploy(String reservationId, String caller, Map<VirtualMachineProfile.Param, Object> params) throws InsufficientCapacityException, ResourceUnavailableException{
 	    manager.deployVirtualMachine(reservationId, caller, params);
-	}
-
-	@Override
-	public boolean stop(String caller) throws ResourceUnavailableException{
-	    return manager.stopvirtualmachine(this.vmEntityVO, caller);
-	}
-
-	@Override
-	public void cleanup() {
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	public boolean destroy(String caller) throws AgentUnavailableException, OperationTimedoutException, ConcurrentOperationException {
-		return manager.destroyVirtualMachine(this.vmEntityVO, caller);
-	}
-
-	@Override
-	public VirtualMachineEntity duplicate(String externalId) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public SnapshotEntity takeSnapshotOf() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public void attach(VolumeEntity volume, short deviceId) {
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	public void detach(VolumeEntity volume) {
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	public void connectTo(NetworkEntity network, short nicId) {
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	public void disconnectFrom(NetworkEntity netowrk, short nicId) {
-		// TODO Auto-generated method stub
-
-	}
-
-}
+	}
+
+	@Override
+	public boolean stop(String caller) throws ResourceUnavailableException{
+	    return manager.stopvirtualmachine(this.vmEntityVO, caller);
+	}
+
+	@Override
+	public void cleanup() {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public boolean destroy(String caller) throws AgentUnavailableException, OperationTimedoutException, ConcurrentOperationException {
+		return manager.destroyVirtualMachine(this.vmEntityVO, caller);
+	}
+
+	@Override
+	public VirtualMachineEntity duplicate(String externalId) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public SnapshotEntity takeSnapshotOf() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void attach(VolumeEntity volume, short deviceId) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void detach(VolumeEntity volume) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void connectTo(NetworkEntity network, short nicId) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void disconnectFrom(NetworkEntity netowrk, short nicId) {
+		// TODO Auto-generated method stub
+
+	}
+
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/469c4dd1/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMComputeTagVO.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMComputeTagVO.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMComputeTagVO.java
index c367ee9..e4fc228 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMComputeTagVO.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMComputeTagVO.java
@@ -14,54 +14,54 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.engine.cloud.entity.api.db;
-
-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 org.apache.cloudstack.api.InternalIdentity;
-
-@Entity
-@Table(name = "vm_compute_tags")
-public class VMComputeTagVO implements InternalIdentity{
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private long id;
-
-    @Column(name = "vm_id")
-    private long vmId;
-
-    @Column(name = "compute_tag")
-    private String computeTag;
-
-    /**
-     * There should never be a public constructor for this class. Since it's
-     * only here to define the table for the DAO class.
-     */
-    protected VMComputeTagVO() {
-    }
-
-    public VMComputeTagVO(long vmId, String tag) {
-        this.vmId = vmId;
-        this.computeTag = tag;
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public long getVmId() {
-        return vmId;
-    }
-
-    public String getComputeTag() {
-        return computeTag;
-    }
-
-}
+package org.apache.cloudstack.engine.cloud.entity.api.db;
+
+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 org.apache.cloudstack.api.InternalIdentity;
+
+@Entity
+@Table(name = "vm_compute_tags")
+public class VMComputeTagVO implements InternalIdentity{
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private long id;
+
+    @Column(name = "vm_id")
+    private long vmId;
+
+    @Column(name = "compute_tag")
+    private String computeTag;
+
+    /**
+     * There should never be a public constructor for this class. Since it's
+     * only here to define the table for the DAO class.
+     */
+    protected VMComputeTagVO() {
+    }
+
+    public VMComputeTagVO(long vmId, String tag) {
+        this.vmId = vmId;
+        this.computeTag = tag;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public long getVmId() {
+        return vmId;
+    }
+
+    public String getComputeTag() {
+        return computeTag;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/469c4dd1/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java
index 4fe6718..4748215 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java
@@ -574,4 +574,4 @@ public class VMEntityVO implements VirtualMachine, FiniteStateObject<State, Virt
         this.vmReservation = vmReservation;
     }
 
-}
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/469c4dd1/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMNetworkMapVO.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMNetworkMapVO.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMNetworkMapVO.java
index a0aa264..f29b19f 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMNetworkMapVO.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMNetworkMapVO.java
@@ -14,58 +14,58 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.engine.cloud.entity.api.db;
-
-
-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 org.apache.cloudstack.api.InternalIdentity;
-
-
-@Entity
-@Table(name = "vm_network_map")
-public class VMNetworkMapVO implements InternalIdentity{
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private long id;
-
-    @Column(name = "vm_id")
-    private long vmId;
-
-    @Column(name="network_id")
-    private long networkId;
-
-   
-    /**
-     * There should never be a public constructor for this class. Since it's
-     * only here to define the table for the DAO class.
-     */
-    protected VMNetworkMapVO() {
-    }
-
-    public VMNetworkMapVO(long vmId, long networkId) {
-        this.vmId = vmId;
-        this.networkId = networkId;
-    }
-    
-    
-    public long getId() {
-        return id;
-    }
-
-    public long getVmId() {
-        return vmId;
-    }
-
-    
-    public long getNetworkId() {
-        return networkId;
-    }
-  
-}
+package org.apache.cloudstack.engine.cloud.entity.api.db;
+
+
+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 org.apache.cloudstack.api.InternalIdentity;
+
+
+@Entity
+@Table(name = "vm_network_map")
+public class VMNetworkMapVO implements InternalIdentity{
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private long id;
+
+    @Column(name = "vm_id")
+    private long vmId;
+
+    @Column(name="network_id")
+    private long networkId;
+
+
+    /**
+     * There should never be a public constructor for this class. Since it's
+     * only here to define the table for the DAO class.
+     */
+    protected VMNetworkMapVO() {
+    }
+
+    public VMNetworkMapVO(long vmId, long networkId) {
+        this.vmId = vmId;
+        this.networkId = networkId;
+    }
+
+
+    public long getId() {
+        return id;
+    }
+
+    public long getVmId() {
+        return vmId;
+    }
+
+
+    public long getNetworkId() {
+        return networkId;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/469c4dd1/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMReservationVO.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMReservationVO.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMReservationVO.java
index 535290b..5a69ec8 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMReservationVO.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMReservationVO.java
@@ -14,114 +14,114 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.engine.cloud.entity.api.db;
-
-import java.util.Date;
-import java.util.Map;
-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.Table;
-import javax.persistence.Transient;
-
-import org.apache.cloudstack.api.Identity;
-import org.apache.cloudstack.api.InternalIdentity;
-
-import com.cloud.utils.db.GenericDao;
-
-@Entity
-@Table(name = "vm_reservation")
-public class VMReservationVO implements Identity, InternalIdentity{
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private long id;
-
-    @Column(name = "vm_id")
-    private long vmId;
-
-    @Column(name="uuid")
-    private String uuid;
-    
-    @Column(name="data_center_id")
-    private long dataCenterId;
-
-    @Column(name="pod_id")
-    private long podId;
-    
-    @Column(name="cluster_id")
-    private long clusterId;
-    
-    @Column(name="host_id")
-    private long hostId;
-    
-    @Column(name=GenericDao.CREATED_COLUMN)
-    private Date created;
-
-    @Column(name=GenericDao.REMOVED_COLUMN)
-    private Date removed;
-
-    // VolumeId -> poolId 
-    @Transient
-    Map<Long,Long> volumeReservationMap;
-    
-    /**
-     * There should never be a public constructor for this class. Since it's
-     * only here to define the table for the DAO class.
-     */
-    protected VMReservationVO() {
-    }
-
-    public VMReservationVO(long vmId, long dataCenterId, long podId, long clusterId, long hostId) {
-        this.vmId = vmId;
-        this.dataCenterId = dataCenterId;
-        this.podId = podId;
-        this.clusterId = clusterId;
-        this.hostId = hostId;
-        this.uuid = UUID.randomUUID().toString();
-    }
-    
-    
-    public long getId() {
-        return id;
-    }
-
-    public long getVmId() {
-        return vmId;
-    }
-
-    @Override
-    public String getUuid() {
-        return uuid;
-    }
-    
-    public long getDataCenterId() {
-        return dataCenterId;
-    }
-
-    public Long getPodId() {
-        return podId;
-    }
-    
-    public Long getClusterId() {
-        return clusterId;
-    }
-
-    public Long getHostId() {
-        return hostId;
-    }
-
-    public Map<Long,Long> getVolumeReservation(){
-        return volumeReservationMap;
-    }
-    
-    public void setVolumeReservation(Map<Long,Long> volumeReservationMap){
-        this.volumeReservationMap = volumeReservationMap;
-    }
-
-}
+package org.apache.cloudstack.engine.cloud.entity.api.db;
+
+import java.util.Date;
+import java.util.Map;
+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.Table;
+import javax.persistence.Transient;
+
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+
+import com.cloud.utils.db.GenericDao;
+
+@Entity
+@Table(name = "vm_reservation")
+public class VMReservationVO implements Identity, InternalIdentity{
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private long id;
+
+    @Column(name = "vm_id")
+    private long vmId;
+
+    @Column(name="uuid")
+    private String uuid;
+
+    @Column(name="data_center_id")
+    private long dataCenterId;
+
+    @Column(name="pod_id")
+    private long podId;
+
+    @Column(name="cluster_id")
+    private long clusterId;
+
+    @Column(name="host_id")
+    private long hostId;
+
+    @Column(name=GenericDao.CREATED_COLUMN)
+    private Date created;
+
+    @Column(name=GenericDao.REMOVED_COLUMN)
+    private Date removed;
+
+    // VolumeId -> poolId
+    @Transient
+    Map<Long,Long> volumeReservationMap;
+
+    /**
+     * There should never be a public constructor for this class. Since it's
+     * only here to define the table for the DAO class.
+     */
+    protected VMReservationVO() {
+    }
+
+    public VMReservationVO(long vmId, long dataCenterId, long podId, long clusterId, long hostId) {
+        this.vmId = vmId;
+        this.dataCenterId = dataCenterId;
+        this.podId = podId;
+        this.clusterId = clusterId;
+        this.hostId = hostId;
+        this.uuid = UUID.randomUUID().toString();
+    }
+
+
+    public long getId() {
+        return id;
+    }
+
+    public long getVmId() {
+        return vmId;
+    }
+
+    @Override
+    public String getUuid() {
+        return uuid;
+    }
+
+    public long getDataCenterId() {
+        return dataCenterId;
+    }
+
+    public Long getPodId() {
+        return podId;
+    }
+
+    public Long getClusterId() {
+        return clusterId;
+    }
+
+    public Long getHostId() {
+        return hostId;
+    }
+
+    public Map<Long,Long> getVolumeReservation(){
+        return volumeReservationMap;
+    }
+
+    public void setVolumeReservation(Map<Long,Long> volumeReservationMap){
+        this.volumeReservationMap = volumeReservationMap;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/469c4dd1/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMRootDiskTagVO.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMRootDiskTagVO.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMRootDiskTagVO.java
index a1cca3f..3c09e93 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMRootDiskTagVO.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMRootDiskTagVO.java
@@ -14,54 +14,54 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.engine.cloud.entity.api.db;
-
-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 org.apache.cloudstack.api.InternalIdentity;
-
-@Entity
-@Table(name = "vm_root_disk_tags")
-public class VMRootDiskTagVO implements InternalIdentity {
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private long id;
-
-    @Column(name = "vm_id")
-    private long vmId;
-
-    @Column(name = "root_disk_tag")
-    private String rootDiskTag;
-
-    /**
-     * There should never be a public constructor for this class. Since it's
-     * only here to define the table for the DAO class.
-     */
-    protected VMRootDiskTagVO() {
-    }
-
-    public VMRootDiskTagVO(long vmId, String rootDiskTag) {
-        this.vmId = vmId;
-        this.rootDiskTag = rootDiskTag;
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public long getVmId() {
-        return vmId;
-    }
-
-    public String getRootDiskTag() {
-        return rootDiskTag;
-    }
-
-}
+package org.apache.cloudstack.engine.cloud.entity.api.db;
+
+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 org.apache.cloudstack.api.InternalIdentity;
+
+@Entity
+@Table(name = "vm_root_disk_tags")
+public class VMRootDiskTagVO implements InternalIdentity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private long id;
+
+    @Column(name = "vm_id")
+    private long vmId;
+
+    @Column(name = "root_disk_tag")
+    private String rootDiskTag;
+
+    /**
+     * There should never be a public constructor for this class. Since it's
+     * only here to define the table for the DAO class.
+     */
+    protected VMRootDiskTagVO() {
+    }
+
+    public VMRootDiskTagVO(long vmId, String rootDiskTag) {
+        this.vmId = vmId;
+        this.rootDiskTag = rootDiskTag;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public long getVmId() {
+        return vmId;
+    }
+
+    public String getRootDiskTag() {
+        return rootDiskTag;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/469c4dd1/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VolumeReservationVO.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VolumeReservationVO.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VolumeReservationVO.java
index cbad9ab..f064623 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VolumeReservationVO.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VolumeReservationVO.java
@@ -14,87 +14,87 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.engine.cloud.entity.api.db;
-
-import java.util.Date;
-import java.util.Map;
-
-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;
-
-import org.apache.cloudstack.api.Identity;
-import org.apache.cloudstack.api.InternalIdentity;
-
-import com.cloud.utils.db.GenericDao;
-
-@Entity
-@Table(name = "volume_reservation")
-public class VolumeReservationVO implements InternalIdentity{
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private long id;
-
-    @Column(name = "vm_reservation_id")
-    private Long vmReservationId;
-    
-    @Column(name = "vm_id")
-    private long vmId;
-    
-    @Column(name="volume_id")
-    private long volumeId;
-
-    @Column(name="pool_id")
-    private long poolId;
-    
-    // VolumeId -> poolId 
-    @Transient
-    Map<String, String> volumeReservationMap;
-    
-    /**
-     * There should never be a public constructor for this class. Since it's
-     * only here to define the table for the DAO class.
-     */
-    protected VolumeReservationVO() {
-    }
-
-    public VolumeReservationVO(long vmId, long volumeId, long poolId, Long vmReservationId) {
-        this.vmId = vmId;
-        this.volumeId = volumeId;
-        this.poolId = poolId;
-        this.vmReservationId = vmReservationId;
-    }
-    
-    
-    public long getId() {
-        return id;
-    }
-
-    public long getVmId() {
-        return vmId;
-    }
-
-    public Long geVmReservationId() {
-        return vmReservationId;
-    }
-    
-    public long getVolumeId() {
-        return volumeId;
-    }
-
-    public Long getPoolId() {
-        return poolId;
-    }
-
-
-    public Map<String,String> getVolumeReservation(){
-        return volumeReservationMap;
-    }
-
-}
+package org.apache.cloudstack.engine.cloud.entity.api.db;
+
+import java.util.Date;
+import java.util.Map;
+
+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;
+
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+
+import com.cloud.utils.db.GenericDao;
+
+@Entity
+@Table(name = "volume_reservation")
+public class VolumeReservationVO implements InternalIdentity{
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private long id;
+
+    @Column(name = "vm_reservation_id")
+    private Long vmReservationId;
+
+    @Column(name = "vm_id")
+    private long vmId;
+
+    @Column(name="volume_id")
+    private long volumeId;
+
+    @Column(name="pool_id")
+    private long poolId;
+
+    // VolumeId -> poolId
+    @Transient
+    Map<String, String> volumeReservationMap;
+
+    /**
+     * There should never be a public constructor for this class. Since it's
+     * only here to define the table for the DAO class.
+     */
+    protected VolumeReservationVO() {
+    }
+
+    public VolumeReservationVO(long vmId, long volumeId, long poolId, Long vmReservationId) {
+        this.vmId = vmId;
+        this.volumeId = volumeId;
+        this.poolId = poolId;
+        this.vmReservationId = vmReservationId;
+    }
+
+
+    public long getId() {
+        return id;
+    }
+
+    public long getVmId() {
+        return vmId;
+    }
+
+    public Long geVmReservationId() {
+        return vmReservationId;
+    }
+
+    public long getVolumeId() {
+        return volumeId;
+    }
+
+    public Long getPoolId() {
+        return poolId;
+    }
+
+
+    public Map<String,String> getVolumeReservation(){
+        return volumeReservationMap;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/469c4dd1/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMComputeTagDao.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMComputeTagDao.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMComputeTagDao.java
index d01bf2f..d8178d4 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMComputeTagDao.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMComputeTagDao.java
@@ -14,18 +14,18 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.engine.cloud.entity.api.db.dao;
-
-import java.util.List;
-
-import org.apache.cloudstack.engine.cloud.entity.api.db.VMComputeTagVO;
-
-import com.cloud.utils.db.GenericDao;
-
-public interface VMComputeTagDao extends GenericDao<VMComputeTagVO, Long>{
-
-    void persist(long vmId, List<String> computeTags);
-    
-    List<String> getComputeTags(long vmId);
-
-}
+package org.apache.cloudstack.engine.cloud.entity.api.db.dao;
+
+import java.util.List;
+
+import org.apache.cloudstack.engine.cloud.entity.api.db.VMComputeTagVO;
+
+import com.cloud.utils.db.GenericDao;
+
+public interface VMComputeTagDao extends GenericDao<VMComputeTagVO, Long>{
+
+    void persist(long vmId, List<String> computeTags);
+
+    List<String> getComputeTags(long vmId);
+
+}


Mime
View raw message