[8/9] git commit: updated refs/heads/master to b616522

[ja...@apache.org]

CLOUDSTACK-8324: Updated import and added ResourceWrapper annotation


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

Branch: refs/heads/master
Commit: 6e96fc6f3830ed2861342d399c1200770baa1837
Parents: 3a8d1f7
Author: Jayapal <ja...@apache.org>
Authored: Wed May 27 12:22:29 2015 +0530
Committer: Jayapal <ja...@apache.org>
Committed: Thu May 28 15:56:37 2015 +0530

----------------------------------------------------------------------
 .../wrapper/citrix/CitrixGetVmIpAddressCommandWrapper.java     | 6 +++---
 server/src/com/cloud/vm/UserVmManagerImpl.java                 | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6e96fc6f/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetVmIpAddressCommandWrapper.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetVmIpAddressCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetVmIpAddressCommandWrapper.java
index 889ded3..bbfec2c 100644
--- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetVmIpAddressCommandWrapper.java
+++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetVmIpAddressCommandWrapper.java
@@ -17,11 +17,10 @@
 // under the License.
 //
 
-package com.cloud.hypervisor.xenserver.resource.wrapper;
-
+package com.cloud.hypervisor.xenserver.resource.wrapper.citrix;
 import java.util.Map;
-
 import com.cloud.agent.api.GetVmIpAddressCommand;
+import com.cloud.resource.ResourceWrapper;
 import com.cloud.utils.net.NetUtils;
 import com.xensource.xenapi.Connection;
 import com.xensource.xenapi.VM;
@@ -34,6 +33,7 @@ import com.cloud.hypervisor.xenserver.resource.CitrixResourceBase;
 import com.cloud.resource.CommandWrapper;
 import org.apache.xmlrpc.XmlRpcException;
 
+@ResourceWrapper(handles =  GetVmIpAddressCommand.class)
 public final class CitrixGetVmIpAddressCommandWrapper extends CommandWrapper<GetVmIpAddressCommand, Answer, CitrixResourceBase> {
 
     private static final Logger s_logger = Logger.getLogger(CitrixGetVmIpAddressCommandWrapper.class);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6e96fc6f/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 3364655..894749c 100644
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -37,6 +37,7 @@ import javax.ejb.Local;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import com.cloud.event.ActionEvent;
 import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO;
 import org.apache.commons.codec.binary.Base64;
@@ -134,10 +135,8 @@ import com.cloud.deploy.dao.PlannerHostReservationDao;
 import com.cloud.domain.DomainVO;
 import com.cloud.domain.Domain;
 import com.cloud.domain.dao.DomainDao;
-import com.cloud.event.ActionEvent;
 import com.cloud.event.EventTypes;
 import com.cloud.event.ActionEventUtils;
-import com.cloud.event.ActionEventUtils;
 import com.cloud.event.UsageEventUtils;
 import com.cloud.event.UsageEventVO;
 import com.cloud.event.dao.UsageEventDao;