You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2013/08/02 22:51:05 UTC

[1/2] git commit: updated refs/heads/master to 7a2aaf9

Updated Branches:
  refs/heads/master afd5d555f -> 7a2aaf96f


Fixed up the pom.xml to use dependencies specified in cloudstack pom


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

Branch: refs/heads/master
Commit: 66cca4d9ac16fc96e787ca0e4ecae4be29078f94
Parents: afd5d55
Author: Alex Huang <al...@citrix.com>
Authored: Fri Aug 2 13:22:01 2013 -0700
Committer: Alex Huang <al...@citrix.com>
Committed: Fri Aug 2 13:51:47 2013 -0700

----------------------------------------------------------------------
 agent/pom.xml                                |   3 -
 api/pom.xml                                  |   2 -
 client/pom.xml                               |   2 -
 core/pom.xml                                 |   7 --
 developer/pom.xml                            |   5 -
 framework/events/pom.xml                     |   2 -
 framework/ipc/pom.xml                        |   2 -
 framework/rest/pom.xml                       |   3 -
 plugins/alert-handlers/snmp-alerts/pom.xml   |   2 -
 plugins/alert-handlers/syslog-alerts/pom.xml |   1 -
 plugins/hypervisors/vmware/pom.xml           |   5 +-
 plugins/network-elements/f5/pom.xml          |   1 -
 plugins/network-elements/juniper-srx/pom.xml |   1 -
 plugins/storage/volume/solidfire/pom.xml     |   2 -
 pom.xml                                      | 110 +++++++++++++++++++---
 server/pom.xml                               |   7 --
 services/console-proxy/server/pom.xml        |   5 -
 services/secondary-storage/pom.xml           |   6 --
 usage/pom.xml                                |  67 +++++--------
 vmware-base/pom.xml                          |   4 -
 20 files changed, 121 insertions(+), 116 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/66cca4d9/agent/pom.xml
----------------------------------------------------------------------
diff --git a/agent/pom.xml b/agent/pom.xml
index e081323..7b00a93 100644
--- a/agent/pom.xml
+++ b/agent/pom.xml
@@ -39,14 +39,12 @@
     <dependency>
         <groupId>commons-daemon</groupId>
         <artifactId>commons-daemon</artifactId>
-        <version>${cs.daemon.version}</version>
     </dependency>    
   </dependencies>
   <build>
     <plugins>
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.7</version>
         <executions>
           <execution>
             <id>generate-resource</id>
