incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yas...@apache.org
Subject [1/13] git commit: Fix build after merge site to site vpn
Date Mon, 02 Jul 2012 23:40:17 GMT
Updated Branches:
  refs/heads/vpc 1f01d923c -> 8d16d7f94


Fix build after merge site to site vpn


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/8d16d7f9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/8d16d7f9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/8d16d7f9

Branch: refs/heads/vpc
Commit: 8d16d7f94f13acbc5e6f27c63450b48a3f135b40
Parents: 5ee4b79
Author: Sheng Yang <sheng.yang@citrix.com>
Authored: Mon Jul 2 16:39:41 2012 -0700
Committer: Sheng Yang <sheng.yang@citrix.com>
Committed: Mon Jul 2 16:39:41 2012 -0700

----------------------------------------------------------------------
 api/src/com/cloud/api/ResponseGenerator.java    |    4 --
 server/src/com/cloud/api/ApiResponseHelper.java |   39 ------------------
 2 files changed, 0 insertions(+), 43 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8d16d7f9/api/src/com/cloud/api/ResponseGenerator.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/ResponseGenerator.java b/api/src/com/cloud/api/ResponseGenerator.java
index b0838a7..002f12c 100755
--- a/api/src/com/cloud/api/ResponseGenerator.java
+++ b/api/src/com/cloud/api/ResponseGenerator.java
@@ -337,10 +337,6 @@ public interface ResponseGenerator {
      */
     StaticRouteResponse createStaticRouteResponse(StaticRoute result);
 
-    ResourceTagResponse createResourceTagResponse(ResourceTag resourceTag);
-
-    PrivateGatewayResponse createPrivateGatewayResponseResponse(PrivateGateway result);
-
     Site2SiteCustomerGatewayResponse createSite2SiteCustomerGatewayResponse(Site2SiteCustomerGateway
result);
 
     Site2SiteVpnConnectionResponse createSite2SiteVpnConnectionResponse(Site2SiteVpnConnection
result);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8d16d7f9/server/src/com/cloud/api/ApiResponseHelper.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index c0552af..9a1b8e5 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -3613,45 +3613,6 @@ public class ApiResponseHelper implements ResponseGenerator {
     }
     
     @Override
-    public ResourceTagResponse createResourceTagResponse(ResourceTag resourceTag) {
-        ResourceTagResponse response = new ResourceTagResponse();
-        response.setKey(resourceTag.getKey());
-        response.setValue(resourceTag.getValue());
-        response.setResourceType(resourceTag.getResourceType().toString());        
-        response.setId(ApiDBUtils.getUuid(String.valueOf(resourceTag.getResourceId()),resourceTag.getResourceType()));
-        Long accountId = resourceTag.getAccountId();
-        Long domainId = resourceTag.getDomainId();
-        if (accountId != null) {
-            Account account = ApiDBUtils.findAccountByIdIncludingRemoved(resourceTag.getAccountId());
-
-            if (account.getType() == Account.ACCOUNT_TYPE_PROJECT) {
-                // find the project
-                Project project = ApiDBUtils.findProjectByProjectAccountId(account.getId());
-                response.setProjectId(project.getId());
-                response.setProjectName(project.getName());
-            } else {
-                response.setAccountName(account.getAccountName());
-            }
-        }
-        
-        if (domainId != null) {
-            response.setDomainId(domainId);
-            response.setDomainName(ApiDBUtils.findDomainById(domainId).getName());
-        }
-        
-        response.setCustomer(resourceTag.getCustomer());
-        
-        response.setObjectName("tag");
-  
-        return response;
-    }    
-
-    public PrivateGatewayResponse createPrivateGatewayResponseResponse(PrivateGateway result)
{
-        // TODO Auto-generated method stub
-        return null;
-    }
-    
-    @Override
     public Site2SiteVpnGatewayResponse createSite2SiteVpnGatewayResponse(Site2SiteVpnGateway
result) {
         Site2SiteVpnGatewayResponse response = new Site2SiteVpnGatewayResponse();
         response.setId(result.getId());


Mime
View raw message