pull merges

Author: Alex Huang

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

@@ -26,7 +26,6 @@
 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 void execute() throws ConcurrentOperationException, ResourceUnavailableEx
         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");
         }

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>

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

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

server/test/com/cloud/vpc/NetworkACLManagerTest.java

@@ -57,6 +57,9 @@
 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.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)