diff --git a/api/test/org/apache/cloudstack/api/command/test/AddClusterCmdTest.java b/api/test/org/apache/cloudstack/api/command/test/AddClusterCmdTest.java index 90759fe6702..0ec3d7aec79 100644 --- a/api/test/org/apache/cloudstack/api/command/test/AddClusterCmdTest.java +++ b/api/test/org/apache/cloudstack/api/command/test/AddClusterCmdTest.java @@ -16,25 +16,26 @@ // under the License. package org.apache.cloudstack.api.command.test; +import java.util.Arrays; + import junit.framework.Assert; import junit.framework.TestCase; -import org.apache.cloudstack.api.ResponseGenerator; -import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.command.admin.cluster.AddClusterCmd; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.Mockito; +import org.apache.cloudstack.api.ResponseGenerator; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.command.admin.cluster.AddClusterCmd; + import com.cloud.exception.DiscoveryException; import com.cloud.exception.ResourceInUseException; import com.cloud.org.Cluster; import com.cloud.resource.ResourceService; -import edu.emory.mathcs.backport.java.util.Arrays; - public class AddClusterCmdTest extends TestCase { private AddClusterCmd addClusterCmd; @@ -44,6 +45,7 @@ public class AddClusterCmdTest extends TestCase { @Rule public ExpectedException expectedException = ExpectedException.none(); + @Override @Before public void setUp() { /* @@ -110,8 +112,7 @@ public class AddClusterCmdTest extends TestCase { Cluster cluster = Mockito.mock(Cluster.class); Cluster[] clusterArray = new Cluster[] { cluster }; - Mockito.when(resourceService.discoverCluster(addClusterCmd)) - .thenReturn(Arrays.asList(clusterArray)); + Mockito.doReturn(Arrays.asList(clusterArray)).when(resourceService.discoverCluster(addClusterCmd)); addClusterCmd.execute(); diff --git a/api/test/org/apache/cloudstack/api/command/test/AddHostCmdTest.java b/api/test/org/apache/cloudstack/api/command/test/AddHostCmdTest.java index 531f51105e1..5ab6bb5bb1f 100644 --- a/api/test/org/apache/cloudstack/api/command/test/AddHostCmdTest.java +++ b/api/test/org/apache/cloudstack/api/command/test/AddHostCmdTest.java @@ -16,27 +16,28 @@ // under the License. package org.apache.cloudstack.api.command.test; +import java.util.Arrays; + import junit.framework.Assert; import junit.framework.TestCase; -import org.apache.cloudstack.api.ResponseGenerator; -import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.command.admin.host.AddHostCmd; -import org.apache.cloudstack.api.response.HostResponse; -import org.apache.cloudstack.api.response.ListResponse; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.Mockito; +import org.apache.cloudstack.api.ResponseGenerator; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.command.admin.host.AddHostCmd; +import org.apache.cloudstack.api.response.HostResponse; +import org.apache.cloudstack.api.response.ListResponse; + import com.cloud.exception.DiscoveryException; import com.cloud.exception.InvalidParameterValueException; import com.cloud.host.Host; import com.cloud.resource.ResourceService; -import edu.emory.mathcs.backport.java.util.Arrays; - public class AddHostCmdTest extends TestCase { private AddHostCmd addHostCmd; @@ -46,6 +47,7 @@ public class AddHostCmdTest extends TestCase { @Rule public ExpectedException expectedException = ExpectedException.none(); + @Override @Before public void setUp() { resourceService = Mockito.mock(ResourceService.class); @@ -125,14 +127,13 @@ public class AddHostCmdTest extends TestCase { HostResponse responseHost = new HostResponse(); responseHost.setName("Test"); - Mockito.when(resourceService.discoverHosts(addHostCmd)).thenReturn( - Arrays.asList(mockArray)); + Mockito.doReturn(Arrays.asList(mockArray)).when(resourceService.discoverHosts(addHostCmd)); Mockito.when(responseGenerator.createHostResponse(host)).thenReturn( responseHost); addHostCmd.execute(); Mockito.verify(responseGenerator).createHostResponse(host); - ListResponse actualResponse = ((ListResponse) addHostCmd - .getResponseObject()); + @SuppressWarnings("unchecked") + ListResponse actualResponse = ((ListResponse)addHostCmd.getResponseObject()); Assert.assertEquals(responseHost, actualResponse.getResponses().get(0)); Assert.assertEquals("addhostresponse", actualResponse.getResponseName()); @@ -144,8 +145,7 @@ public class AddHostCmdTest extends TestCase { addHostCmd._resourceService = resourceService; try { - Mockito.when(resourceService.discoverHosts(addHostCmd)).thenThrow( - DiscoveryException.class); + Mockito.when(resourceService.discoverHosts(addHostCmd)).thenThrow(DiscoveryException.class); } catch (InvalidParameterValueException e) { e.printStackTrace(); } catch (IllegalArgumentException e) { diff --git a/engine/schema/src/com/cloud/keystore/KeystoreDaoImpl.java b/engine/schema/src/com/cloud/keystore/KeystoreDaoImpl.java index 0ea97c783b9..f53f228e6b3 100644 --- a/engine/schema/src/com/cloud/keystore/KeystoreDaoImpl.java +++ b/engine/schema/src/com/cloud/keystore/KeystoreDaoImpl.java @@ -17,6 +17,7 @@ package com.cloud.keystore; import java.sql.PreparedStatement; +import java.util.Collections; import java.util.Comparator; import java.util.List; @@ -32,8 +33,6 @@ import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.Transaction; import com.cloud.utils.exception.CloudRuntimeException; -import edu.emory.mathcs.backport.java.util.Collections; - @Component @Local(value={KeystoreDao.class}) public class KeystoreDaoImpl extends GenericDaoBase implements KeystoreDao { @@ -54,7 +53,8 @@ public class KeystoreDaoImpl extends GenericDaoBase implements public List findCertChain() { SearchCriteria sc = CertChainSearch.create(); List ks = listBy(sc); - Collections.sort(ks, new Comparator() { public int compare(Object o1, Object o2) { + Collections.sort(ks, new Comparator() { @Override + public int compare(Object o1, Object o2) { Integer seq1 = ((KeystoreVO)o1).getIndex(); Integer seq2 = ((KeystoreVO)o2).getIndex(); return seq1.compareTo(seq2); @@ -99,7 +99,7 @@ public class KeystoreDaoImpl extends GenericDaoBase implements @Override @DB public void save(String alias, String certificate, Integer index, String domainSuffix) { - KeystoreVO ks = this.findByName(alias); + KeystoreVO ks = findByName(alias); if (ks != null) { ks.setCertificate(certificate); ks.setName(alias); @@ -112,7 +112,7 @@ public class KeystoreDaoImpl extends GenericDaoBase implements newks.setName(alias); newks.setIndex(index); newks.setDomainSuffix(domainSuffix); - this.persist(newks); + persist(newks); } } } diff --git a/engine/storage/src/org/apache/cloudstack/storage/datastore/DataStoreManagerImpl.java b/engine/storage/src/org/apache/cloudstack/storage/datastore/DataStoreManagerImpl.java index 00d08d719d3..a9263a98879 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/datastore/DataStoreManagerImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/datastore/DataStoreManagerImpl.java @@ -18,18 +18,21 @@ */ package org.apache.cloudstack.storage.datastore; -import com.cloud.storage.DataStoreRole; -import com.cloud.utils.exception.CloudRuntimeException; -import edu.emory.mathcs.backport.java.util.Collections; +import java.util.Collections; +import java.util.List; + +import javax.inject.Inject; + +import org.springframework.stereotype.Component; + import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; import org.apache.cloudstack.engine.subsystem.api.storage.Scope; import org.apache.cloudstack.engine.subsystem.api.storage.ZoneScope; import org.apache.cloudstack.storage.image.datastore.ImageStoreProviderManager; -import org.springframework.stereotype.Component; -import javax.inject.Inject; -import java.util.List; +import com.cloud.storage.DataStoreRole; +import com.cloud.utils.exception.CloudRuntimeException; @Component public class DataStoreManagerImpl implements DataStoreManager { diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/db/TemplateDataStoreDaoImpl.java b/engine/storage/src/org/apache/cloudstack/storage/image/db/TemplateDataStoreDaoImpl.java index 7388ca99ec1..5f47de86b95 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/image/db/TemplateDataStoreDaoImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/image/db/TemplateDataStoreDaoImpl.java @@ -17,6 +17,7 @@ package org.apache.cloudstack.storage.image.db; import java.util.ArrayList; +import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Map; @@ -24,6 +25,9 @@ import java.util.Map; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.engine.subsystem.api.storage.DataObjectInStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; @@ -32,20 +36,16 @@ import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreState import org.apache.cloudstack.engine.subsystem.api.storage.ZoneScope; import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao; import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.storage.DataStoreRole; import com.cloud.storage.VMTemplateStorageResourceAssoc.Status; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.SearchCriteria.Op; +import com.cloud.utils.db.Transaction; import com.cloud.utils.db.UpdateBuilder; -import edu.emory.mathcs.backport.java.util.Collections; - @Component public class TemplateDataStoreDaoImpl extends GenericDaoBase implements TemplateDataStoreDao { private static final Logger s_logger = Logger.getLogger(TemplateDataStoreDaoImpl.class); @@ -250,11 +250,11 @@ public class TemplateDataStoreDaoImpl extends GenericDaoBase listByTemplateZoneDownloadStatus(long templateId, Long zoneId, Status... status) { // get all elgible image stores - List imgStores = this._storeMgr.getImageStoresByScope(new ZoneScope(zoneId)); + List imgStores = _storeMgr.getImageStoresByScope(new ZoneScope(zoneId)); if (imgStores != null) { List result = new ArrayList(); for (DataStore store : imgStores) { - List sRes = this.listByTemplateStoreDownloadStatus(templateId, store.getId(), + List sRes = listByTemplateStoreDownloadStatus(templateId, store.getId(), status); if (sRes != null && sRes.size() > 0) { result.addAll(sRes); @@ -268,10 +268,10 @@ public class TemplateDataStoreDaoImpl extends GenericDaoBase imgStores = this._storeMgr.getImageStoresByScope(new ZoneScope(zoneId)); + List imgStores = _storeMgr.getImageStoresByScope(new ZoneScope(zoneId)); if (imgStores != null) { for (DataStore store : imgStores) { - List sRes = this.listByTemplateStoreDownloadStatus(templateId, store.getId(), + List sRes = listByTemplateStoreDownloadStatus(templateId, store.getId(), status); if (sRes != null && sRes.size() > 0) { Collections.shuffle(sRes); @@ -326,13 +326,13 @@ public class TemplateDataStoreDaoImpl extends GenericDaoBase imgStores = null; if (role == DataStoreRole.Image) { - imgStores = this._storeMgr.getImageStoresByScope(new ZoneScope(zoneId)); + imgStores = _storeMgr.getImageStoresByScope(new ZoneScope(zoneId)); } else if (role == DataStoreRole.ImageCache) { - imgStores = this._storeMgr.getImageCacheStores(new ZoneScope(zoneId)); + imgStores = _storeMgr.getImageCacheStores(new ZoneScope(zoneId)); } if (imgStores != null) { for (DataStore store : imgStores) { - List sRes = this.listByTemplateStore(templateId, store.getId()); + List sRes = listByTemplateStore(templateId, store.getId()); if (sRes != null && sRes.size() > 0) { return sRes.get(0); } diff --git a/framework/cluster/src/com/cloud/cluster/ClusterManagerImpl.java b/framework/cluster/src/com/cloud/cluster/ClusterManagerImpl.java index 41b619c1f74..24e30a20021 100644 --- a/framework/cluster/src/com/cloud/cluster/ClusterManagerImpl.java +++ b/framework/cluster/src/com/cloud/cluster/ClusterManagerImpl.java @@ -48,6 +48,7 @@ import org.apache.log4j.Logger; import org.apache.cloudstack.framework.config.ConfigDepot; import org.apache.cloudstack.framework.config.ConfigKey; import org.apache.cloudstack.framework.config.ConfigValue; +import org.apache.cloudstack.framework.config.Configurable; import org.apache.cloudstack.utils.identity.ManagementServerNode; import com.cloud.cluster.dao.ManagementServerHostDao; @@ -68,7 +69,7 @@ import com.cloud.utils.mgmt.JmxUtil; import com.cloud.utils.net.NetUtils; @Local(value = { ClusterManager.class }) -public class ClusterManagerImpl extends ManagerBase implements ClusterManager { +public class ClusterManagerImpl extends ManagerBase implements ClusterManager, Configurable { private static final Logger s_logger = Logger.getLogger(ClusterManagerImpl.class); private static final int EXECUTOR_SHUTDOWN_TIMEOUT = 1000; // 1 second @@ -1111,6 +1112,16 @@ public class ClusterManagerImpl extends ManagerBase implements ClusterManager { return pingManagementNode(mshost); } + @Override + public String getConfigComponentName() { + return ClusterManager.class.getSimpleName(); + } + + @Override + public ConfigKey[] getConfigKeys() { + return new ConfigKey[] {HeartBeatInterval, HeartBeatThreshold}; + } + private boolean pingManagementNode(ManagementServerHostVO mshost) { String targetIp = mshost.getServiceIP(); diff --git a/framework/db/pom.xml b/framework/db/pom.xml index 77f618d1f09..5af00a00747 100644 --- a/framework/db/pom.xml +++ b/framework/db/pom.xml @@ -25,7 +25,7 @@ net.sf.ehcache - ehcache + ehcache-core org.eclipse.persistence diff --git a/framework/db/src/com/cloud/utils/db/GenericDaoBase.java b/framework/db/src/com/cloud/utils/db/GenericDaoBase.java index f593c38a27b..94e53748ab8 100755 --- a/framework/db/src/com/cloud/utils/db/GenericDaoBase.java +++ b/framework/db/src/com/cloud/utils/db/GenericDaoBase.java @@ -32,8 +32,10 @@ import java.sql.ResultSetMetaData; import java.sql.SQLException; import java.sql.Statement; import java.util.ArrayList; +import java.util.Arrays; import java.util.Calendar; import java.util.Collection; +import java.util.Collections; import java.util.Date; import java.util.Enumeration; import java.util.HashMap; @@ -77,9 +79,6 @@ import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.net.Ip; import com.cloud.utils.net.NetUtils; -import edu.emory.mathcs.backport.java.util.Arrays; -import edu.emory.mathcs.backport.java.util.Collections; - /** * GenericDaoBase is a simple way to implement DAOs. It DOES NOT * support the full EJB3 spec. It borrows some of the annotations from @@ -1266,6 +1265,7 @@ public abstract class GenericDaoBase extends Compone return update(ub, sc, rows); } + @Override @DB(txn=false) public int update(final T entity, final SearchCriteria sc) { final UpdateBuilder ub = getUpdateBuilder(entity); diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java index 04fef270e0d..38377ee9202 100644 --- a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java +++ b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java @@ -20,6 +20,7 @@ package org.apache.cloudstack.framework.jobs.impl; import java.io.File; import java.io.FileInputStream; import java.util.Arrays; +import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Map; @@ -76,8 +77,6 @@ import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.exception.ExceptionUtil; import com.cloud.utils.mgmt.JmxUtil; -import edu.emory.mathcs.backport.java.util.Collections; - public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager, ClusterManagerListener, Configurable { // Advanced private static final ConfigKey JobExpireMinutes = new ConfigKey(Long.class, "job.expire.minutes", "Advanced", "1440", @@ -116,7 +115,7 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager, @Override public String getConfigComponentName() { - return AsyncJobManager.class.getName(); + return AsyncJobManager.class.getSimpleName(); } @Override diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java index d46048eb270..a814530b2f7 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java @@ -5,33 +5,35 @@ // 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. -// +// // Automatically generated by addcopyright.py at 01/29/2013 // Apache License, Version 2.0 (the "License"); you may not use this // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// +// // Automatically generated by addcopyright.py at 04/03/2012 package com.cloud.baremetal.networkservice; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.TimeUnit; import javax.ejb.Local; import javax.naming.ConfigurationException; -import org.apache.cloudstack.api.ApiConstants; import org.apache.log4j.Logger; +import org.apache.cloudstack.api.ApiConstants; + import com.cloud.agent.IAgentControl; import com.cloud.agent.api.Answer; import com.cloud.agent.api.CheckNetworkAnswer; @@ -66,7 +68,6 @@ import com.cloud.baremetal.manager.BaremetalManager; import com.cloud.host.Host.Type; import com.cloud.hypervisor.Hypervisor; import com.cloud.resource.ServerResource; -import com.cloud.server.ManagementServer; import com.cloud.utils.component.ComponentContext; import com.cloud.utils.component.ManagerBase; import com.cloud.utils.exception.CloudRuntimeException; @@ -79,8 +80,6 @@ import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachine.State; import com.cloud.vm.dao.VMInstanceDao; -import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit; - @Local(value = ServerResource.class) public class BareMetalResourceBase extends ManagerBase implements ServerResource { private static final Logger s_logger = Logger.getLogger(BareMetalResourceBase.class); @@ -134,8 +133,8 @@ public class BareMetalResourceBase extends ManagerBase implements ServerResource _cpuNum = Long.parseLong((String) params.get(ApiConstants.CPU_NUMBER)); } catch (NumberFormatException e) { throw new ConfigurationException(String.format("Unable to parse number of CPU or memory capacity " - + "or cpu capacity(cpu number = %1$s memCapacity=%2$s, cpuCapacity=%3$s", (String) params.get(ApiConstants.CPU_NUMBER), - (String) params.get(ApiConstants.MEMORY), (String) params.get(ApiConstants.CPU_SPEED))); + + "or cpu capacity(cpu number = %1$s memCapacity=%2$s, cpuCapacity=%3$s", params.get(ApiConstants.CPU_NUMBER), + params.get(ApiConstants.MEMORY), params.get(ApiConstants.CPU_SPEED))); } _zone = (String) params.get("zone"); diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterVO.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterVO.java index a13e59e5cb4..4a2c4e9cd91 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterVO.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterVO.java @@ -46,7 +46,7 @@ public class VmwareDatacenterVO implements VmwareDatacenter { private String guid; @Column(name = "name") - private String name; + private String vmwareDatacenterName; @Column(name = "vcenter_host") private String vCenterHost; @@ -73,7 +73,7 @@ public class VmwareDatacenterVO implements VmwareDatacenter { @Override public String getVmwareDatacenterName() { - return name; + return vmwareDatacenterName; } @Override @@ -105,7 +105,7 @@ public class VmwareDatacenterVO implements VmwareDatacenter { } public void setVmwareDatacenterName(String name) { - this.name = name; + this.vmwareDatacenterName = name; } public void setVcenterHost(String vCenterHost) { @@ -141,7 +141,7 @@ public class VmwareDatacenterVO implements VmwareDatacenter { public VmwareDatacenterVO(String guid, String name, String vCenterHost, String user, String password) { this.uuid = UUID.randomUUID().toString(); - this.name = name; + this.vmwareDatacenterName = name; this.guid = guid; this.vCenterHost = vCenterHost; this.user = user; diff --git a/plugins/network-elements/nicira-nvp/test/com/cloud/network/guru/NiciraNvpGuestNetworkGuruTest.java b/plugins/network-elements/nicira-nvp/test/com/cloud/network/guru/NiciraNvpGuestNetworkGuruTest.java index 0e4f8fd4f84..5c686c9c3ee 100644 --- a/plugins/network-elements/nicira-nvp/test/com/cloud/network/guru/NiciraNvpGuestNetworkGuruTest.java +++ b/plugins/network-elements/nicira-nvp/test/com/cloud/network/guru/NiciraNvpGuestNetworkGuruTest.java @@ -59,7 +59,7 @@ import com.cloud.offerings.dao.NetworkOfferingServiceMapDao; import com.cloud.user.Account; import com.cloud.vm.ReservationContext; -import edu.emory.mathcs.backport.java.util.Arrays; +import java.util.Arrays; public class NiciraNvpGuestNetworkGuruTest { PhysicalNetworkDao physnetdao = mock (PhysicalNetworkDao.class); diff --git a/pom.xml b/pom.xml index 404c82e834f..3772735b681 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ 2.0.0 1.9.0 build213-svnkit-1.3-patch - 1.5.0 + 2.6.6 1.7.1 14.0-rc1 5.6.100-1-SNAPSHOT @@ -211,7 +211,7 @@ net.sf.ehcache - ehcache + ehcache-core ${cs.ehcache.version} diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java b/server/src/com/cloud/agent/manager/AgentManagerImpl.java index f78cff4bd7e..05c1908ddd3 100755 --- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java +++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java @@ -1579,7 +1579,7 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl @Override public String getConfigComponentName() { - return AgentManager.class.getName(); + return AgentManager.class.getSimpleName(); } @Override diff --git a/server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java b/server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java index 5cbed3f6977..f4ed90e5b71 100755 --- a/server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java +++ b/server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java @@ -23,6 +23,7 @@ import java.net.UnknownHostException; import java.nio.ByteBuffer; import java.nio.channels.SocketChannel; import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.HashMap; import java.util.HashSet; @@ -45,8 +46,6 @@ import javax.net.ssl.SSLEngine; import org.apache.log4j.Logger; -import edu.emory.mathcs.backport.java.util.Arrays; - import com.google.gson.Gson; import org.apache.cloudstack.framework.config.ConfigDepot; @@ -1410,8 +1409,9 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust @Override public ConfigKey[] getConfigKeys() { ConfigKey[] keys = super.getConfigKeys(); - @SuppressWarnings("unchecked") - List> keysLst = Arrays.asList(keys); + + List> keysLst = new ArrayList>(); + keysLst.addAll(Arrays.asList(keys)); keysLst.add(EnableLB); keysLst.add(ConnectedAgentThreshold); keysLst.add(LoadSize); diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index 2078cf7c6a8..a6fc38325fc 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -202,7 +202,7 @@ import com.cloud.vm.dao.NicIpAliasDao; import com.cloud.vm.dao.NicIpAliasVO; import com.cloud.vm.dao.NicSecondaryIpDao; -import edu.emory.mathcs.backport.java.util.Arrays; +import java.util.Arrays; @Local(value = { ConfigurationManager.class, ConfigurationService.class }) public class ConfigurationManagerImpl extends ManagerBase implements ConfigurationManager, ConfigurationService { diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyBalanceAllocator.java b/server/src/com/cloud/consoleproxy/ConsoleProxyBalanceAllocator.java index 89a5f39fafd..97bc486e475 100644 --- a/server/src/com/cloud/consoleproxy/ConsoleProxyBalanceAllocator.java +++ b/server/src/com/cloud/consoleproxy/ConsoleProxyBalanceAllocator.java @@ -17,6 +17,7 @@ package com.cloud.consoleproxy; import java.util.ArrayList; +import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Map; @@ -28,8 +29,6 @@ import javax.naming.ConfigurationException; import com.cloud.utils.component.AdapterBase; import com.cloud.vm.ConsoleProxy; -import edu.emory.mathcs.backport.java.util.Collections; - @Local(value={ConsoleProxyAllocator.class}) public class ConsoleProxyBalanceAllocator extends AdapterBase implements ConsoleProxyAllocator { diff --git a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java index 00eb54c506a..50ece8958b9 100755 --- a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java +++ b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java @@ -18,6 +18,7 @@ package com.cloud.network.security; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.Comparator; import java.util.Date; import java.util.HashMap; @@ -37,17 +38,18 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.commons.codec.digest.DigestUtils; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.command.user.securitygroup.AuthorizeSecurityGroupEgressCmd; import org.apache.cloudstack.api.command.user.securitygroup.AuthorizeSecurityGroupIngressCmd; import org.apache.cloudstack.api.command.user.securitygroup.CreateSecurityGroupCmd; import org.apache.cloudstack.api.command.user.securitygroup.DeleteSecurityGroupCmd; import org.apache.cloudstack.api.command.user.securitygroup.RevokeSecurityGroupEgressCmd; import org.apache.cloudstack.api.command.user.securitygroup.RevokeSecurityGroupIngressCmd; - -import org.apache.commons.codec.digest.DigestUtils; -import org.apache.log4j.Logger; - -import com.amazonaws.services.identitymanagement.model.User; +import org.apache.cloudstack.context.CallContext; +import org.apache.cloudstack.framework.config.dao.ConfigurationDao; +import org.apache.cloudstack.utils.identity.ManagementServerNode; import com.cloud.agent.AgentManager; import com.cloud.agent.api.NetworkRulesSystemVmCommand; @@ -62,14 +64,23 @@ import com.cloud.domain.dao.DomainDao; import com.cloud.event.ActionEvent; import com.cloud.event.EventTypes; import com.cloud.event.UsageEventUtils; -import com.cloud.exception.*; +import com.cloud.exception.AgentUnavailableException; +import com.cloud.exception.InvalidParameterValueException; +import com.cloud.exception.OperationTimedoutException; +import com.cloud.exception.PermissionDeniedException; +import com.cloud.exception.ResourceInUseException; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.network.Network; import com.cloud.network.NetworkManager; import com.cloud.network.NetworkModel; import com.cloud.network.security.SecurityGroupWork.Step; import com.cloud.network.security.SecurityRule.SecurityRuleType; -import com.cloud.network.security.dao.*; +import com.cloud.network.security.dao.SecurityGroupDao; +import com.cloud.network.security.dao.SecurityGroupRuleDao; +import com.cloud.network.security.dao.SecurityGroupRulesDao; +import com.cloud.network.security.dao.SecurityGroupVMMapDao; +import com.cloud.network.security.dao.SecurityGroupWorkDao; +import com.cloud.network.security.dao.VmRulesetLogDao; import com.cloud.projects.ProjectManager; import com.cloud.tags.dao.ResourceTagDao; import com.cloud.user.Account; @@ -79,7 +90,6 @@ import com.cloud.user.dao.AccountDao; import com.cloud.uservm.UserVm; import com.cloud.utils.NumbersUtil; import com.cloud.utils.Pair; -import com.cloud.utils.component.Manager; import com.cloud.utils.component.ManagerBase; import com.cloud.utils.concurrency.NamedThreadFactory; import com.cloud.utils.db.DB; @@ -89,23 +99,21 @@ import com.cloud.utils.db.Transaction; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.fsm.StateListener; import com.cloud.utils.net.NetUtils; -import com.cloud.vm.*; +import com.cloud.vm.Nic; +import com.cloud.vm.NicProfile; +import com.cloud.vm.NicVO; +import com.cloud.vm.UserVmManager; +import com.cloud.vm.UserVmVO; +import com.cloud.vm.VMInstanceVO; +import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachine.Event; import com.cloud.vm.VirtualMachine.State; +import com.cloud.vm.VirtualMachineManager; import com.cloud.vm.dao.NicDao; import com.cloud.vm.dao.NicSecondaryIpDao; import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.VMInstanceDao; -import edu.emory.mathcs.backport.java.util.Collections; - -import org.apache.cloudstack.api.command.user.securitygroup.*; -import org.apache.cloudstack.context.CallContext; -import org.apache.cloudstack.framework.config.dao.ConfigurationDao; -import org.apache.cloudstack.utils.identity.ManagementServerNode; - -import java.util.*; - @Local(value = { SecurityGroupManager.class, SecurityGroupService.class }) public class SecurityGroupManagerImpl extends ManagerBase implements SecurityGroupManager, SecurityGroupService, StateListener { public static final Logger s_logger = Logger.getLogger(SecurityGroupManagerImpl.class); diff --git a/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java b/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java index e998b738467..376e943393b 100755 --- a/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java +++ b/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java @@ -100,7 +100,7 @@ import com.cloud.vm.VirtualMachine.State; import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.VMInstanceDao; -import edu.emory.mathcs.backport.java.util.Arrays; +import java.util.Arrays; @Component @Local(value = { ResourceLimitService.class }) diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java index bc9b23df268..b3ead6381fe 100755 --- a/server/src/com/cloud/server/ConfigurationServerImpl.java +++ b/server/src/com/cloud/server/ConfigurationServerImpl.java @@ -302,6 +302,8 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio // Update the cloud identifier updateCloudIdentifier(); + _configDepotAdmin.populateConfigurations(); + // We should not update seed data UUID column here since this will be invoked in upgrade case as well. //updateUuids(); // Set init to true diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index f78ffa2f142..67496de3e4b 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -22,8 +22,10 @@ import java.net.URLDecoder; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; import java.util.ArrayList; +import java.util.Arrays; import java.util.Calendar; import java.util.Collection; +import java.util.Collections; import java.util.Comparator; import java.util.Date; import java.util.HashMap; @@ -584,9 +586,6 @@ import com.cloud.vm.dao.SecondaryStorageVmDao; import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.VMInstanceDao; -import edu.emory.mathcs.backport.java.util.Arrays; -import edu.emory.mathcs.backport.java.util.Collections; - public class ManagementServerImpl extends ManagerBase implements ManagementServer { public static final Logger s_logger = Logger.getLogger(ManagementServerImpl.class.getName()); diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/ClusterMO.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/ClusterMO.java index 04ef0f8c47b..7be7784ca12 100755 --- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/ClusterMO.java +++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/ClusterMO.java @@ -51,7 +51,7 @@ import com.cloud.hypervisor.vmware.util.VmwareContext; import com.cloud.utils.Pair; import com.cloud.utils.exception.CloudRuntimeException; -import edu.emory.mathcs.backport.java.util.Arrays; +import java.util.Arrays; // // interface. This has changed as ClusterMO no longer works as a special host anymore. Need to refactor accordingly diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/DatacenterMO.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/DatacenterMO.java index cabb60abc5d..1844b6ad37a 100755 --- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/DatacenterMO.java +++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/DatacenterMO.java @@ -34,7 +34,7 @@ import com.vmware.vim25.PropertySpec; import com.vmware.vim25.SelectionSpec; import com.vmware.vim25.TraversalSpec; import com.vmware.vim25.VirtualEthernetCardDistributedVirtualPortBackingInfo; -import edu.emory.mathcs.backport.java.util.Arrays; +import java.util.Arrays; public class DatacenterMO extends BaseMO { diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HostMO.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HostMO.java index 2735fb03f77..e8bdec2685f 100755 --- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HostMO.java +++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HostMO.java @@ -60,7 +60,7 @@ import com.vmware.vim25.VirtualMachineConfigSpec; import com.vmware.vim25.VirtualNicManagerNetConfig; import com.vmware.vim25.NasDatastoreInfo; -import edu.emory.mathcs.backport.java.util.Arrays; +import java.util.Arrays; public class HostMO extends BaseMO implements VmwareHypervisorHost { private static final Logger s_logger = Logger.getLogger(HostMO.class); diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/PerfManagerMO.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/PerfManagerMO.java index bb4fb56ebbc..35aa78c3c9f 100644 --- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/PerfManagerMO.java +++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/PerfManagerMO.java @@ -34,7 +34,7 @@ import com.vmware.vim25.PerfMetricId; import com.vmware.vim25.PerfProviderSummary; import com.vmware.vim25.PerfQuerySpec; -import edu.emory.mathcs.backport.java.util.Arrays; +import java.util.Arrays; public class PerfManagerMO extends BaseMO { public PerfManagerMO(VmwareContext context, ManagedObjectReference mor) { diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java index e2dd789d23c..7d77a8d0125 100644 --- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java +++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java @@ -100,7 +100,7 @@ import com.cloud.utils.Pair; import com.cloud.utils.Ternary; import com.cloud.utils.script.Script; -import edu.emory.mathcs.backport.java.util.Arrays; +import java.util.Arrays; public class VirtualMachineMO extends BaseMO { private static final Logger s_logger = Logger.getLogger(VirtualMachineMO.class);