diff --git a/api/src/com/cloud/vm/PluggableNics.java b/api/src/com/cloud/vm/PluggableNics.java deleted file mode 100644 index 3b6c34970f2..00000000000 --- a/api/src/com/cloud/vm/PluggableNics.java +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2012 Citrix Systems, Inc. Licensed under the -// Apache License, Version 2.0 (the "License"); you may not use this -// file except in compliance with the License. Citrix Systems, Inc. -// reserves all rights not expressly granted by 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 04/03/2012 -package com.cloud.vm; - -/** - * @author Alena Prokharchyk - */ -public interface PluggableNics { - boolean canPlugNics(); -} diff --git a/awsapi.log.2012-07-25.gz b/awsapi.log.2012-07-25.gz deleted file mode 100644 index 02fd067aac2..00000000000 Binary files a/awsapi.log.2012-07-25.gz and /dev/null differ diff --git a/server/src/com/cloud/configuration/DefaultComponentLibrary.java b/server/src/com/cloud/configuration/DefaultComponentLibrary.java index 8377460ae07..0e78bcbe9c2 100755 --- a/server/src/com/cloud/configuration/DefaultComponentLibrary.java +++ b/server/src/com/cloud/configuration/DefaultComponentLibrary.java @@ -134,12 +134,12 @@ import com.cloud.network.security.dao.SecurityGroupWorkDaoImpl; import com.cloud.network.security.dao.VmRulesetLogDaoImpl; import com.cloud.network.vpc.NetworkACLManagerImpl; import com.cloud.network.vpc.VpcManagerImpl; -import com.cloud.network.vpc.Dao.PrivateIpDaoImpl; -import com.cloud.network.vpc.Dao.StaticRouteDaoImpl; -import com.cloud.network.vpc.Dao.VpcDaoImpl; -import com.cloud.network.vpc.Dao.VpcGatewayDaoImpl; -import com.cloud.network.vpc.Dao.VpcOfferingDaoImpl; -import com.cloud.network.vpc.Dao.VpcOfferingServiceMapDaoImpl; +import com.cloud.network.vpc.dao.PrivateIpDaoImpl; +import com.cloud.network.vpc.dao.StaticRouteDaoImpl; +import com.cloud.network.vpc.dao.VpcDaoImpl; +import com.cloud.network.vpc.dao.VpcGatewayDaoImpl; +import com.cloud.network.vpc.dao.VpcOfferingDaoImpl; +import com.cloud.network.vpc.dao.VpcOfferingServiceMapDaoImpl; import com.cloud.network.vpn.RemoteAccessVpnManagerImpl; import com.cloud.network.vpn.Site2SiteVpnManagerImpl; import com.cloud.offerings.dao.NetworkOfferingDaoImpl; diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index 9d072b1f39c..b82752bac68 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -156,7 +156,7 @@ import com.cloud.network.rules.dao.PortForwardingRulesDao; import com.cloud.network.vpc.NetworkACLManager; import com.cloud.network.vpc.PrivateIpVO; import com.cloud.network.vpc.VpcManager; -import com.cloud.network.vpc.Dao.PrivateIpDao; +import com.cloud.network.vpc.dao.PrivateIpDao; import com.cloud.network.vpn.RemoteAccessVpnService; import com.cloud.offering.NetworkOffering; import com.cloud.offering.NetworkOffering.Availability; diff --git a/server/src/com/cloud/network/RouterNetworkDaoImpl.java b/server/src/com/cloud/network/dao/RouterNetworkDaoImpl.java similarity index 97% rename from server/src/com/cloud/network/RouterNetworkDaoImpl.java rename to server/src/com/cloud/network/dao/RouterNetworkDaoImpl.java index dcb6583a313..fc51b8418a3 100644 --- a/server/src/com/cloud/network/RouterNetworkDaoImpl.java +++ b/server/src/com/cloud/network/dao/RouterNetworkDaoImpl.java @@ -10,10 +10,11 @@ // limitations under the License. // // Automatically generated by addcopyright.py at 04/03/2012 -package com.cloud.network; +package com.cloud.network.dao; import java.util.List; +import com.cloud.network.RouterNetworkVO; import com.cloud.utils.db.GenericDao; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.GenericSearchBuilder; diff --git a/server/src/com/cloud/network/guru/PrivateNetworkGuru.java b/server/src/com/cloud/network/guru/PrivateNetworkGuru.java index 5cfb6803038..2ef73574805 100644 --- a/server/src/com/cloud/network/guru/PrivateNetworkGuru.java +++ b/server/src/com/cloud/network/guru/PrivateNetworkGuru.java @@ -37,7 +37,7 @@ import com.cloud.network.Networks.Mode; import com.cloud.network.Networks.TrafficType; import com.cloud.network.vpc.PrivateIpAddress; import com.cloud.network.vpc.PrivateIpVO; -import com.cloud.network.vpc.Dao.PrivateIpDao; +import com.cloud.network.vpc.dao.PrivateIpDao; import com.cloud.offering.NetworkOffering; import com.cloud.user.Account; import com.cloud.utils.component.AdapterBase; diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java index 00c2486d29d..db118c54d5e 100644 --- a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java @@ -97,10 +97,10 @@ import com.cloud.network.vpc.Vpc; import com.cloud.network.vpc.VpcGateway; import com.cloud.network.vpc.VpcManager; import com.cloud.network.vpc.VpcVO; -import com.cloud.network.vpc.Dao.PrivateIpDao; -import com.cloud.network.vpc.Dao.StaticRouteDao; -import com.cloud.network.vpc.Dao.VpcDao; -import com.cloud.network.vpc.Dao.VpcOfferingDao; +import com.cloud.network.vpc.dao.PrivateIpDao; +import com.cloud.network.vpc.dao.StaticRouteDao; +import com.cloud.network.vpc.dao.VpcDao; +import com.cloud.network.vpc.dao.VpcOfferingDao; import com.cloud.network.vpn.Site2SiteVpnManager; import com.cloud.offerings.NetworkOfferingVO; import com.cloud.user.Account; diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java index 45a82b0f756..dabe70a7675 100644 --- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java +++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java @@ -68,12 +68,12 @@ import com.cloud.network.dao.NetworkDao; import com.cloud.network.dao.PhysicalNetworkDao; import com.cloud.network.element.VpcProvider; import com.cloud.network.vpc.VpcOffering.State; -import com.cloud.network.vpc.Dao.PrivateIpDao; -import com.cloud.network.vpc.Dao.StaticRouteDao; -import com.cloud.network.vpc.Dao.VpcDao; -import com.cloud.network.vpc.Dao.VpcGatewayDao; -import com.cloud.network.vpc.Dao.VpcOfferingDao; -import com.cloud.network.vpc.Dao.VpcOfferingServiceMapDao; +import com.cloud.network.vpc.dao.PrivateIpDao; +import com.cloud.network.vpc.dao.StaticRouteDao; +import com.cloud.network.vpc.dao.VpcDao; +import com.cloud.network.vpc.dao.VpcGatewayDao; +import com.cloud.network.vpc.dao.VpcOfferingDao; +import com.cloud.network.vpc.dao.VpcOfferingServiceMapDao; import com.cloud.network.vpn.Site2SiteVpnManager; import com.cloud.offering.NetworkOffering; import com.cloud.offerings.NetworkOfferingServiceMapVO; diff --git a/server/src/com/cloud/network/vpc/Dao/PrivateIpDao.java b/server/src/com/cloud/network/vpc/dao/PrivateIpDao.java similarity index 98% rename from server/src/com/cloud/network/vpc/Dao/PrivateIpDao.java rename to server/src/com/cloud/network/vpc/dao/PrivateIpDao.java index 339e566b417..d5dd4fb77ea 100644 --- a/server/src/com/cloud/network/vpc/Dao/PrivateIpDao.java +++ b/server/src/com/cloud/network/vpc/dao/PrivateIpDao.java @@ -10,7 +10,8 @@ // limitations under the License. // // Automatically generated by addcopyright.py at 04/03/2012 -package com.cloud.network.vpc.Dao; +package com.cloud.network.vpc.dao; + import java.util.List; diff --git a/server/src/com/cloud/network/vpc/Dao/PrivateIpDaoImpl.java b/server/src/com/cloud/network/vpc/dao/PrivateIpDaoImpl.java similarity index 99% rename from server/src/com/cloud/network/vpc/Dao/PrivateIpDaoImpl.java rename to server/src/com/cloud/network/vpc/dao/PrivateIpDaoImpl.java index 22f3f62a39d..4b7bc4eddf7 100644 --- a/server/src/com/cloud/network/vpc/Dao/PrivateIpDaoImpl.java +++ b/server/src/com/cloud/network/vpc/dao/PrivateIpDaoImpl.java @@ -10,7 +10,8 @@ // limitations under the License. // // Automatically generated by addcopyright.py at 04/03/2012 -package com.cloud.network.vpc.Dao; +package com.cloud.network.vpc.dao; + import java.util.Date; import java.util.List; diff --git a/server/src/com/cloud/network/vpc/Dao/StaticRouteDao.java b/server/src/com/cloud/network/vpc/dao/StaticRouteDao.java similarity index 97% rename from server/src/com/cloud/network/vpc/Dao/StaticRouteDao.java rename to server/src/com/cloud/network/vpc/dao/StaticRouteDao.java index a9515e8baab..165c8d9b977 100644 --- a/server/src/com/cloud/network/vpc/Dao/StaticRouteDao.java +++ b/server/src/com/cloud/network/vpc/dao/StaticRouteDao.java @@ -10,7 +10,8 @@ // limitations under the License. // // Automatically generated by addcopyright.py at 04/03/2012 -package com.cloud.network.vpc.Dao; +package com.cloud.network.vpc.dao; + import java.util.List; diff --git a/server/src/com/cloud/network/vpc/Dao/StaticRouteDaoImpl.java b/server/src/com/cloud/network/vpc/dao/StaticRouteDaoImpl.java similarity index 99% rename from server/src/com/cloud/network/vpc/Dao/StaticRouteDaoImpl.java rename to server/src/com/cloud/network/vpc/dao/StaticRouteDaoImpl.java index acb97c94198..09fb2756288 100644 --- a/server/src/com/cloud/network/vpc/Dao/StaticRouteDaoImpl.java +++ b/server/src/com/cloud/network/vpc/dao/StaticRouteDaoImpl.java @@ -10,7 +10,8 @@ // limitations under the License. // // Automatically generated by addcopyright.py at 04/03/2012 -package com.cloud.network.vpc.Dao; +package com.cloud.network.vpc.dao; + import java.util.List; diff --git a/server/src/com/cloud/network/vpc/Dao/VpcDao.java b/server/src/com/cloud/network/vpc/dao/VpcDao.java similarity index 97% rename from server/src/com/cloud/network/vpc/Dao/VpcDao.java rename to server/src/com/cloud/network/vpc/dao/VpcDao.java index fdc6d79fa49..19dbf35c475 100644 --- a/server/src/com/cloud/network/vpc/Dao/VpcDao.java +++ b/server/src/com/cloud/network/vpc/dao/VpcDao.java @@ -10,7 +10,7 @@ // limitations under the License. // // Automatically generated by addcopyright.py at 04/03/2012 -package com.cloud.network.vpc.Dao; +package com.cloud.network.vpc.dao; import java.util.List; diff --git a/server/src/com/cloud/network/vpc/Dao/VpcDaoImpl.java b/server/src/com/cloud/network/vpc/dao/VpcDaoImpl.java similarity index 99% rename from server/src/com/cloud/network/vpc/Dao/VpcDaoImpl.java rename to server/src/com/cloud/network/vpc/dao/VpcDaoImpl.java index cc815548289..fa80c0858ed 100644 --- a/server/src/com/cloud/network/vpc/Dao/VpcDaoImpl.java +++ b/server/src/com/cloud/network/vpc/dao/VpcDaoImpl.java @@ -10,7 +10,8 @@ // limitations under the License. // // Automatically generated by addcopyright.py at 04/03/2012 -package com.cloud.network.vpc.Dao; +package com.cloud.network.vpc.dao; + import java.util.List; diff --git a/server/src/com/cloud/network/vpc/Dao/VpcGatewayDao.java b/server/src/com/cloud/network/vpc/dao/VpcGatewayDao.java similarity index 96% rename from server/src/com/cloud/network/vpc/Dao/VpcGatewayDao.java rename to server/src/com/cloud/network/vpc/dao/VpcGatewayDao.java index f1b3791f3fe..9c7895432aa 100644 --- a/server/src/com/cloud/network/vpc/Dao/VpcGatewayDao.java +++ b/server/src/com/cloud/network/vpc/dao/VpcGatewayDao.java @@ -10,7 +10,8 @@ // limitations under the License. // // Automatically generated by addcopyright.py at 04/03/2012 -package com.cloud.network.vpc.Dao; +package com.cloud.network.vpc.dao; + import com.cloud.network.vpc.VpcGatewayVO; import com.cloud.utils.db.GenericDao; diff --git a/server/src/com/cloud/network/vpc/Dao/VpcGatewayDaoImpl.java b/server/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java similarity index 98% rename from server/src/com/cloud/network/vpc/Dao/VpcGatewayDaoImpl.java rename to server/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java index 23fabd40ea6..b854cd2b881 100644 --- a/server/src/com/cloud/network/vpc/Dao/VpcGatewayDaoImpl.java +++ b/server/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java @@ -10,7 +10,8 @@ // limitations under the License. // // Automatically generated by addcopyright.py at 04/03/2012 -package com.cloud.network.vpc.Dao; +package com.cloud.network.vpc.dao; + import javax.ejb.Local; diff --git a/server/src/com/cloud/network/vpc/Dao/VpcOfferingDao.java b/server/src/com/cloud/network/vpc/dao/VpcOfferingDao.java similarity index 96% rename from server/src/com/cloud/network/vpc/Dao/VpcOfferingDao.java rename to server/src/com/cloud/network/vpc/dao/VpcOfferingDao.java index b5c8b47933d..cd7258f2275 100644 --- a/server/src/com/cloud/network/vpc/Dao/VpcOfferingDao.java +++ b/server/src/com/cloud/network/vpc/dao/VpcOfferingDao.java @@ -10,7 +10,8 @@ // limitations under the License. // // Automatically generated by addcopyright.py at 04/03/2012 -package com.cloud.network.vpc.Dao; +package com.cloud.network.vpc.dao; + import com.cloud.network.vpc.VpcOfferingVO; import com.cloud.utils.db.GenericDao; diff --git a/server/src/com/cloud/network/vpc/Dao/VpcOfferingDaoImpl.java b/server/src/com/cloud/network/vpc/dao/VpcOfferingDaoImpl.java similarity index 98% rename from server/src/com/cloud/network/vpc/Dao/VpcOfferingDaoImpl.java rename to server/src/com/cloud/network/vpc/dao/VpcOfferingDaoImpl.java index ac6ebe7fbfb..c00c51cf2c9 100644 --- a/server/src/com/cloud/network/vpc/Dao/VpcOfferingDaoImpl.java +++ b/server/src/com/cloud/network/vpc/dao/VpcOfferingDaoImpl.java @@ -10,7 +10,8 @@ // limitations under the License. // // Automatically generated by addcopyright.py at 04/03/2012 -package com.cloud.network.vpc.Dao; +package com.cloud.network.vpc.dao; + import javax.ejb.Local; diff --git a/server/src/com/cloud/network/vpc/Dao/VpcOfferingServiceMapDao.java b/server/src/com/cloud/network/vpc/dao/VpcOfferingServiceMapDao.java similarity index 97% rename from server/src/com/cloud/network/vpc/Dao/VpcOfferingServiceMapDao.java rename to server/src/com/cloud/network/vpc/dao/VpcOfferingServiceMapDao.java index d9ef8a27c9f..0b3c3c3203b 100644 --- a/server/src/com/cloud/network/vpc/Dao/VpcOfferingServiceMapDao.java +++ b/server/src/com/cloud/network/vpc/dao/VpcOfferingServiceMapDao.java @@ -10,7 +10,8 @@ // limitations under the License. // // Automatically generated by addcopyright.py at 04/03/2012 -package com.cloud.network.vpc.Dao; +package com.cloud.network.vpc.dao; + import java.util.List; diff --git a/server/src/com/cloud/network/vpc/Dao/VpcOfferingServiceMapDaoImpl.java b/server/src/com/cloud/network/vpc/dao/VpcOfferingServiceMapDaoImpl.java similarity index 99% rename from server/src/com/cloud/network/vpc/Dao/VpcOfferingServiceMapDaoImpl.java rename to server/src/com/cloud/network/vpc/dao/VpcOfferingServiceMapDaoImpl.java index 40aece75fe7..eab79c98a55 100644 --- a/server/src/com/cloud/network/vpc/Dao/VpcOfferingServiceMapDaoImpl.java +++ b/server/src/com/cloud/network/vpc/dao/VpcOfferingServiceMapDaoImpl.java @@ -10,7 +10,8 @@ // limitations under the License. // // Automatically generated by addcopyright.py at 04/03/2012 -package com.cloud.network.vpc.Dao; +package com.cloud.network.vpc.dao; + import java.util.List; diff --git a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java index b503d9f68c7..a5096057f2d 100644 --- a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java +++ b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java @@ -9,7 +9,6 @@ import javax.naming.ConfigurationException; import org.apache.log4j.Logger; -import com.cloud.api.BaseListProjectAndAccountResourcesCmd; import com.cloud.api.commands.CreateVpnConnectionCmd; import com.cloud.api.commands.CreateVpnCustomerGatewayCmd; import com.cloud.api.commands.CreateVpnGatewayCmd; @@ -21,14 +20,12 @@ import com.cloud.api.commands.ListVpnCustomerGatewaysCmd; import com.cloud.api.commands.ListVpnGatewaysCmd; import com.cloud.api.commands.ResetVpnConnectionCmd; import com.cloud.api.commands.UpdateVpnCustomerGatewayCmd; -import com.cloud.domain.Domain; import com.cloud.event.ActionEvent; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.IPAddressVO; -import com.cloud.network.IpAddress; import com.cloud.network.NetworkManager; import com.cloud.network.Site2SiteCustomerGateway; import com.cloud.network.Site2SiteCustomerGatewayVO; @@ -44,7 +41,7 @@ import com.cloud.network.dao.Site2SiteVpnGatewayDao; import com.cloud.network.element.Site2SiteVpnServiceProvider; import com.cloud.network.vpc.VpcManager; import com.cloud.network.vpc.VpcVO; -import com.cloud.network.vpc.Dao.VpcDao; +import com.cloud.network.vpc.dao.VpcDao; import com.cloud.projects.Project.ListProjectResourcesCriteria; import com.cloud.user.Account; import com.cloud.user.AccountManager; @@ -58,7 +55,6 @@ import com.cloud.utils.component.Inject; import com.cloud.utils.component.Manager; import com.cloud.utils.db.DB; import com.cloud.utils.db.Filter; -import com.cloud.utils.db.GenericDao; import com.cloud.utils.db.JoinBuilder; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; diff --git a/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java b/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java index 7f2172a4a2c..8b61978a873 100755 --- a/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java +++ b/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java @@ -48,7 +48,7 @@ import com.cloud.exception.PermissionDeniedException; import com.cloud.exception.ResourceAllocationException; import com.cloud.network.dao.IPAddressDao; import com.cloud.network.dao.NetworkDao; -import com.cloud.network.vpc.Dao.VpcDao; +import com.cloud.network.vpc.dao.VpcDao; import com.cloud.projects.Project; import com.cloud.projects.ProjectAccount.Role; import com.cloud.projects.dao.ProjectAccountDao; diff --git a/server/src/com/cloud/tags/TaggedResourceManagerImpl.java b/server/src/com/cloud/tags/TaggedResourceManagerImpl.java index 4db68a3d032..6efabc865c6 100644 --- a/server/src/com/cloud/tags/TaggedResourceManagerImpl.java +++ b/server/src/com/cloud/tags/TaggedResourceManagerImpl.java @@ -35,8 +35,8 @@ import com.cloud.network.dao.NetworkDao; import com.cloud.network.dao.RemoteAccessVpnDao; import com.cloud.network.rules.dao.PortForwardingRulesDao; import com.cloud.network.security.dao.SecurityGroupDao; -import com.cloud.network.vpc.Dao.StaticRouteDao; -import com.cloud.network.vpc.Dao.VpcDao; +import com.cloud.network.vpc.dao.StaticRouteDao; +import com.cloud.network.vpc.dao.VpcDao; import com.cloud.projects.Project.ListProjectResourcesCriteria; import com.cloud.projects.dao.ProjectDao; import com.cloud.server.ResourceTag; diff --git a/server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java b/server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java index d04aa210381..79667353bbf 100755 --- a/server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java +++ b/server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java @@ -19,8 +19,8 @@ import javax.ejb.Local; import com.cloud.host.HostVO; import com.cloud.host.dao.HostDaoImpl; import com.cloud.network.Network; -import com.cloud.network.RouterNetworkDaoImpl; import com.cloud.network.RouterNetworkVO; +import com.cloud.network.dao.RouterNetworkDaoImpl; import com.cloud.network.router.VirtualRouter; import com.cloud.network.router.VirtualRouter.Role; import com.cloud.offering.NetworkOffering;