Index: src/main/java/org/glassfish/ejb/security/application/EJBSecurityManager.java
===================================================================
--- src/main/java/org/glassfish/ejb/security/application/EJBSecurityManager.java	(revision 33721)
+++ src/main/java/org/glassfish/ejb/security/application/EJBSecurityManager.java	(working copy)
@@ -930,7 +930,9 @@
             getPolicyFactory().getPolicyConfiguration(this.contextId, true);
 
             if (wasInService) {
-                probeProvider.ejbPCDestructionEvent(contextId);
+                probeProvider.policyDestructionStartedEvent(ejbName);
+                probeProvider.policyDestructionEvent(contextId);
+                probeProvider.policyDestructionEndedEvent(ejbName);
                 policy.refresh();
                 PermissionCacheFactory.removePermissionCache(uncheckedMethodPermissionCache);
                 uncheckedMethodPermissionCache = null;
@@ -943,7 +945,9 @@
             _logger.log(Level.WARNING, msg, pce);
         }
         ejbSFM.getManager(contextId,ejbName,true);
-        probeProvider.ejbSMDestructionEvent(ejbName);
+        probeProvider.securityManagerDestructionStartedEvent(ejbName);
+        probeProvider.securityManagerDestructionEvent(ejbName);
+        probeProvider.securityManagerDestructionEndedEvent(ejbName);
     }
 
     /**
Index: src/main/java/org/glassfish/ejb/security/application/EjbSecurityProbeProvider.java
===================================================================
--- src/main/java/org/glassfish/ejb/security/application/EjbSecurityProbeProvider.java	(revision 33721)
+++ src/main/java/org/glassfish/ejb/security/application/EjbSecurityProbeProvider.java	(working copy)
@@ -47,20 +47,47 @@
 @ProbeProvider(moduleProviderName="glassfish",moduleName="security", probeProviderName="ejb")
 public class EjbSecurityProbeProvider {
     
-    @Probe(name="ejbSMCreationEvent")
-    public void ejbSMCreationEvent(
+    @Probe(name="securityManagerCreationEvent")
+    public void securityManagerCreationEvent(
             @ProbeParam("appName") String appName){}
+
+    @Probe(name="securityManagerCreationStartedEvent")
+    public void securityManagerCreationStartedEvent(
+            @ProbeParam("appName") String appName){}
+
+    @Probe(name="securityManagerCreationEndedEvent")
+    public void securityManagerCreationEndedEvent(
+            @ProbeParam("appName") String appName){}
     
-    @Probe(name="ejbSMDestructionEvent")
-    public void ejbSMDestructionEvent(
+    @Probe(name="securityManagerDestructionEvent")
+    public void securityManagerDestructionEvent(
             @ProbeParam("appName") String appName
             ) {}
+
+    @Probe(name="securityManagerDestructionStartedEvent")
+    public void securityManagerDestructionStartedEvent(
+            @ProbeParam("appName") String appName
+            ) {}
+
+    @Probe(name="securityManagerDestructionEndedEvent")
+    public void securityManagerDestructionEndedEvent(
+            @ProbeParam("appName") String appName
+            ) {}
    
     
-    @Probe(name="ejbPCDestructionEvent")
-    public void ejbPCDestructionEvent(
+    @Probe(name="policyDestructionEvent")
+    public void policyDestructionEvent(
             @ProbeParam("contextId") String contextId
             ) {}
+
+    @Probe(name="policyDestructionStartedEvent")
+    public void policyDestructionStartedEvent(
+            @ProbeParam("appName") String appName
+            ) {}
+
+    @Probe(name="policyDestructionEndedEvent")
+    public void policyDestructionEndedEvent(
+            @ProbeParam("appName") String appName
+            ) {}
     
-    
 }
Index: src/main/java/org/glassfish/ejb/security/factory/EJBSecurityManagerFactory.java
===================================================================
--- src/main/java/org/glassfish/ejb/security/factory/EJBSecurityManagerFactory.java	(revision 33721)
+++ src/main/java/org/glassfish/ejb/security/factory/EJBSecurityManagerFactory.java	(working copy)
@@ -203,7 +203,9 @@
             try {
                 manager = new EJBSecurityManager(ejbDesc, this.invMgr, this);
                 if (register) {
-                    probeProvider.ejbSMCreationEvent(ejbName);
+                    probeProvider.securityManagerCreationStartedEvent(ejbName);
+                    probeProvider.securityManagerCreationEvent(ejbName);
+                    probeProvider.securityManagerCreationEndedEvent(ejbName);
                     String appName = ejbDesc.getApplication().getRegistrationName();
                     addManagerToApp(ctxId, ejbName, appName, manager);
                 }