Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4F592E180 for ; Thu, 10 Jan 2013 22:47:22 +0000 (UTC) Received: (qmail 36761 invoked by uid 500); 10 Jan 2013 22:47:20 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 36718 invoked by uid 500); 10 Jan 2013 22:47:20 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 36469 invoked by uid 99); 10 Jan 2013 22:47:20 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Jan 2013 22:47:20 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1778717B43; Thu, 10 Jan 2013 22:47:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ahuang@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [17/25] removed import of componentlocator and inject from all files Message-Id: <20130110224720.1778717B43@tyr.zones.apache.org> Date: Thu, 10 Jan 2013 22:47:20 +0000 (UTC) http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/56e5fbde/server/test/com/cloud/upgrade/Test2214To30DBUpgrade.java ---------------------------------------------------------------------- diff --git a/server/test/com/cloud/upgrade/Test2214To30DBUpgrade.java b/server/test/com/cloud/upgrade/Test2214To30DBUpgrade.java index 5f05ac3..66a2fda 100644 --- a/server/test/com/cloud/upgrade/Test2214To30DBUpgrade.java +++ b/server/test/com/cloud/upgrade/Test2214To30DBUpgrade.java @@ -29,7 +29,7 @@ import org.apache.log4j.Logger; import org.junit.After; import org.junit.Before; -import com.cloud.utils.component.ComponentLocator; + import com.cloud.utils.db.DbTestUtils; import com.cloud.utils.db.Transaction; import com.cloud.utils.exception.CloudRuntimeException; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/56e5fbde/server/test/com/cloud/upgrade/Usage217To224UpgradeTest.java ---------------------------------------------------------------------- diff --git a/server/test/com/cloud/upgrade/Usage217To224UpgradeTest.java b/server/test/com/cloud/upgrade/Usage217To224UpgradeTest.java index d349247..17a85fb 100644 --- a/server/test/com/cloud/upgrade/Usage217To224UpgradeTest.java +++ b/server/test/com/cloud/upgrade/Usage217To224UpgradeTest.java @@ -29,7 +29,7 @@ import org.junit.After; import org.junit.Before; import com.cloud.upgrade.dao.VersionDaoImpl; -import com.cloud.utils.component.ComponentLocator; + import com.cloud.utils.db.DbTestUtils; import com.cloud.utils.db.Transaction; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/56e5fbde/server/test/com/cloud/upgrade/UsageEvents218To224UpgradeTest.java ---------------------------------------------------------------------- diff --git a/server/test/com/cloud/upgrade/UsageEvents218To224UpgradeTest.java b/server/test/com/cloud/upgrade/UsageEvents218To224UpgradeTest.java index 7319afa..94ae836 100644 --- a/server/test/com/cloud/upgrade/UsageEvents218To224UpgradeTest.java +++ b/server/test/com/cloud/upgrade/UsageEvents218To224UpgradeTest.java @@ -29,7 +29,7 @@ import org.junit.After; import org.junit.Before; import com.cloud.upgrade.dao.VersionDaoImpl; -import com.cloud.utils.component.ComponentLocator; + import com.cloud.utils.db.DbTestUtils; import com.cloud.utils.db.Transaction; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/56e5fbde/server/test/com/cloud/vm/dao/UserVmDaoImplTest.java ---------------------------------------------------------------------- diff --git a/server/test/com/cloud/vm/dao/UserVmDaoImplTest.java b/server/test/com/cloud/vm/dao/UserVmDaoImplTest.java index f07abca..b062dd2 100644 --- a/server/test/com/cloud/vm/dao/UserVmDaoImplTest.java +++ b/server/test/com/cloud/vm/dao/UserVmDaoImplTest.java @@ -19,7 +19,7 @@ package com.cloud.vm.dao; import junit.framework.TestCase; import com.cloud.hypervisor.Hypervisor.HypervisorType; -import com.cloud.utils.component.ComponentLocator; + import com.cloud.vm.UserVmVO; import com.cloud.vm.VirtualMachine; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/56e5fbde/server/test/com/cloud/vpc/MockVpcManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/test/com/cloud/vpc/MockVpcManagerImpl.java b/server/test/com/cloud/vpc/MockVpcManagerImpl.java index 25799d1..c41bb7b 100644 --- a/server/test/com/cloud/vpc/MockVpcManagerImpl.java +++ b/server/test/com/cloud/vpc/MockVpcManagerImpl.java @@ -50,7 +50,7 @@ import com.cloud.offering.NetworkOffering; import com.cloud.user.Account; import com.cloud.user.User; import com.cloud.utils.Pair; -import com.cloud.utils.component.ComponentLocator; + import com.cloud.utils.component.Manager; import com.cloud.vm.DomainRouterVO; import com.cloud.vpc.dao.MockVpcDaoImpl; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/56e5fbde/server/test/com/cloud/vpc/VpcApiUnitTest.java ---------------------------------------------------------------------- diff --git a/server/test/com/cloud/vpc/VpcApiUnitTest.java b/server/test/com/cloud/vpc/VpcApiUnitTest.java index 5cc325f..14e376a 100644 --- a/server/test/com/cloud/vpc/VpcApiUnitTest.java +++ b/server/test/com/cloud/vpc/VpcApiUnitTest.java @@ -45,7 +45,7 @@ import com.cloud.tags.dao.ResourceTagsDaoImpl; import com.cloud.user.AccountVO; import com.cloud.user.MockAccountManagerImpl; import com.cloud.user.dao.AccountDaoImpl; -import com.cloud.utils.component.ComponentLocator; + import com.cloud.utils.component.MockComponentLocator; import com.cloud.vm.dao.DomainRouterDaoImpl; import com.cloud.vpc.dao.MockNetworkDaoImpl; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/56e5fbde/usage/src/com/cloud/usage/UsageAlertManagerImpl.java ---------------------------------------------------------------------- diff --git a/usage/src/com/cloud/usage/UsageAlertManagerImpl.java b/usage/src/com/cloud/usage/UsageAlertManagerImpl.java index 2b698c8..f6e0374 100644 --- a/usage/src/com/cloud/usage/UsageAlertManagerImpl.java +++ b/usage/src/com/cloud/usage/UsageAlertManagerImpl.java @@ -40,7 +40,7 @@ import com.cloud.alert.AlertVO; import com.cloud.alert.dao.AlertDao; import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.utils.NumbersUtil; -import com.cloud.utils.component.ComponentLocator; + import com.sun.mail.smtp.SMTPMessage; import com.sun.mail.smtp.SMTPSSLTransport; import com.sun.mail.smtp.SMTPTransport; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/56e5fbde/usage/src/com/cloud/usage/UsageManagerImpl.java ---------------------------------------------------------------------- diff --git a/usage/src/com/cloud/usage/UsageManagerImpl.java b/usage/src/com/cloud/usage/UsageManagerImpl.java index bbf2cd6..971f5df 100644 --- a/usage/src/com/cloud/usage/UsageManagerImpl.java +++ b/usage/src/com/cloud/usage/UsageManagerImpl.java @@ -66,8 +66,8 @@ import com.cloud.user.AccountVO; import com.cloud.user.UserStatisticsVO; import com.cloud.user.dao.AccountDao; import com.cloud.user.dao.UserStatisticsDao; -import com.cloud.utils.component.ComponentLocator; -import com.cloud.utils.component.Inject; + + import com.cloud.utils.concurrency.NamedThreadFactory; import com.cloud.utils.db.DB; import com.cloud.utils.db.Filter; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/56e5fbde/usage/src/com/cloud/usage/UsageServer.java ---------------------------------------------------------------------- diff --git a/usage/src/com/cloud/usage/UsageServer.java b/usage/src/com/cloud/usage/UsageServer.java index 4cdca79..aedbe76 100644 --- a/usage/src/com/cloud/usage/UsageServer.java +++ b/usage/src/com/cloud/usage/UsageServer.java @@ -18,7 +18,7 @@ package com.cloud.usage; import org.apache.log4j.Logger; -import com.cloud.utils.component.ComponentLocator; + public class UsageServer { private static final Logger s_logger = Logger.getLogger(UsageServer.class.getName()); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/56e5fbde/usage/src/com/cloud/usage/parser/IPAddressUsageParser.java ---------------------------------------------------------------------- diff --git a/usage/src/com/cloud/usage/parser/IPAddressUsageParser.java b/usage/src/com/cloud/usage/parser/IPAddressUsageParser.java index 08cb021..f60c0bf 100644 --- a/usage/src/com/cloud/usage/parser/IPAddressUsageParser.java +++ b/usage/src/com/cloud/usage/parser/IPAddressUsageParser.java @@ -32,7 +32,7 @@ import com.cloud.usage.dao.UsageDao; import com.cloud.usage.dao.UsageIPAddressDao; import com.cloud.user.AccountVO; import com.cloud.utils.Pair; -import com.cloud.utils.component.ComponentLocator; + public class IPAddressUsageParser { public static final Logger s_logger = Logger.getLogger(IPAddressUsageParser.class.getName()); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/56e5fbde/usage/src/com/cloud/usage/parser/LoadBalancerUsageParser.java ---------------------------------------------------------------------- diff --git a/usage/src/com/cloud/usage/parser/LoadBalancerUsageParser.java b/usage/src/com/cloud/usage/parser/LoadBalancerUsageParser.java index c1423c6..8763527 100644 --- a/usage/src/com/cloud/usage/parser/LoadBalancerUsageParser.java +++ b/usage/src/com/cloud/usage/parser/LoadBalancerUsageParser.java @@ -32,7 +32,7 @@ import com.cloud.usage.dao.UsageDao; import com.cloud.usage.dao.UsageLoadBalancerPolicyDao; import com.cloud.user.AccountVO; import com.cloud.utils.Pair; -import com.cloud.utils.component.ComponentLocator; + public class LoadBalancerUsageParser { public static final Logger s_logger = Logger.getLogger(LoadBalancerUsageParser.class.getName()); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/56e5fbde/usage/src/com/cloud/usage/parser/NetworkOfferingUsageParser.java ---------------------------------------------------------------------- diff --git a/usage/src/com/cloud/usage/parser/NetworkOfferingUsageParser.java b/usage/src/com/cloud/usage/parser/NetworkOfferingUsageParser.java index fc7fc2a..c2bf1c3 100644 --- a/usage/src/com/cloud/usage/parser/NetworkOfferingUsageParser.java +++ b/usage/src/com/cloud/usage/parser/NetworkOfferingUsageParser.java @@ -32,7 +32,7 @@ import com.cloud.usage.dao.UsageDao; import com.cloud.usage.dao.UsageNetworkOfferingDao; import com.cloud.user.AccountVO; import com.cloud.utils.Pair; -import com.cloud.utils.component.ComponentLocator; + public class NetworkOfferingUsageParser { public static final Logger s_logger = Logger.getLogger(NetworkOfferingUsageParser.class.getName()); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/56e5fbde/usage/src/com/cloud/usage/parser/NetworkUsageParser.java ---------------------------------------------------------------------- diff --git a/usage/src/com/cloud/usage/parser/NetworkUsageParser.java b/usage/src/com/cloud/usage/parser/NetworkUsageParser.java index acdbc48..c0ba15f 100644 --- a/usage/src/com/cloud/usage/parser/NetworkUsageParser.java +++ b/usage/src/com/cloud/usage/parser/NetworkUsageParser.java @@ -31,7 +31,7 @@ import com.cloud.usage.dao.UsageDao; import com.cloud.usage.dao.UsageNetworkDao; import com.cloud.user.AccountVO; import com.cloud.utils.Pair; -import com.cloud.utils.component.ComponentLocator; + import com.cloud.utils.db.SearchCriteria; public class NetworkUsageParser { http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/56e5fbde/usage/src/com/cloud/usage/parser/PortForwardingUsageParser.java ---------------------------------------------------------------------- diff --git a/usage/src/com/cloud/usage/parser/PortForwardingUsageParser.java b/usage/src/com/cloud/usage/parser/PortForwardingUsageParser.java index 469fb65..42cc74c 100644 --- a/usage/src/com/cloud/usage/parser/PortForwardingUsageParser.java +++ b/usage/src/com/cloud/usage/parser/PortForwardingUsageParser.java @@ -32,7 +32,7 @@ import com.cloud.usage.dao.UsageDao; import com.cloud.usage.dao.UsagePortForwardingRuleDao; import com.cloud.user.AccountVO; import com.cloud.utils.Pair; -import com.cloud.utils.component.ComponentLocator; + public class PortForwardingUsageParser { public static final Logger s_logger = Logger.getLogger(PortForwardingUsageParser.class.getName()); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/56e5fbde/usage/src/com/cloud/usage/parser/SecurityGroupUsageParser.java ---------------------------------------------------------------------- diff --git a/usage/src/com/cloud/usage/parser/SecurityGroupUsageParser.java b/usage/src/com/cloud/usage/parser/SecurityGroupUsageParser.java index 2832385..f175ae2 100644 --- a/usage/src/com/cloud/usage/parser/SecurityGroupUsageParser.java +++ b/usage/src/com/cloud/usage/parser/SecurityGroupUsageParser.java @@ -32,7 +32,7 @@ import com.cloud.usage.dao.UsageDao; import com.cloud.usage.dao.UsageSecurityGroupDao; import com.cloud.user.AccountVO; import com.cloud.utils.Pair; -import com.cloud.utils.component.ComponentLocator; + public class SecurityGroupUsageParser { public static final Logger s_logger = Logger.getLogger(SecurityGroupUsageParser.class.getName()); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/56e5fbde/usage/src/com/cloud/usage/parser/StorageUsageParser.java ---------------------------------------------------------------------- diff --git a/usage/src/com/cloud/usage/parser/StorageUsageParser.java b/usage/src/com/cloud/usage/parser/StorageUsageParser.java index 4d48e39..a0fee2d 100644 --- a/usage/src/com/cloud/usage/parser/StorageUsageParser.java +++ b/usage/src/com/cloud/usage/parser/StorageUsageParser.java @@ -33,7 +33,7 @@ import com.cloud.usage.dao.UsageDao; import com.cloud.usage.dao.UsageStorageDao; import com.cloud.user.AccountVO; import com.cloud.utils.Pair; -import com.cloud.utils.component.ComponentLocator; + public class StorageUsageParser { public static final Logger s_logger = Logger.getLogger(StorageUsageParser.class.getName()); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/56e5fbde/usage/src/com/cloud/usage/parser/VMInstanceUsageParser.java ---------------------------------------------------------------------- diff --git a/usage/src/com/cloud/usage/parser/VMInstanceUsageParser.java b/usage/src/com/cloud/usage/parser/VMInstanceUsageParser.java index 681e8ec..0680ec3 100644 --- a/usage/src/com/cloud/usage/parser/VMInstanceUsageParser.java +++ b/usage/src/com/cloud/usage/parser/VMInstanceUsageParser.java @@ -32,7 +32,7 @@ import com.cloud.usage.dao.UsageDao; import com.cloud.usage.dao.UsageVMInstanceDao; import com.cloud.user.AccountVO; import com.cloud.utils.Pair; -import com.cloud.utils.component.ComponentLocator; + public class VMInstanceUsageParser { public static final Logger s_logger = Logger.getLogger(VMInstanceUsageParser.class.getName()); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/56e5fbde/usage/src/com/cloud/usage/parser/VPNUserUsageParser.java ---------------------------------------------------------------------- diff --git a/usage/src/com/cloud/usage/parser/VPNUserUsageParser.java b/usage/src/com/cloud/usage/parser/VPNUserUsageParser.java index 089bf90..7a96e3c 100644 --- a/usage/src/com/cloud/usage/parser/VPNUserUsageParser.java +++ b/usage/src/com/cloud/usage/parser/VPNUserUsageParser.java @@ -32,7 +32,7 @@ import com.cloud.usage.dao.UsageDao; import com.cloud.usage.dao.UsageVPNUserDao; import com.cloud.user.AccountVO; import com.cloud.utils.Pair; -import com.cloud.utils.component.ComponentLocator; + public class VPNUserUsageParser { public static final Logger s_logger = Logger.getLogger(VPNUserUsageParser.class.getName()); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/56e5fbde/usage/src/com/cloud/usage/parser/VolumeUsageParser.java ---------------------------------------------------------------------- diff --git a/usage/src/com/cloud/usage/parser/VolumeUsageParser.java b/usage/src/com/cloud/usage/parser/VolumeUsageParser.java index db58f41..1eb7664 100644 --- a/usage/src/com/cloud/usage/parser/VolumeUsageParser.java +++ b/usage/src/com/cloud/usage/parser/VolumeUsageParser.java @@ -32,7 +32,7 @@ import com.cloud.usage.dao.UsageDao; import com.cloud.usage.dao.UsageVolumeDao; import com.cloud.user.AccountVO; import com.cloud.utils.Pair; -import com.cloud.utils.component.ComponentLocator; + public class VolumeUsageParser { public static final Logger s_logger = Logger.getLogger(VolumeUsageParser.class.getName()); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/56e5fbde/utils/test/com/cloud/utils/db/TransactionTest.java ---------------------------------------------------------------------- diff --git a/utils/test/com/cloud/utils/db/TransactionTest.java b/utils/test/com/cloud/utils/db/TransactionTest.java index 96d31b4..5bd1e9a 100644 --- a/utils/test/com/cloud/utils/db/TransactionTest.java +++ b/utils/test/com/cloud/utils/db/TransactionTest.java @@ -26,7 +26,7 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import com.cloud.utils.component.ComponentLocator; + import com.cloud.utils.exception.CloudRuntimeException; /** http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/56e5fbde/utils/test/com/cloud/utils/log/CglibThrowableRendererTest.java ---------------------------------------------------------------------- diff --git a/utils/test/com/cloud/utils/log/CglibThrowableRendererTest.java b/utils/test/com/cloud/utils/log/CglibThrowableRendererTest.java index 5a9501d..13e396d 100644 --- a/utils/test/com/cloud/utils/log/CglibThrowableRendererTest.java +++ b/utils/test/com/cloud/utils/log/CglibThrowableRendererTest.java @@ -20,7 +20,7 @@ import junit.framework.TestCase; import org.apache.log4j.Logger; -import com.cloud.utils.component.ComponentLocator; + import com.cloud.utils.db.DB; import com.cloud.utils.exception.CloudRuntimeException;