Index: src/main/java/com/sun/enterprise/security/EjbSecurityPolicyProbeProvider.java
===================================================================
--- src/main/java/com/sun/enterprise/security/EjbSecurityPolicyProbeProvider.java	(revision 33721)
+++ src/main/java/com/sun/enterprise/security/EjbSecurityPolicyProbeProvider.java	(working copy)
@@ -44,8 +44,18 @@
 @ProbeProvider(moduleProviderName="glassfish",moduleName="security", probeProviderName="ejbpolicy")
 public class EjbSecurityPolicyProbeProvider {
 
-    @Probe(name="ejbPCCreationEvent")
-    public void ejbPCCreationEvent(
+    @Probe(name="policyCreationEvent")
+    public void policyCreationEvent(
             @ProbeParam("contextId") String contextId ) {}
+
+    @Probe(name = "policyCreationStartedEvent")
+    public void policyCreationStartedEvent(
+            @ProbeParam("appName") String appName) {
+    }
+
+    @Probe(name = "policyCreationEndedEvent")
+    public void policyCreationEndedEvent(
+            @ProbeParam("appName") String appName) {
+    }
     
 }
             
 
Index: src/main/java/com/sun/enterprise/security/web/integration/WebSecurityManager.java
===================================================================
--- src/main/java/com/sun/enterprise/security/web/integration/WebSecurityManager.java	(revision 33721)
+++ src/main/java/com/sun/enterprise/security/web/integration/WebSecurityManager.java	(working copy)
@@ -550,7 +550,9 @@
             uncheckedPermissionCache = null;
         }
         SecurityRoleMapperFactoryGen.getSecurityRoleMapperFactory().removeAppNameForContext(CONTEXT_ID);
+        probeProvider.policyDestructionStartedEvent(this.getAppId());
         probeProvider.policyConfigurationDestructionEvent(CONTEXT_ID);
+        probeProvider.policyDestructionEndedEvent(this.getAppId());
         wsmf.getManager(CONTEXT_ID,null,true);
     }
    
Index: src/main/java/com/sun/enterprise/security/web/integration/WebSecurityManagerFactory.java
===================================================================
--- src/main/java/com/sun/enterprise/security/web/integration/WebSecurityManagerFactory.java	(revision 33721)
+++ src/main/java/com/sun/enterprise/security/web/integration/WebSecurityManagerFactory.java	(working copy)
@@ -287,7 +287,9 @@
 
                  manager = new WebSecurityManager(wbd, context, this, register);
                  if (register) {
+                    probeProvider.securityManagerCreationStartedEvent(wbd.getModuleID());
                     probeProvider.securityManagerCreationEvent(ctxId);
+                    probeProvider.securityManagerCreationEndedEvent(wbd.getModuleID());
                     String appName = wbd.getApplication().getRegistrationName();
                     addManagerToApp(ctxId, null, appName, manager);
                  }
Index: src/main/java/com/sun/enterprise/security/SecurityDeployer.java
===================================================================
--- src/main/java/com/sun/enterprise/security/SecurityDeployer.java	(revision 33721)
+++ src/main/java/com/sun/enterprise/security/SecurityDeployer.java	(working copy)
@@ -200,7 +200,9 @@
                 }
                 String cid = SecurityUtil.getContextID(webBD);
                 SecurityUtil.generatePolicyFile(cid);
+                websecurityProbeProvider.policyCreationStartedEvent(webBD.getModuleID());
                 websecurityProbeProvider.policyConfigurationCreationEvent(cid);
+                websecurityProbeProvider.policyCreationEndedEvent(webBD.getModuleID());
             }
         } catch (Exception se) {
             String msg = "Error in generating security policy for " +
@@ -221,7 +223,9 @@
             for (EjbBundleDescriptor ejbBD : ejbDescriptors) {
                 String pcid = SecurityUtil.getContextID(ejbBD);
                 SecurityUtil.generatePolicyFile(pcid);
-                ejbProbeProvider.ejbPCCreationEvent(pcid);
+                ejbProbeProvider.policyCreationStartedEvent(ejbBD.getModuleID());
+                ejbProbeProvider.policyCreationEvent(pcid);
+                ejbProbeProvider.policyCreationEndedEvent(ejbBD.getModuleID());
             }
         } catch (Exception se) {
             String msg = "Error in committing security policy for ejbs of " +
@@ -343,7 +347,9 @@
         for (int i = 0; managers !=
                 null && i < managers.size(); i++) {
             try {
+                websecurityProbeProvider.securityManagerDestructionStartedEvent(appName);
                 websecurityProbeProvider.securityManagerDestructionEvent(appName);
+                websecurityProbeProvider.securityManagerDestructionEndedEvent(appName);
                 managers.get(i).destroy();
                 cleanUpDone =
                         true;
Index: src/main/java/com/sun/enterprise/security/WebSecurityDeployerProbeProvider.java
===================================================================
--- src/main/java/com/sun/enterprise/security/WebSecurityDeployerProbeProvider.java	(revision 33721)
+++ src/main/java/com/sun/enterprise/security/WebSecurityDeployerProbeProvider.java	(working copy)
@@ -45,7 +45,7 @@
 public class WebSecurityDeployerProbeProvider {
 
     //Commenting the TimeStatistics related probes to be implemented later
-    /* @Probe(name = "webDeploymentStartedEvent")
+    /*@Probe(name = "webDeploymentStartedEvent")
     public void webDeploymentStartedEvent(
             @ProbeParam("appName") String appName) {
     }
@@ -53,19 +53,19 @@
     @Probe(name = "webDeploymentEndedEvent")
     public void webDeploymentEndedEvent(
             @ProbeParam("appName") String appName) {
-    }
+    }*/
 
-    @Probe(name = "policyGenerationStartedEvent")
-    public void policyGenerationStartedEvent(
+    @Probe(name = "policyCreationStartedEvent")
+    public void policyCreationStartedEvent(
             @ProbeParam("appName") String appName) {
     }
 
-    @Probe(name = "policyGenerationEndedEvent")
-    public void policyGenerationEndedEvent(
+    @Probe(name = "policyCreationEndedEvent")
+    public void policyCreationEndedEvent(
             @ProbeParam("appName") String appName) {
     }
 
-    @Probe(name = "webUndeploymentStartedEvent")
+    /*@Probe(name = "webUndeploymentStartedEvent")
     public void webUndeploymentStartedEvent(
             @ProbeParam("appName") String appName) {
     }
@@ -73,28 +73,48 @@
     @Probe(name = "webUndeploymentEndedEvent")
     public void webUndeploymentEndedEvent(
             @ProbeParam("appName") String appName) {
-    }
+    }*/
 
-    @Probe(name = "policyRemovalStartedEvent")
-    public void policyRemovalStartedEvent(
+    @Probe(name = "policyDestructionStartedEvent")
+    public void policyDestructionStartedEvent(
             @ProbeParam("appName") String appName) {
     }
 
-    @Probe(name = "policyRemovalEndedEvent")
-    public void policyRemovalEndedEvent(
+    @Probe(name = "policyDestructionEndedEvent")
+    public void policyDestructionEndedEvent(
             @ProbeParam("appName") String appName) {
-    }*/
+    }
 
     @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 = "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 = "policyConfigurationCreationEvent")
     public void policyConfigurationCreationEvent(
             @ProbeParam("contextId") String appName) {