From 3ba48f9676ac342d0fa63d6600fb0808ffcb9eeb Mon Sep 17 00:00:00 2001 From: Kris McQueen Date: Mon, 13 Sep 2010 15:05:17 -0700 Subject: [PATCH] fixing up code rearrangement since I forgot to add the files to my commit, oops... --- server/src/com/cloud/consoleproxy/ConsoleProxyListener.java | 4 ---- server/src/com/cloud/event/EventUtils.java | 1 - server/src/com/cloud/server/ManagementServerImpl.java | 1 - 3 files changed, 6 deletions(-) diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyListener.java b/server/src/com/cloud/consoleproxy/ConsoleProxyListener.java index 00a2d27c87e..def13ab2209 100644 --- a/server/src/com/cloud/consoleproxy/ConsoleProxyListener.java +++ b/server/src/com/cloud/consoleproxy/ConsoleProxyListener.java @@ -17,8 +17,6 @@ */ package com.cloud.consoleproxy; -import org.apache.log4j.Logger; - import com.cloud.agent.Listener; import com.cloud.agent.api.AgentControlAnswer; import com.cloud.agent.api.AgentControlCommand; @@ -31,8 +29,6 @@ import com.cloud.host.HostVO; import com.cloud.host.Status; public class ConsoleProxyListener implements Listener { - private final static Logger s_logger = Logger.getLogger(ConsoleProxyListener.class); - ConsoleProxyManager _proxyMgr = null; public ConsoleProxyListener(ConsoleProxyManager proxyMgr) { diff --git a/server/src/com/cloud/event/EventUtils.java b/server/src/com/cloud/event/EventUtils.java index c558415fe0a..1a30f5cc575 100644 --- a/server/src/com/cloud/event/EventUtils.java +++ b/server/src/com/cloud/event/EventUtils.java @@ -1,7 +1,6 @@ package com.cloud.event; import com.cloud.event.dao.EventDao; -import com.cloud.server.ManagementServer; import com.cloud.utils.component.ComponentLocator; public class EventUtils { diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index fd29a9f1ad4..79a3db3e674 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -155,7 +155,6 @@ import com.cloud.dc.dao.VlanDao; import com.cloud.domain.DomainVO; import com.cloud.domain.dao.DomainDao; import com.cloud.event.EventTypes; -import com.cloud.event.EventUtils; import com.cloud.event.EventVO; import com.cloud.event.dao.EventDao; import com.cloud.exception.AgentUnavailableException;