Reverting as not required.

Author: pki

modules/systemtests/src-test/org/ejbca/core/protocol/cmp/CmpTestCase.java

@@ -149,7 +149,6 @@
 import org.cesecore.certificates.certificate.CertificateRevokeException;
 import org.cesecore.certificates.certificate.CertificateStoreSessionRemote;
 import org.cesecore.certificates.certificate.IllegalKeyException;
-import org.cesecore.certificates.certificate.InternalCertificateStoreSessionRemote;
 import org.cesecore.certificates.certificate.exception.CertificateSerialNumberException;
 import org.cesecore.certificates.certificate.exception.CustomCertificateSerialNumberException;
 import org.cesecore.certificates.certificate.request.ResponseStatus;
@@ -309,14 +308,8 @@ private void cleanup() throws AuthorizationDeniedException {
     }
 
     protected final void removeCAs(CA[] cas) throws AuthorizationDeniedException {
-        final InternalCertificateStoreSessionRemote internalCertificateStoreSession = EjbRemoteHelper.INSTANCE.getRemoteSession(
-                InternalCertificateStoreSessionRemote.class, EjbRemoteHelper.MODULE_TEST);
         for (CA ca : cas) {
             if (ca != null ) {
-                
-                // Delete certs issued by the CA
-                internalCertificateStoreSession.removeCertificatesByIssuer( ca.getSubjectDN());
-
                 CaTestUtils.removeCa(ADMIN, ca.getCAInfo());
             }
         }

modules/systemtests/src-test/org/ejbca/core/protocol/cmp/CrmfRARequestSystemTest.java

@@ -147,9 +147,6 @@ public static void beforeClass() throws Exception {
 
     @AfterClass
     public static void tearDownFinal() throws RoleNotFoundException, AuthorizationDeniedException {
-        // Remove issued certs
-        internalCertStoreSession.removeCertificatesByIssuer(ISSUER_DN);
-
         if (testx509ca != null) {
             CaTestUtils.removeCa(ADMIN, testx509ca.getCAInfo());
         }
@@ -802,7 +799,6 @@ public void test06CrmfEcdsaCA() throws Exception {
             } finally {
                 try {
                     this.endEntityManagementSession.deleteUser(ADMIN, userName1);
-                    internalCertStoreSession.removeCertificatesByUsername(userName1);
                 } catch (NoSuchEndEntityException e) {// Do nothing
                 }
             }

modules/systemtests/src-test/org/ejbca/core/protocol/ocsp/ProtocolOcspHttpSystemTest.java

@@ -505,7 +505,6 @@ public void test08OcspEcdsaGood() throws Exception {
         } finally {
             endEntityManagementSession.deleteUser(admin, "ocsptest");
             CryptoTokenTestUtils.removeCryptoToken(admin, caInfo.getCAToken().getCryptoTokenId());
-            internalCertStoreSession.removeCertificatesByIssuer( caInfo.getSubjectDN());
         }
     } // test08OcspEcdsaGood