pull merges
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cf0a11e4 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cf0a11e4 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cf0a11e4 Branch: refs/heads/master Commit: cf0a11e45afaedcb7ea720817a1fa42d2810e6e1 Parents: 0c2a4b2 Author: Alex Huang <alex.hu...@citrix.com> Authored: Thu Dec 12 13:00:26 2013 -0800 Committer: Alex Huang <alex.hu...@citrix.com> Committed: Thu Dec 12 13:00:26 2013 -0800 ---------------------------------------------------------------------- .../admin/router/UpgradeRouterTemplateCmd.java | 3 +-- deps/XenServerJava/pom.xml | 4 ++-- .../dao/Site2SiteCustomerGatewayDetailsDaoImpl.java | 5 +++-- .../dao/Site2SiteVpnGatewayDetailsDaoImpl.java | 5 +++-- server/test/com/cloud/vpc/NetworkACLManagerTest.java | 14 +++----------- 5 files changed, 12 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cf0a11e4/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java index 27fffc9..4947745 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java @@ -26,7 +26,6 @@ import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.Parameter; 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.DomainResponse; import org.apache.cloudstack.api.response.DomainRouterResponse; @@ -132,7 +131,7 @@ public class UpgradeRouterTemplateCmd extends org.apache.cloudstack.api.BaseCmd if (result != null) { ListResponse<UpgradeRouterTemplateResponse> response = _responseGenerator.createUpgradeRouterTemplateResponse(result); response.setResponseName(getCommandName()); - this.setResponseObject(response); + setResponseObject(response); } else { throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to upgrade router template"); } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cf0a11e4/deps/XenServerJava/pom.xml ---------------------------------------------------------------------- diff --git a/deps/XenServerJava/pom.xml b/deps/XenServerJava/pom.xml index dbd2e86..6633e06 100644 --- a/deps/XenServerJava/pom.xml +++ b/deps/XenServerJava/pom.xml @@ -25,7 +25,7 @@ <relativePath>../../pom.xml</relativePath> </parent> <artifactId>xapi</artifactId> - <version>4.4.0-SNAPSHOT</version> + <version>5.6.100-1-SNAPSHOT</version> <name>Apache XenSource XAPI</name> <description>XenSource XAPI Java Bindings</description> <dependencies> @@ -44,7 +44,7 @@ <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>build-checkstyle</artifactId> - <version>${project.version}</version> + <version>${parent.version}</version> </dependency> </dependencies> <executions> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cf0a11e4/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteCustomerGatewayDetailsDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteCustomerGatewayDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteCustomerGatewayDetailsDaoImpl.java index b07adcb..71e810e 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteCustomerGatewayDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteCustomerGatewayDetailsDaoImpl.java @@ -5,7 +5,7 @@ // 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, @@ -18,9 +18,10 @@ package org.apache.cloudstack.resourcedetail.dao; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; import org.apache.cloudstack.resourcedetail.Site2SiteCustomerGatewayDetailVO; -import org.springframework.stereotype.Component; @Component @Local(value = {Site2SiteCustomerGatewayDetailsDao.class}) http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cf0a11e4/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnGatewayDetailsDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnGatewayDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnGatewayDetailsDaoImpl.java index 8349ea8..1e6b480 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnGatewayDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnGatewayDetailsDaoImpl.java @@ -5,7 +5,7 @@ // 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, @@ -18,9 +18,10 @@ package org.apache.cloudstack.resourcedetail.dao; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; import org.apache.cloudstack.resourcedetail.Site2SiteVpnGatewayDetailVO; -import org.springframework.stereotype.Component; @Component @Local(value = { Site2SiteVpnGatewayDetailsDao.class }) http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cf0a11e4/server/test/com/cloud/vpc/NetworkACLManagerTest.java ---------------------------------------------------------------------- diff --git a/server/test/com/cloud/vpc/NetworkACLManagerTest.java b/server/test/com/cloud/vpc/NetworkACLManagerTest.java index 2dd8b2d..629afa3 100644 --- a/server/test/com/cloud/vpc/NetworkACLManagerTest.java +++ b/server/test/com/cloud/vpc/NetworkACLManagerTest.java @@ -57,6 +57,9 @@ import com.cloud.network.vpc.NetworkACLItemVO; import com.cloud.network.vpc.NetworkACLManager; import com.cloud.network.vpc.NetworkACLManagerImpl; 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.VpcService; 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.db.EntityManager; 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) @ContextConfiguration(loader = AnnotationConfigContextLoader.class)