@@ -98,7 +96,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.5.1</version>
         <executions>
           <execution>
             <id>copy-dependencies</id>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/66cca4d9/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index 2edc176..36d6a18 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -34,7 +34,6 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>${cs.gson.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cloudstack</groupId>
@@ -44,7 +43,6 @@
     </dependency>
   </dependencies>
   <build>
-    <defaultGoal>install</defaultGoal>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/66cca4d9/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 22924bb..39299dd 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -289,7 +289,6 @@
     </dependency>
   </dependencies>
   <build>
-    <defaultGoal>install</defaultGoal>
     <plugins>
       <plugin>
         <groupId>ru.concerteza.buildnumber</groupId>
@@ -560,7 +559,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.5.1</version>
         <executions>
           <execution>
             <id>copy</id>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/66cca4d9/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index a93d415..9fa011d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -36,13 +36,6 @@
       <artifactId>cloud-engine-api</artifactId>
       <version>${project.version}</version>
     </dependency>    
-    <!-- 
-    <dependency>
-      <groupId>org.apache.cloudstack</groupId>
-      <artifactId>cloud-engine-schema</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    -->
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/66cca4d9/developer/pom.xml
----------------------------------------------------------------------
diff --git a/developer/pom.xml b/developer/pom.xml
index b34c202..be14494 100644
--- a/developer/pom.xml
+++ b/developer/pom.xml
@@ -25,23 +25,19 @@
     <dependency>
       <groupId>mysql</groupId>
       <artifactId>mysql-connector-java</artifactId>
-      <version>${cs.mysql.version}</version>
 	  <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>commons-dbcp</groupId>
       <artifactId>commons-dbcp</artifactId>
-      <version>${cs.dbcp.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-pool</groupId>
       <artifactId>commons-pool</artifactId>
-      <version>${cs.pool.version}</version>
     </dependency>
     <dependency>
       <groupId>org.jasypt</groupId>
       <artifactId>jasypt</artifactId>
-      <version>${cs.jasypt.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cloudstack</groupId>
@@ -55,7 +51,6 @@
     </dependency>
   </dependencies>
   <build>
-    <defaultGoal>install</defaultGoal>
     <plugins>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/66cca4d9/framework/events/pom.xml
----------------------------------------------------------------------
diff --git a/framework/events/pom.xml b/framework/events/pom.xml
index 6cf380a..222e99f 100644
--- a/framework/events/pom.xml
+++ b/framework/events/pom.xml
@@ -27,12 +27,10 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>${cs.gson.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>${cs.guava.version}</version>
     </dependency>
   </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/66cca4d9/framework/ipc/pom.xml
----------------------------------------------------------------------
diff --git a/framework/ipc/pom.xml b/framework/ipc/pom.xml
index 82cddc6..77180a0 100644
--- a/framework/ipc/pom.xml
+++ b/framework/ipc/pom.xml
@@ -23,12 +23,10 @@
     <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib-nodep</artifactId>
-      <version>${cs.cglib.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>${cs.gson.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cloudstack</groupId>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/66cca4d9/framework/rest/pom.xml
----------------------------------------------------------------------
diff --git a/framework/rest/pom.xml b/framework/rest/pom.xml
index 7f00076..c601972 100644
--- a/framework/rest/pom.xml
+++ b/framework/rest/pom.xml
@@ -28,9 +28,6 @@
   <artifactId>cloud-framework-rest</artifactId>
   <name>Apache CloudStack Framework - REST</name>
   <build>
-    <defaultGoal>install</defaultGoal>
-    <sourceDirectory>src</sourceDirectory>
-    <testSourceDirectory>test</testSourceDirectory>
   </build>
   <dependencies>
     <dependency>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/66cca4d9/plugins/alert-handlers/snmp-alerts/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/alert-handlers/snmp-alerts/pom.xml b/plugins/alert-handlers/snmp-alerts/pom.xml
index c38765f..eb2545f 100644
--- a/plugins/alert-handlers/snmp-alerts/pom.xml
+++ b/plugins/alert-handlers/snmp-alerts/pom.xml
@@ -33,12 +33,10 @@
     <dependency>
       <groupId>org.apache.servicemix.bundles</groupId>
       <artifactId>org.apache.servicemix.bundles.snmp4j</artifactId>
-      <version>2.1.0_1</version>
     </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>${cs.log4j.version}</version>
     </dependency>
   </dependencies>
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/66cca4d9/plugins/alert-handlers/syslog-alerts/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/alert-handlers/syslog-alerts/pom.xml b/plugins/alert-handlers/syslog-alerts/pom.xml
index 52f22b2..07af697 100644
--- a/plugins/alert-handlers/syslog-alerts/pom.xml
+++ b/plugins/alert-handlers/syslog-alerts/pom.xml
@@ -33,7 +33,6 @@
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>${cs.log4j.version}</version>
     </dependency>
   </dependencies>
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/66cca4d9/plugins/hypervisors/vmware/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/pom.xml b/plugins/hypervisors/vmware/pom.xml
index 3e95c27..16c77b3 100644
--- a/plugins/hypervisors/vmware/pom.xml
+++ b/plugins/hypervisors/vmware/pom.xml
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>org.apache.cloudstack</groupId>
       <artifactId>cloud-engine-storage</artifactId>
-      <version>4.3.0-SNAPSHOT</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -52,17 +52,14 @@
     <dependency>
       <groupId>org.apache.axis</groupId>
       <artifactId>axis</artifactId>
-      <version>${cs.axis.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.axis</groupId>
       <artifactId>axis-jaxrpc</artifactId>
-      <version>${cs.axis.version}</version>
     </dependency>
     <dependency>
       <groupId>wsdl4j</groupId>
       <artifactId>wsdl4j</artifactId>
-      <version>1.4</version>
     </dependency>
   </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/66cca4d9/plugins/network-elements/f5/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/f5/pom.xml b/plugins/network-elements/f5/pom.xml
index 410cd14..760b610 100644
--- a/plugins/network-elements/f5/pom.xml
+++ b/plugins/network-elements/f5/pom.xml
@@ -35,7 +35,6 @@
     <dependency>
       <groupId>org.apache.axis</groupId>
       <artifactId>axis</artifactId>
-      <version>${cs.axis.version}</version>
     </dependency>
   </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/66cca4d9/plugins/network-elements/juniper-srx/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-srx/pom.xml b/plugins/network-elements/juniper-srx/pom.xml
index ac61bf1..542a603 100644
--- a/plugins/network-elements/juniper-srx/pom.xml
+++ b/plugins/network-elements/juniper-srx/pom.xml
@@ -35,7 +35,6 @@
     <dependency>
       <groupId>org.apache.axis</groupId>
       <artifactId>axis</artifactId>
-      <version>${cs.axis.version}</version>
     </dependency>
   </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/66cca4d9/plugins/storage/volume/solidfire/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/storage/volume/solidfire/pom.xml b/plugins/storage/volume/solidfire/pom.xml
index 617167f..011f5e1 100644
--- a/plugins/storage/volume/solidfire/pom.xml
+++ b/plugins/storage/volume/solidfire/pom.xml
@@ -28,12 +28,10 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>${cs.gson.version}</version>
     </dependency>
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>aspectjtools</artifactId>
-      <version>1.6.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/66cca4d9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7fafd91..0c9e4f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -296,6 +296,96 @@
         <artifactId>javax.persistence</artifactId>
         <version>${cs.jpa.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-web</artifactId>
+        <version>${org.springframework.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>javax.servlet</groupId>
+        <artifactId>servlet-api</artifactId>
+        <version>${cs.servlet.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpcore</artifactId>
+        <version>${cs.httpcore.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpclient</artifactId>
+        <version>${cs.httpcore.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.thoughtworks.xstream</groupId>
+        <artifactId>xstream</artifactId>
+        <version>${cs.xstream.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>javax.mail</groupId>
+        <artifactId>mail</artifactId>
+        <version>${cs.mail.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>jstl</groupId>
+        <artifactId>jstl</artifactId>
+        <version>${cs.jstl.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-aop</artifactId>
+        <version>${org.springframework.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-beans</artifactId>
+        <version>${org.springframework.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>javax.inject</groupId>
+        <artifactId>javax.inject</artifactId>
+        <version>1</version>
+      </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>${cs.gson.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>${cs.guava.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.servicemix.bundles</groupId>
+      <artifactId>org.apache.servicemix.bundles.snmp4j</artifactId>
+      <version>2.1.0_1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>aspectjtools</artifactId>
+      <version>1.6.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.axis</groupId>
+      <artifactId>axis</artifactId>
+      <version>${cs.axis.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>commons-daemon</groupId>
+        <artifactId>commons-daemon</artifactId>
+        <version>${cs.daemon.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.axis</groupId>
+      <artifactId>axis-jaxrpc</artifactId>
+      <version>${cs.axis.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>wsdl4j</groupId>
+      <artifactId>wsdl4j</artifactId>
+      <version>1.4</version>
+    </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -307,21 +397,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-aop</artifactId>
-      <version>${org.springframework.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-beans</artifactId>
-      <version>${org.springframework.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>javax.inject</groupId>
-      <artifactId>javax.inject</artifactId>
-      <version>1</version>
-    </dependency>
-    <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
       <version>1.9.5</version>
@@ -333,6 +408,11 @@
       <version>${org.springframework.version}</version>
       <scope>test</scope>
     </dependency>
+      <dependency>
+        <groupId>javax.inject</groupId>
+        <artifactId>javax.inject</artifactId>
+        <version>1</version>
+      </dependency>
   </dependencies>
 
   <build>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/66cca4d9/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index 6e92e04..10eb99f 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -25,7 +25,6 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      <version>${org.springframework.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cloudstack</groupId>
@@ -40,13 +39,11 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>${cs.servlet.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpcore</artifactId>
-      <version>${cs.httpcore.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cloudstack</groupId>
@@ -56,22 +53,18 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
-      <version>${cs.httpcore.version}</version>
     </dependency>
     <dependency>
       <groupId>com.thoughtworks.xstream</groupId>
       <artifactId>xstream</artifactId>
-      <version>${cs.xstream.version}</version>
     </dependency>
     <dependency>
       <groupId>javax.mail</groupId>
       <artifactId>mail</artifactId>
-      <version>${cs.mail.version}</version>
     </dependency>
     <dependency>
       <groupId>jstl</groupId>
       <artifactId>jstl</artifactId>
-      <version>${cs.jstl.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/66cca4d9/services/console-proxy/server/pom.xml
----------------------------------------------------------------------
diff --git a/services/console-proxy/server/pom.xml b/services/console-proxy/server/pom.xml
index 26284f6..4438084 100644
--- a/services/console-proxy/server/pom.xml
+++ b/services/console-proxy/server/pom.xml
@@ -33,17 +33,14 @@
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>${cs.log4j.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>${cs.gson.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
-      <version>${cs.codec.version}</version>
     </dependency>
     <!-- required deps for the systemvm -->
     <dependency>
@@ -64,8 +61,6 @@
     </dependency>
   </dependencies>
   <build>
-    <defaultGoal>install</defaultGoal>
-    <sourceDirectory>src</sourceDirectory>
     <resources>
       <resource>
         <directory>certs</directory>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/66cca4d9/services/secondary-storage/pom.xml
----------------------------------------------------------------------
diff --git a/services/secondary-storage/pom.xml b/services/secondary-storage/pom.xml
index 8e9ab6b..ea4bfca 100644
--- a/services/secondary-storage/pom.xml
+++ b/services/secondary-storage/pom.xml
@@ -30,17 +30,14 @@
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>${cs.log4j.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>${cs.gson.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
-      <version>${cs.codec.version}</version>
     </dependency>
     <!-- required deps for the systemvm -->
     <dependency>
@@ -61,9 +58,6 @@
     </dependency>
   </dependencies>
   <build>
-    <defaultGoal>install</defaultGoal>
-    <sourceDirectory>src</sourceDirectory>
-    <testSourceDirectory>test</testSourceDirectory>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/66cca4d9/usage/pom.xml
----------------------------------------------------------------------
diff --git a/usage/pom.xml b/usage/pom.xml
index d13d3d2..04d1630 100644
--- a/usage/pom.xml
+++ b/usage/pom.xml
@@ -1,22 +1,14 @@
-<!--
-  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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<!-- 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. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cloud-usage</artifactId>
   <name>Apache CloudStack Usage Server</name>
@@ -31,7 +23,7 @@
       <artifactId>cloud-api</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
-      <scope>test</scope>      
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.cloudstack</groupId>
@@ -49,15 +41,14 @@
       <scope>runtime</scope>
     </dependency>
     <dependency>
-    	<groupId>commons-daemon</groupId>
-    	<artifactId>commons-daemon</artifactId>
-    	<version>${cs.daemon.version}</version>
+      <groupId>commons-daemon</groupId>
+      <artifactId>commons-daemon</artifactId>
     </dependency>
   </dependencies>
   <build>
     <resources>
       <resource>
-          <directory>resources</directory>
+        <directory>resources</directory>
       </resource>
     </resources>
     <plugins>
@@ -65,15 +56,14 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-            <excludes>
-                <exclude>com/cloud/usage/UsageManagerTest.java</exclude>
-            </excludes>
+          <excludes>
+            <exclude>com/cloud/usage/UsageManagerTest.java</exclude>
+          </excludes>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.5.1</version>
         <executions>
           <execution>
             <id>copy-dependencies</id>
@@ -90,7 +80,6 @@
       </plugin>
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.7</version>
         <executions>
           <execution>
             <id>generate-resource</id>
@@ -100,33 +89,27 @@
             </goals>
             <configuration>
               <target>
-                <copy overwrite="true"
-                  todir="${basedir}/target/transformed">
+                <copy overwrite="true" todir="${basedir}/target/transformed">
                   <fileset dir="${basedir}/../client/tomcatconf">
                     <include name="**/db.properties.in" />
                   </fileset>
                   <globmapper from="*.in" to="*" />
                   <filterchain>
-                    <filterreader
-                      classname="org.apache.tools.ant.filters.ReplaceTokens">
-                      <param type="propertiesfile"
-                        value="${cs.replace.properties}" />
+                    <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
+                      <param type="propertiesfile" value="${cs.replace.properties}" />
                     </filterreader>
                   </filterchain>
                 </copy>
               </target>
               <target>
-                <copy overwrite="true"
-                  todir="${basedir}/target/transformed">
+                <copy overwrite="true" todir="${basedir}/target/transformed">
                   <fileset dir="${basedir}/conf">
                     <include name="*.in" />
                   </fileset>
                   <globmapper from="*.in" to="*" />
                   <filterchain>
-                    <filterreader
-                      classname="org.apache.tools.ant.filters.ReplaceTokens">
-                      <param type="propertiesfile"
-                        value="${cs.replace.properties}" />
+                    <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
+                      <param type="propertiesfile" value="${cs.replace.properties}" />
                     </filterreader>
                   </filterchain>
                 </copy>
@@ -185,7 +168,7 @@
                 <artifactId>cloud-usage</artifactId>
               </executableDependency>
               <mainClass>com.cloud.usage.UsageServer</mainClass>
-              <arguments/>
+              <arguments />
               <systemProperties>
                 <systemProperty>
                   <key>catalina.home</key>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/66cca4d9/vmware-base/pom.xml
----------------------------------------------------------------------
diff --git a/vmware-base/pom.xml b/vmware-base/pom.xml
index 1f60896..3c415d3 100644
--- a/vmware-base/pom.xml
+++ b/vmware-base/pom.xml
@@ -45,7 +45,6 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>${cs.gson.version}</version>
     </dependency>
     <dependency>
       <groupId>com.cloud.com.vmware</groupId>
@@ -56,17 +55,14 @@
     <dependency>
       <groupId>org.apache.axis</groupId>
       <artifactId>axis</artifactId>
-      <version>${cs.axis.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.axis</groupId>
       <artifactId>axis-jaxrpc</artifactId>
-      <version>${cs.axis.version}</version>
     </dependency>
     <dependency>
       <groupId>wsdl4j</groupId>
       <artifactId>wsdl4j</artifactId>
-      <version>1.4</version>
     </dependency>
   </dependencies>
 </project>


[2/2] git commit: updated refs/heads/master to 7a2aaf9

Posted by ah...@apache.org.
Starting the work of moving orchestration pieces to engine


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

Branch: refs/heads/master
Commit: 7a2aaf96fd12842f24730c4c515400b5cc7a780e
Parents: 66cca4d
Author: Alex Huang <al...@citrix.com>
Authored: Fri Aug 2 13:51:37 2013 -0700
Committer: Alex Huang <al...@citrix.com>
Committed: Fri Aug 2 13:51:48 2013 -0700

----------------------------------------------------------------------
 .../src/com/cloud/vm/VirtualMachineManager.java | 183 +++++++++++++++++++
 pom.xml                                         |  15 +-
 .../src/com/cloud/vm/VirtualMachineManager.java | 183 -------------------
 3 files changed, 191 insertions(+), 190 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7a2aaf96/engine/orchestration/src/com/cloud/vm/VirtualMachineManager.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManager.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManager.java
new file mode 100644
index 0000000..a0a8464
--- /dev/null
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManager.java
@@ -0,0 +1,183 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.vm;
+
+import java.net.URI;
+import java.util.List;
+import java.util.Map;
+
+import com.cloud.agent.api.to.NicTO;
+import com.cloud.agent.api.to.VirtualMachineTO;
+import com.cloud.deploy.DeployDestination;
+import com.cloud.deploy.DeploymentPlan;
+import com.cloud.deploy.DeploymentPlanner;
+import com.cloud.exception.AgentUnavailableException;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.InsufficientServerCapacityException;
+import com.cloud.exception.OperationTimedoutException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import com.cloud.network.Network;
+import com.cloud.network.dao.NetworkVO;
+import com.cloud.offering.ServiceOffering;
+import com.cloud.service.ServiceOfferingVO;
+import com.cloud.storage.DiskOfferingVO;
+import com.cloud.storage.StoragePool;
+import com.cloud.storage.VMTemplateVO;
+import com.cloud.storage.Volume;
+import com.cloud.utils.Pair;
+import com.cloud.utils.component.Manager;
+import com.cloud.utils.fsm.NoTransitionException;
+
+/**
+ * Manages allocating resources to vms.
+ */
+public interface VirtualMachineManager extends Manager {
+
+    void allocate(String vmInstanceName,
+            VMTemplateVO template,
+            ServiceOfferingVO serviceOffering,
+            Pair<? extends DiskOfferingVO, Long> rootDiskOffering,
+            List<Pair<DiskOfferingVO, Long>> dataDiskOfferings,
+            List<Pair<NetworkVO, NicProfile>> networks,
+            Map<VirtualMachineProfile.Param, Object> params,
+            DeploymentPlan plan,
+            HypervisorType hyperType) throws InsufficientCapacityException;
+
+    void allocate(String vmInstanceName,
+            VMTemplateVO template,
+            ServiceOfferingVO serviceOffering,
+            List<Pair<NetworkVO, NicProfile>> networkProfiles,
+            DeploymentPlan plan,
+            HypervisorType hyperType) throws InsufficientCapacityException;
+
+    void start(String vmUuid, Map<VirtualMachineProfile.Param, Object> params);
+
+    void start(String vmUuid, Map<VirtualMachineProfile.Param, Object> params, DeploymentPlan planToDeploy);
+
+    void stop(String vmUuid) throws ResourceUnavailableException;
+
+    void expunge(String vmUuid) throws ResourceUnavailableException;
+
+    void registerGuru(VirtualMachine.Type type, VirtualMachineGuru guru);
+
+    boolean stateTransitTo(VMInstanceVO vm, VirtualMachine.Event e, Long hostId) throws NoTransitionException;
+
+    void advanceStart(String vmUuid, Map<VirtualMachineProfile.Param, Object> params) throws InsufficientCapacityException, ResourceUnavailableException,
+            ConcurrentOperationException, OperationTimedoutException;
+
+    void advanceStart(String vmUuid, Map<VirtualMachineProfile.Param, Object> params, DeploymentPlan planToDeploy) throws InsufficientCapacityException,
+            ResourceUnavailableException, ConcurrentOperationException, OperationTimedoutException;
+
+    void advanceStop(String vmUuid, boolean cleanupEvenIfUnableToStop) throws ResourceUnavailableException, OperationTimedoutException, ConcurrentOperationException;
+
+    void advanceExpunge(String vmUuid) throws ResourceUnavailableException, OperationTimedoutException, ConcurrentOperationException;
+
+    void destroy(String vmUuid) throws AgentUnavailableException, OperationTimedoutException, ConcurrentOperationException;
+
+    void migrateAway(String vmUuid, long hostId) throws InsufficientServerCapacityException;
+
+    void migrate(String vmUuid, long srcHostId, DeployDestination dest) throws ResourceUnavailableException, ConcurrentOperationException;
+
+    void migrateWithStorage(String vmUuid, long srcId, long destId, Map<Volume, StoragePool> volumeToPool) throws ResourceUnavailableException, ConcurrentOperationException;
+
+    void reboot(String vmUuid, Map<VirtualMachineProfile.Param, Object> params) throws InsufficientCapacityException, ResourceUnavailableException;
+
+    void advanceReboot(String vmUuid, Map<VirtualMachineProfile.Param, Object> params) throws InsufficientCapacityException, ResourceUnavailableException,
+            ConcurrentOperationException, OperationTimedoutException;
+
+    /**
+     * Check to see if a virtual machine can be upgraded to the given service offering
+     * 
+     * @param vm
+     * @param offering
+     * @return true if the host can handle the upgrade, false otherwise
+     */
+    boolean isVirtualMachineUpgradable(final VirtualMachine vm, final ServiceOffering offering);
+    
+    VirtualMachine findById(long vmId);
+
+    void storageMigration(String vmUuid, StoragePool storagePoolId);
+
+    /**
+     * @param vmInstance
+     * @param newServiceOfferingId
+     */
+    void checkIfCanUpgrade(VirtualMachine vmInstance, long newServiceOfferingId);
+
+    /**
+     * @param vmId
+     * @param serviceOfferingId
+     * @return
+     */
+    boolean upgradeVmDb(long vmId, long serviceOfferingId);
+
+    /**
+     * @param vm
+     * @param network
+     * @param requested TODO
+     * @return
+     * @throws ConcurrentOperationException
+     * @throws ResourceUnavailableException
+     * @throws InsufficientCapacityException
+     */
+    NicProfile addVmToNetwork(VirtualMachine vm, Network network, NicProfile requested) throws ConcurrentOperationException,
+                ResourceUnavailableException, InsufficientCapacityException;
+
+    /**
+     * @param vm
+     * @param nic
+     * @return
+     * @throws ResourceUnavailableException
+     * @throws ConcurrentOperationException
+     */
+    boolean removeNicFromVm(VirtualMachine vm, NicVO nic) throws ConcurrentOperationException, ResourceUnavailableException;
+
+    /**
+     * @param vm
+     * @param network
+     * @param broadcastUri TODO
+     * @return
+     * @throws ResourceUnavailableException
+     * @throws ConcurrentOperationException
+     */
+    boolean removeVmFromNetwork(VirtualMachine vm, Network network, URI broadcastUri) throws ConcurrentOperationException, ResourceUnavailableException;
+
+    /**
+     * @param nic
+     * @param hypervisorType
+     * @return
+     */
+    NicTO toNicTO(NicProfile nic, HypervisorType hypervisorType);
+
+    /**
+     * @param profile
+     * @param hvGuru
+     * @return
+     */
+    VirtualMachineTO toVmTO(VirtualMachineProfile profile);
+
+
+    VMInstanceVO reConfigureVm(VMInstanceVO vm, ServiceOffering newServiceOffering, boolean sameHost) throws ResourceUnavailableException, ConcurrentOperationException;
+
+    void findHostAndMigrate(String vmUuid, Long newSvcOfferingId, DeploymentPlanner.ExcludeList excludeHostList) throws InsufficientCapacityException,
+            ConcurrentOperationException, ResourceUnavailableException;
+
+    void migrateForScale(String vmUuid, long srcHostId, DeployDestination dest, Long newSvcOfferingId) throws ResourceUnavailableException, ConcurrentOperationException;
+
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7a2aaf96/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0c9e4f1..0f8d8c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -458,9 +458,9 @@
             </execution>
           </executions>
         </plugin>
+        <plugin>
         <!--This plugin's configuration is used to store Eclipse m2e settings only. 
           It has no influence on the Maven build itself. -->
-        <plugin>
           <groupId>org.eclipse.m2e</groupId>
           <artifactId>lifecycle-mapping</artifactId>
           <version>1.0.0</version>
@@ -469,12 +469,8 @@
               <pluginExecutions>
                 <pluginExecution>
                   <pluginExecutionFilter>
-                    <groupId>
-                      org.apache.maven.plugins
-                    </groupId>
-                    <artifactId>
-                      maven-antrun-plugin
-                    </artifactId>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-antrun-plugin</artifactId>
                     <versionRange>[1.7,)</versionRange>
                     <goals>
                       <goal>run</goal>
@@ -489,6 +485,11 @@
           </configuration>
         </plugin>
         <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-antrun-plugin</artifactId>
+          <version>1.7</version>
+        </plugin>
+        <plugin>
           <groupId>org.apache.tomcat.maven</groupId>
           <artifactId>tomcat7-maven-plugin</artifactId>
           <version>2.0</version>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7a2aaf96/server/src/com/cloud/vm/VirtualMachineManager.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/VirtualMachineManager.java b/server/src/com/cloud/vm/VirtualMachineManager.java
deleted file mode 100644
index a0a8464..0000000
--- a/server/src/com/cloud/vm/VirtualMachineManager.java
+++ /dev/null
@@ -1,183 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.vm;
-
-import java.net.URI;
-import java.util.List;
-import java.util.Map;
-
-import com.cloud.agent.api.to.NicTO;
-import com.cloud.agent.api.to.VirtualMachineTO;
-import com.cloud.deploy.DeployDestination;
-import com.cloud.deploy.DeploymentPlan;
-import com.cloud.deploy.DeploymentPlanner;
-import com.cloud.exception.AgentUnavailableException;
-import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.InsufficientServerCapacityException;
-import com.cloud.exception.OperationTimedoutException;
-import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.hypervisor.Hypervisor.HypervisorType;
-import com.cloud.network.Network;
-import com.cloud.network.dao.NetworkVO;
-import com.cloud.offering.ServiceOffering;
-import com.cloud.service.ServiceOfferingVO;
-import com.cloud.storage.DiskOfferingVO;
-import com.cloud.storage.StoragePool;
-import com.cloud.storage.VMTemplateVO;
-import com.cloud.storage.Volume;
-import com.cloud.utils.Pair;
-import com.cloud.utils.component.Manager;
-import com.cloud.utils.fsm.NoTransitionException;
-
-/**
- * Manages allocating resources to vms.
- */
-public interface VirtualMachineManager extends Manager {
-
-    void allocate(String vmInstanceName,
-            VMTemplateVO template,
-            ServiceOfferingVO serviceOffering,
-            Pair<? extends DiskOfferingVO, Long> rootDiskOffering,
-            List<Pair<DiskOfferingVO, Long>> dataDiskOfferings,
-            List<Pair<NetworkVO, NicProfile>> networks,
-            Map<VirtualMachineProfile.Param, Object> params,
-            DeploymentPlan plan,
-            HypervisorType hyperType) throws InsufficientCapacityException;
-
-    void allocate(String vmInstanceName,
-            VMTemplateVO template,
-            ServiceOfferingVO serviceOffering,
-            List<Pair<NetworkVO, NicProfile>> networkProfiles,
-            DeploymentPlan plan,
-            HypervisorType hyperType) throws InsufficientCapacityException;
-
-    void start(String vmUuid, Map<VirtualMachineProfile.Param, Object> params);
-
-    void start(String vmUuid, Map<VirtualMachineProfile.Param, Object> params, DeploymentPlan planToDeploy);
-
-    void stop(String vmUuid) throws ResourceUnavailableException;
-
-    void expunge(String vmUuid) throws ResourceUnavailableException;
-
-    void registerGuru(VirtualMachine.Type type, VirtualMachineGuru guru);
-
-    boolean stateTransitTo(VMInstanceVO vm, VirtualMachine.Event e, Long hostId) throws NoTransitionException;
-
-    void advanceStart(String vmUuid, Map<VirtualMachineProfile.Param, Object> params) throws InsufficientCapacityException, ResourceUnavailableException,
-            ConcurrentOperationException, OperationTimedoutException;
-
-    void advanceStart(String vmUuid, Map<VirtualMachineProfile.Param, Object> params, DeploymentPlan planToDeploy) throws InsufficientCapacityException,
-            ResourceUnavailableException, ConcurrentOperationException, OperationTimedoutException;
-
-    void advanceStop(String vmUuid, boolean cleanupEvenIfUnableToStop) throws ResourceUnavailableException, OperationTimedoutException, ConcurrentOperationException;
-
-    void advanceExpunge(String vmUuid) throws ResourceUnavailableException, OperationTimedoutException, ConcurrentOperationException;
-
-    void destroy(String vmUuid) throws AgentUnavailableException, OperationTimedoutException, ConcurrentOperationException;
-
-    void migrateAway(String vmUuid, long hostId) throws InsufficientServerCapacityException;
-
-    void migrate(String vmUuid, long srcHostId, DeployDestination dest) throws ResourceUnavailableException, ConcurrentOperationException;
-
-    void migrateWithStorage(String vmUuid, long srcId, long destId, Map<Volume, StoragePool> volumeToPool) throws ResourceUnavailableException, ConcurrentOperationException;
-
-    void reboot(String vmUuid, Map<VirtualMachineProfile.Param, Object> params) throws InsufficientCapacityException, ResourceUnavailableException;
-
-    void advanceReboot(String vmUuid, Map<VirtualMachineProfile.Param, Object> params) throws InsufficientCapacityException, ResourceUnavailableException,
-            ConcurrentOperationException, OperationTimedoutException;
-
-    /**
-     * Check to see if a virtual machine can be upgraded to the given service offering
-     * 
-     * @param vm
-     * @param offering
-     * @return true if the host can handle the upgrade, false otherwise
-     */
-    boolean isVirtualMachineUpgradable(final VirtualMachine vm, final ServiceOffering offering);
-    
-    VirtualMachine findById(long vmId);
-
-    void storageMigration(String vmUuid, StoragePool storagePoolId);
-
-    /**
-     * @param vmInstance
-     * @param newServiceOfferingId
-     */
-    void checkIfCanUpgrade(VirtualMachine vmInstance, long newServiceOfferingId);
-
-    /**
-     * @param vmId
-     * @param serviceOfferingId
-     * @return
-     */
-    boolean upgradeVmDb(long vmId, long serviceOfferingId);
-
-    /**
-     * @param vm
-     * @param network
-     * @param requested TODO
-     * @return
-     * @throws ConcurrentOperationException
-     * @throws ResourceUnavailableException
-     * @throws InsufficientCapacityException
-     */
-    NicProfile addVmToNetwork(VirtualMachine vm, Network network, NicProfile requested) throws ConcurrentOperationException,
-                ResourceUnavailableException, InsufficientCapacityException;
-
-    /**
-     * @param vm
-     * @param nic
-     * @return
-     * @throws ResourceUnavailableException
-     * @throws ConcurrentOperationException
-     */
-    boolean removeNicFromVm(VirtualMachine vm, NicVO nic) throws ConcurrentOperationException, ResourceUnavailableException;
-
-    /**
-     * @param vm
-     * @param network
-     * @param broadcastUri TODO
-     * @return
-     * @throws ResourceUnavailableException
-     * @throws ConcurrentOperationException
-     */
-    boolean removeVmFromNetwork(VirtualMachine vm, Network network, URI broadcastUri) throws ConcurrentOperationException, ResourceUnavailableException;
-
-    /**
-     * @param nic
-     * @param hypervisorType
-     * @return
-     */
-    NicTO toNicTO(NicProfile nic, HypervisorType hypervisorType);
-
-    /**
-     * @param profile
-     * @param hvGuru
-     * @return
-     */
-    VirtualMachineTO toVmTO(VirtualMachineProfile profile);
-
-
-    VMInstanceVO reConfigureVm(VMInstanceVO vm, ServiceOffering newServiceOffering, boolean sameHost) throws ResourceUnavailableException, ConcurrentOperationException;
-
-    void findHostAndMigrate(String vmUuid, Long newSvcOfferingId, DeploymentPlanner.ExcludeList excludeHostList) throws InsufficientCapacityException,
-            ConcurrentOperationException, ResourceUnavailableException;
-
-    void migrateForScale(String vmUuid, long srcHostId, DeployDestination dest, Long newSvcOfferingId) throws ResourceUnavailableException, ConcurrentOperationException;
-
-}