From ae4e571d510fa7fae74229c8eb550aead36b866b Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Mon, 1 May 2017 10:55:36 +0200 Subject: [PATCH] CLOUDSTACK-9815 move package further to apache location --- .../api/command/user/loadbalancer/DeleteSslCertCmd.java | 2 +- .../api/command/user/loadbalancer/ListSslCertsCmd.java | 2 +- .../api/command/user/loadbalancer/UploadSslCertCmd.java | 2 +- api/src/org/apache/cloudstack/api/response/SslCertResponse.java | 2 +- .../apache/cloudstack}/network/tls/CertService.java | 2 +- .../cloud => org/apache/cloudstack}/network/tls/SslCert.java | 2 +- engine/schema/src/com/cloud/network/dao/SslCertVO.java | 2 +- .../src/org/apache/cloudstack/network/ssl/CertServiceImpl.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) rename api/src/{com/cloud => org/apache/cloudstack}/network/tls/CertService.java (97%) rename api/src/{com/cloud => org/apache/cloudstack}/network/tls/SslCert.java (96%) diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java index a091e514f78..656c14c1048 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java @@ -34,7 +34,7 @@ import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; -import com.cloud.network.tls.CertService; +import org.apache.cloudstack.network.tls.CertService; import com.cloud.utils.exception.CloudRuntimeException; @APICommand(name = "deleteSslCert", description = "Delete a certificate to CloudStack", responseObject = SuccessResponse.class, diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java index e6d3de6f195..cfa56754850 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java @@ -33,7 +33,7 @@ import org.apache.cloudstack.api.response.ProjectResponse; import org.apache.cloudstack.api.response.SslCertResponse; import org.apache.cloudstack.context.CallContext; -import com.cloud.network.tls.CertService; +import org.apache.cloudstack.network.tls.CertService; import com.cloud.utils.exception.CloudRuntimeException; @APICommand(name = "listSslCerts", description = "Lists SSL certificates", responseObject = SslCertResponse.class, diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java index 1a10c41705a..a6d71c76175 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java @@ -36,7 +36,7 @@ import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; -import com.cloud.network.tls.CertService; +import org.apache.cloudstack.network.tls.CertService; @APICommand(name = "uploadSslCert", description = "Upload a certificate to CloudStack", responseObject = SslCertResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) diff --git a/api/src/org/apache/cloudstack/api/response/SslCertResponse.java b/api/src/org/apache/cloudstack/api/response/SslCertResponse.java index f4fa300eff0..d722e9845de 100644 --- a/api/src/org/apache/cloudstack/api/response/SslCertResponse.java +++ b/api/src/org/apache/cloudstack/api/response/SslCertResponse.java @@ -24,7 +24,7 @@ import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; -import com.cloud.network.tls.SslCert; +import org.apache.cloudstack.network.tls.SslCert; import com.cloud.serializer.Param; //import org.apache.cloudstack.api.EntityReference; diff --git a/api/src/com/cloud/network/tls/CertService.java b/api/src/org/apache/cloudstack/network/tls/CertService.java similarity index 97% rename from api/src/com/cloud/network/tls/CertService.java rename to api/src/org/apache/cloudstack/network/tls/CertService.java index b4551068356..6f4feff9fab 100644 --- a/api/src/com/cloud/network/tls/CertService.java +++ b/api/src/org/apache/cloudstack/network/tls/CertService.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.network.tls; +package org.apache.cloudstack.network.tls; import java.security.cert.Certificate; import java.util.List; diff --git a/api/src/com/cloud/network/tls/SslCert.java b/api/src/org/apache/cloudstack/network/tls/SslCert.java similarity index 96% rename from api/src/com/cloud/network/tls/SslCert.java rename to api/src/org/apache/cloudstack/network/tls/SslCert.java index f8e69301353..fb1590c539a 100644 --- a/api/src/com/cloud/network/tls/SslCert.java +++ b/api/src/org/apache/cloudstack/network/tls/SslCert.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.network.tls; +package org.apache.cloudstack.network.tls; import org.apache.cloudstack.acl.ControlledEntity; import org.apache.cloudstack.api.Identity; diff --git a/engine/schema/src/com/cloud/network/dao/SslCertVO.java b/engine/schema/src/com/cloud/network/dao/SslCertVO.java index bf496b3bc96..1d72180a107 100644 --- a/engine/schema/src/com/cloud/network/dao/SslCertVO.java +++ b/engine/schema/src/com/cloud/network/dao/SslCertVO.java @@ -23,7 +23,7 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import com.cloud.network.tls.SslCert; +import org.apache.cloudstack.network.tls.SslCert; import com.cloud.utils.db.Encrypt; @Entity diff --git a/server/src/org/apache/cloudstack/network/ssl/CertServiceImpl.java b/server/src/org/apache/cloudstack/network/ssl/CertServiceImpl.java index a89e92bd323..9da9bddd5b8 100644 --- a/server/src/org/apache/cloudstack/network/ssl/CertServiceImpl.java +++ b/server/src/org/apache/cloudstack/network/ssl/CertServiceImpl.java @@ -26,7 +26,7 @@ import com.cloud.network.dao.LoadBalancerCertMapVO; import com.cloud.network.dao.LoadBalancerVO; import com.cloud.network.dao.SslCertDao; import com.cloud.network.dao.SslCertVO; -import com.cloud.network.tls.CertService; +import org.apache.cloudstack.network.tls.CertService; import com.cloud.network.rules.LoadBalancer; import com.cloud.projects.Project; import com.cloud.projects.ProjectService;