etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Name change for vpc/Dao package (dao is lowercased now) 

Conflicts:

	api/src/com/cloud/vm/PluggableNics.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/network/dao/RouterNetworkDaoImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/vpc/dao/PrivateIpDao.java
	server/src/com/cloud/network/vpc/dao/PrivateIpDaoImpl.java
	server/src/com/cloud/network/vpc/dao/StaticRouteDao.java
	server/src/com/cloud/network/vpc/dao/StaticRouteDaoImpl.java
	server/src/com/cloud/network/vpc/dao/VpcDao.java
	server/src/com/cloud/network/vpc/dao/VpcDaoImpl.java
	server/src/com/cloud/network/vpc/dao/VpcGatewayDao.java
	server/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java
	server/src/com/cloud/network/vpc/dao/VpcOfferingDao.java
	server/src/com/cloud/network/vpc/dao/VpcOfferingDaoImpl.java
	server/src/com/cloud/network/vpc/dao/VpcOfferingServiceMapDao.java
	server/src/com/cloud/network/vpc/dao/VpcOfferingServiceMapDaoImpl.java
This commit is contained in:
Alena Prokharchyk 2012-08-08 14:51:51 -07:00
parent cc212aaecf
commit d31449f1c0
24 changed files with 48 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
api/src/com/cloud/vm/PluggableNics.java
View File

@ -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();
}

BIN
awsapi.log.2012-07-25.gz
View File

Binary file not shown.

12
server/src/com/cloud/configuration/DefaultComponentLibrary.java
View File

@ -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;

2
server/src/com/cloud/network/NetworkManagerImpl.java
View File

@ -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;

3
server/src/com/cloud/network/RouterNetworkDaoImpl.java → server/src/com/cloud/network/dao/RouterNetworkDaoImpl.java
View File

@ -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;

2
server/src/com/cloud/network/guru/PrivateNetworkGuru.java
View File

@ -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;

8
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
View File

@ -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;

12
server/src/com/cloud/network/vpc/VpcManagerImpl.java
View File

@ -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;

3
server/src/com/cloud/network/vpc/Dao/PrivateIpDao.java → server/src/com/cloud/network/vpc/dao/PrivateIpDao.java
View File

@ -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;

3
server/src/com/cloud/network/vpc/Dao/PrivateIpDaoImpl.java → server/src/com/cloud/network/vpc/dao/PrivateIpDaoImpl.java
View File

@ -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;

3
server/src/com/cloud/network/vpc/Dao/StaticRouteDao.java → server/src/com/cloud/network/vpc/dao/StaticRouteDao.java
View File

@ -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;

3
server/src/com/cloud/network/vpc/Dao/StaticRouteDaoImpl.java → server/src/com/cloud/network/vpc/dao/StaticRouteDaoImpl.java
View File

@ -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;

2
server/src/com/cloud/network/vpc/Dao/VpcDao.java → server/src/com/cloud/network/vpc/dao/VpcDao.java
View File

@ -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;

3
server/src/com/cloud/network/vpc/Dao/VpcDaoImpl.java → server/src/com/cloud/network/vpc/dao/VpcDaoImpl.java
View File

@ -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;

3
server/src/com/cloud/network/vpc/Dao/VpcGatewayDao.java → server/src/com/cloud/network/vpc/dao/VpcGatewayDao.java
View File

@ -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;

3
server/src/com/cloud/network/vpc/Dao/VpcGatewayDaoImpl.java → server/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java
View File

@ -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;

3
server/src/com/cloud/network/vpc/Dao/VpcOfferingDao.java → server/src/com/cloud/network/vpc/dao/VpcOfferingDao.java
View File

@ -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;

3
server/src/com/cloud/network/vpc/Dao/VpcOfferingDaoImpl.java → server/src/com/cloud/network/vpc/dao/VpcOfferingDaoImpl.java
View File

@ -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;

3
server/src/com/cloud/network/vpc/Dao/VpcOfferingServiceMapDao.java → server/src/com/cloud/network/vpc/dao/VpcOfferingServiceMapDao.java
View File

@ -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;

3
server/src/com/cloud/network/vpc/Dao/VpcOfferingServiceMapDaoImpl.java → server/src/com/cloud/network/vpc/dao/VpcOfferingServiceMapDaoImpl.java
View File

@ -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;

6
server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
View File

@ -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;

2
server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
View File

@ -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;

4
server/src/com/cloud/tags/TaggedResourceManagerImpl.java
View File

@ -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;

2
server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
View File

@ -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;