apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

pull merges

Browse Source
This commit is contained in:
Alex Huang 2013-12-12 13:00:26 -08:00
parent 0c2a4b251a
commit cf0a11e45a
5 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java
View File

@ -26,7 +26,6 @@ import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.AccountResponse;
import org.apache.cloudstack.api.response.ClusterResponse; import org.apache.cloudstack.api.response.ClusterResponse;
import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.DomainRouterResponse; import org.apache.cloudstack.api.response.DomainRouterResponse;
@ -132,7 +131,7 @@ public class UpgradeRouterTemplateCmd extends org.apache.cloudstack.api.BaseCmd
if (result != null) { if (result != null) {
ListResponse<UpgradeRouterTemplateResponse> response = _responseGenerator.createUpgradeRouterTemplateResponse(result); ListResponse<UpgradeRouterTemplateResponse> response = _responseGenerator.createUpgradeRouterTemplateResponse(result);
response.setResponseName(getCommandName()); response.setResponseName(getCommandName());
this.setResponseObject(response); setResponseObject(response);
} else { } else {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to upgrade router template"); throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to upgrade router template");
} }

4
deps/XenServerJava/pom.xml vendored
View File

@ -25,7 +25,7 @@
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<artifactId>xapi</artifactId> <artifactId>xapi</artifactId>
<version>4.4.0-SNAPSHOT</version> <version>5.6.100-1-SNAPSHOT</version>
<name>Apache XenSource XAPI</name> <name>Apache XenSource XAPI</name>
<description>XenSource XAPI Java Bindings</description> <description>XenSource XAPI Java Bindings</description>
<dependencies> <dependencies>
@ -44,7 +44,7 @@
<dependency> <dependency>
<groupId>org.apache.cloudstack</groupId> <groupId>org.apache.cloudstack</groupId>
<artifactId>build-checkstyle</artifactId> <artifactId>build-checkstyle</artifactId>
<version>${project.version}</version> <version>${parent.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
<executions> <executions>

3
engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteCustomerGatewayDetailsDaoImpl.java
View File

@ -18,9 +18,10 @@ package org.apache.cloudstack.resourcedetail.dao;
import javax.ejb.Local; import javax.ejb.Local;
import org.springframework.stereotype.Component;
import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
import org.apache.cloudstack.resourcedetail.Site2SiteCustomerGatewayDetailVO; import org.apache.cloudstack.resourcedetail.Site2SiteCustomerGatewayDetailVO;
import org.springframework.stereotype.Component;
@Component @Component
@Local(value = {Site2SiteCustomerGatewayDetailsDao.class}) @Local(value = {Site2SiteCustomerGatewayDetailsDao.class})

3
engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnGatewayDetailsDaoImpl.java
View File

@ -18,9 +18,10 @@ package org.apache.cloudstack.resourcedetail.dao;
import javax.ejb.Local; import javax.ejb.Local;
import org.springframework.stereotype.Component;
import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
import org.apache.cloudstack.resourcedetail.Site2SiteVpnGatewayDetailVO; import org.apache.cloudstack.resourcedetail.Site2SiteVpnGatewayDetailVO;
import org.springframework.stereotype.Component;
@Component @Component
@Local(value = { Site2SiteVpnGatewayDetailsDao.class }) @Local(value = { Site2SiteVpnGatewayDetailsDao.class })

14
server/test/com/cloud/vpc/NetworkACLManagerTest.java
View File

@ -57,6 +57,9 @@ import com.cloud.network.vpc.NetworkACLItemVO;
import com.cloud.network.vpc.NetworkACLManager; import com.cloud.network.vpc.NetworkACLManager;
import com.cloud.network.vpc.NetworkACLManagerImpl; import com.cloud.network.vpc.NetworkACLManagerImpl;
import com.cloud.network.vpc.NetworkACLVO; import com.cloud.network.vpc.NetworkACLVO;
import com.cloud.network.vpc.PrivateGateway;
import com.cloud.network.vpc.VpcGateway;
import com.cloud.network.vpc.VpcGatewayVO;
import com.cloud.network.vpc.VpcManager; import com.cloud.network.vpc.VpcManager;
import com.cloud.network.vpc.VpcService; import com.cloud.network.vpc.VpcService;
import com.cloud.network.vpc.dao.NetworkACLDao; import com.cloud.network.vpc.dao.NetworkACLDao;
@ -69,17 +72,6 @@ import com.cloud.user.UserVO;
import com.cloud.utils.component.ComponentContext; import com.cloud.utils.component.ComponentContext;
import com.cloud.utils.db.EntityManager; import com.cloud.utils.db.EntityManager;
import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.network.vpc.NetworkACLManager;
import com.cloud.network.vpc.VpcManager;
import com.cloud.network.vpc.VpcService;
import com.cloud.network.vpc.NetworkACLVO;
import com.cloud.network.vpc.NetworkACLItemVO;
import com.cloud.network.vpc.VpcGatewayVO;
import com.cloud.network.vpc.PrivateGateway;
import com.cloud.network.vpc.NetworkACLManagerImpl;
import com.cloud.network.vpc.NetworkACLItemDao;
import com.cloud.network.vpc.NetworkACLItem;
import com.cloud.network.vpc.VpcGateway;
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(loader = AnnotationConfigContextLoader.class) @ContextConfiguration(loader = AnnotationConfigContextLoader.class)