Upgrading jscep and other fixes

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml

@@ -144,7 +144,7 @@
             <artifactId>bcpkix-jdk15on</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.google.code.jscep.wso2</groupId>
+            <groupId>org.wso2.orbit.com.google.code.jscep</groupId>
             <artifactId>jscep</artifactId>
         </dependency>
         <dependency>

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/internal/CertificateManagementServiceComponent.java

@@ -27,6 +27,8 @@ import org.wso2.carbon.certificate.mgt.core.config.CertificateManagementConfig;
 import org.wso2.carbon.certificate.mgt.core.config.datasource.DataSourceConfig;
 import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOFactory;
 import org.wso2.carbon.certificate.mgt.core.exception.CertificateManagementException;
+import org.wso2.carbon.certificate.mgt.core.scep.SCEPManager;
+import org.wso2.carbon.certificate.mgt.core.scep.SCEPManagerImpl;
 import org.wso2.carbon.certificate.mgt.core.service.CertificateManagementService;
 import org.wso2.carbon.certificate.mgt.core.service.CertificateManagementServiceImpl;
 import org.wso2.carbon.certificate.mgt.core.util.CertificateManagementConstants;
@@ -72,6 +74,9 @@ public class CertificateManagementServiceComponent {
             bundleContext.registerService(CertificateManagementService.class.getName(),
                     CertificateManagementServiceImpl.getInstance(), null);
 
+            bundleContext.registerService(SCEPManager.class.getName(),
+                    new SCEPManagerImpl(), null);
+
             if (log.isDebugEnabled()) {
                 log.debug("Certificate management core bundle has been successfully initialized");
             }

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/internal/SCEPManagerServiceComponent.java

@@ -1,43 +0,0 @@
-package org.wso2.carbon.certificate.mgt.core.internal;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.osgi.framework.BundleContext;
-import org.osgi.service.component.ComponentContext;
-import org.wso2.carbon.certificate.mgt.core.scep.SCEPManager;
-import org.wso2.carbon.certificate.mgt.core.scep.SCEPManagerImpl;
-
-/**
- * @scr.component name="org.wso2.carbon.certificate.mgt.core.scep" immediate="true"
- */
-public class SCEPManagerServiceComponent {
-
-    private static final Log log = LogFactory.getLog(SCEPManagerServiceComponent.class);
-
-    protected void activate(ComponentContext componentContext) {
-
-        try {
-            if (log.isDebugEnabled()) {
-                log.debug("Initializing SCEP core bundle");
-            }
-
-            BundleContext bundleContext = componentContext.getBundleContext();
-            bundleContext.registerService(SCEPManager.class.getName(),
-                    new SCEPManagerImpl(), null);
-
-            if (log.isDebugEnabled()) {
-                log.debug("SCEP core bundle has been successfully initialized");
-            }
-        } catch (Throwable e) {
-            String msg = "Error occurred while initializing SCEP core bundle";
-            log.error(msg, e);
-        }
-    }
-
-    protected void deactivate(ComponentContext ctx) {
-        if (log.isDebugEnabled()) {
-            log.debug("Deactivating SCEP core bundle");
-        }
-    }
-
-}

features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml

@@ -49,7 +49,7 @@
             <artifactId>bcpkix-jdk15on</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.google.code.jscep.wso2</groupId>
+            <groupId>org.wso2.orbit.com.google.code.jscep</groupId>
             <artifactId>jscep</artifactId>
         </dependency>
         <dependency>
@@ -125,7 +125,7 @@
                                     org.wso2.orbit.org.bouncycastle:bcpkix-jdk15on:${bcpkix.wso2.version}
                                 </bundleDef>
                                 <bundleDef>
-                                    com.google.code.jscep.wso2:jscep:${jscep.version}
+                                    org.wso2.orbit.com.google.code.jscep:jscep:${jscep.version}
                                 </bundleDef>
                                 <bundleDef>
                                     commons-io.wso2:commons-io:${version.commons.io}

pom.xml

@@ -1289,7 +1289,7 @@
                 <version>${bcpkix.wso2.version}</version>
             </dependency>
             <dependency>
-                <groupId>com.google.code.jscep.wso2</groupId>
+                <groupId>org.wso2.orbit.com.google.code.jscep</groupId>
                 <artifactId>jscep</artifactId>
                 <version>${jscep.version}</version>
             </dependency>
@@ -1839,7 +1839,7 @@
         <bcprov.wso2.version.range>[1.52.0,1.60.0)</bcprov.wso2.version.range>
 
         <!-- JSCEP -->
-        <jscep.version>2.0.2.wso2v2</jscep.version>
+        <jscep.version>2.3.0.wso2v1</jscep.version>
 
         <!-- Nimbus Jose-->
         <nimbus.orbit.version>2.26.1.wso2v3</nimbus.orbit.version>