Merge pull request #2071 from shapeblue/certificate-handling-move

CLOUDSTACK-9815 move CertService to more generic location

Author: karuturi

api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java

@@ -34,7 +34,7 @@
 import com.cloud.exception.NetworkRuleConflictException;
 import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.network.lb.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,

api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java

@@ -33,7 +33,7 @@
 import org.apache.cloudstack.api.response.SslCertResponse;
 import org.apache.cloudstack.context.CallContext;
 
-import com.cloud.network.lb.CertService;
+import org.apache.cloudstack.network.tls.CertService;
 import com.cloud.utils.exception.CloudRuntimeException;
 
 @APICommand(name = "listSslCerts", description = "Lists SSL certificates", responseObject = SslCertResponse.class,

api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java

@@ -36,7 +36,7 @@
 import com.cloud.exception.NetworkRuleConflictException;
 import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.network.lb.CertService;
+import org.apache.cloudstack.network.tls.CertService;
 
 @APICommand(name = "uploadSslCert", description = "Upload a certificate to CloudStack", responseObject = SslCertResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)

api/src/org/apache/cloudstack/api/response/SslCertResponse.java

@@ -24,7 +24,7 @@
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 
-import com.cloud.network.lb.SslCert;
+import org.apache.cloudstack.network.tls.SslCert;
 import com.cloud.serializer.Param;
 
 //import org.apache.cloudstack.api.EntityReference;

…rc/com/cloud/network/lb/CertService.java …/cloudstack/network/tls/CertService.javaapi/src/com/cloud/network/lb/CertService.java renamed to api/src/org/apache/cloudstack/network/tls/CertService.java api/src/com/cloud/network/lb/CertService.java renamed to api/src/org/apache/cloudstack/network/tls/CertService.java

@@ -14,8 +14,9 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package com.cloud.network.lb;
+package org.apache.cloudstack.network.tls;
 
+import java.security.cert.Certificate;
 import java.util.List;
 
 import org.apache.cloudstack.api.command.user.loadbalancer.DeleteSslCertCmd;
@@ -30,4 +31,6 @@ public interface CertService {
     public void deleteSslCert(DeleteSslCertCmd deleteSslCertCmd);
 
     public List<SslCertResponse> listSslCerts(ListSslCertsCmd listSslCertCmd);
+
+    public Certificate parseCertificate(final String cert);
 }

api/src/com/cloud/network/lb/SslCert.java …ache/cloudstack/network/tls/SslCert.javaapi/src/com/cloud/network/lb/SslCert.java renamed to api/src/org/apache/cloudstack/network/tls/SslCert.java api/src/com/cloud/network/lb/SslCert.java renamed to 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.lb;
+package org.apache.cloudstack.network.tls;
 
 import org.apache.cloudstack.acl.ControlledEntity;
 import org.apache.cloudstack.api.Identity;

engine/schema/src/com/cloud/network/dao/SslCertVO.java

@@ -23,7 +23,7 @@
 import javax.persistence.Id;
 import javax.persistence.Table;
 
-import com.cloud.network.lb.SslCert;
+import org.apache.cloudstack.network.tls.SslCert;
 import com.cloud.utils.db.Encrypt;
 
 @Entity

server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml

@@ -271,6 +271,6 @@
         class="org.apache.cloudstack.region.gslb.GlobalLoadBalancingRulesServiceImpl" >
         <property name="gslbServiceProviders" value="#{gslbServiceProvidersRegistry.registered}" />
     </bean>
-    <bean id="certServiceImpl" class="org.apache.cloudstack.network.lb.CertServiceImpl" />
+    <bean id="certServiceImpl" class="org.apache.cloudstack.network.ssl.CertServiceImpl" />
     <bean id="imageStoreUploadMonitorImpl" class="com.cloud.storage.ImageStoreUploadMonitorImpl" />
 </beans>

…oudstack/network/lb/CertServiceImpl.java …udstack/network/ssl/CertServiceImpl.javaserver/src/org/apache/cloudstack/network/lb/CertServiceImpl.java renamed to server/src/org/apache/cloudstack/network/ssl/CertServiceImpl.java server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java renamed to server/src/org/apache/cloudstack/network/ssl/CertServiceImpl.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 org.apache.cloudstack.network.lb;
+package org.apache.cloudstack.network.ssl;
 
 import com.cloud.domain.DomainVO;
 import com.cloud.domain.dao.DomainDao;
@@ -26,7 +26,7 @@
 import com.cloud.network.dao.LoadBalancerVO;
 import com.cloud.network.dao.SslCertDao;
 import com.cloud.network.dao.SslCertVO;
-import com.cloud.network.lb.CertService;
+import org.apache.cloudstack.network.tls.CertService;
 import com.cloud.network.rules.LoadBalancer;
 import com.cloud.projects.Project;
 import com.cloud.projects.ProjectService;