Property changes on: deployment\autodeploy
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: deployment\javaee-full
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: persistence\cmp\model
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: persistence\cmp\utility
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: persistence\cmp\enhancer
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: persistence\cmp\support-sqlstore
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: persistence\cmp\generator-database
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: persistence\cmp\ejb-mapping
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: persistence\cmp\support-ejb
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: persistence\common
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: persistence\oracle-jdbc-driver-packages
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: core\api-exporter
___________________________________________________________________
Name: svn:ignore
   + target


Index: core/kernel/src/main/java/org/glassfish/kernel/admin/monitor/ThreadPoolProbeProvider.java
===================================================================
--- core/kernel/src/main/java/org/glassfish/kernel/admin/monitor/ThreadPoolProbeProvider.java	(revision 29285)
+++ core/kernel/src/main/java/org/glassfish/kernel/admin/monitor/ThreadPoolProbeProvider.java	(working copy)
@@ -36,7 +36,7 @@
 
 package org.glassfish.kernel.admin.monitor;
 
-import org.glassfish.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
 
 /**
  * Probe provider interface for thread pool related events.
Index: core/kernel/src/main/java/com/sun/enterprise/v3/admin/GetCommand.java
===================================================================
--- core/kernel/src/main/java/com/sun/enterprise/v3/admin/GetCommand.java	(revision 29285)
+++ core/kernel/src/main/java/com/sun/enterprise/v3/admin/GetCommand.java	(working copy)
@@ -58,8 +58,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
-import org.glassfish.api.statistics.Statistic;
-import org.glassfish.api.statistics.impl.StatisticImpl;
+import org.glassfish.external.statistics.Statistic;
+import org.glassfish.external.statistics.impl.StatisticImpl;
 
 /**
  * User: Jerome Dochez
Index: core/kernel/pom.xml
===================================================================
--- core/kernel/pom.xml	(revision 29285)
+++ core/kernel/pom.xml	(working copy)
@@ -153,11 +153,10 @@
             <version>1.1</version>
             <optional>true</optional>
         </dependency>        
-        <!--dependency>
-            <groupId>org.glassfish.admin</groupId>
-            <artifactId>monitoring-core</artifactId>
-            <version>${project.version}</version>
-        </dependency-->
+        <dependency>
+	    <groupId>org.glassfish.external</groupId>
+	    <artifactId>management-api</artifactId>
+	</dependency>
     </dependencies>
     <profiles>
         <profile>

Property changes on: core\extra-jre-packages
___________________________________________________________________
Name: svn:ignore
   + target


Index: pom.xml
===================================================================
--- pom.xml	(revision 29285)
+++ pom.xml	(working copy)
@@ -159,8 +159,8 @@
         <jersey.version>1.1.1-ea</jersey.version>
         <jbi.version>1.0</jbi.version>
         <wsdl4j.version>1.6.2</wsdl4j.version>
-        <gfprobe-provider-client.version>3.0.0-b008</gfprobe-provider-client.version>
-        <gmbal.version>3.0.0-b008</gmbal.version>
+        <gmbal.version>3.0.0-b009</gmbal.version>
+        <management-api.version>3.0.0-b002</management-api.version>
     </properties>
 
 
@@ -882,16 +882,16 @@
                 <version>${wsdl4j.version}</version>
           </dependency>
           <dependency>
+            <groupId>org.glassfish.external</groupId>
+            <artifactId>management-api</artifactId>
+            <version>${management-api.version}</version>
+          </dependency>
+          <dependency>
             <groupId>org.glassfish.gmbal</groupId>
             <artifactId>gmbal</artifactId>
             <version>${gmbal.version}</version>
           </dependency>
           <dependency>
-                <groupId>org.glassfish.provider</groupId>
-                <artifactId>gfprobe-provider-client</artifactId>
-                <version>${gfprobe-provider-client.version}</version>
-          </dependency>
-          <dependency>
                 <groupId>org.jboss.webbeans</groupId>
                 <artifactId>webbeans-osgi-bundle</artifactId>
                 <version>${webbeans.version}</version>

Property changes on: extras\osgi-container
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: extras\embedded-shell
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: web\web-ajp
___________________________________________________________________
Name: svn:ignore
   + target


Index: web/admin/src/main/java/org/glassfish/web/admin/monitor/JspProbeProvider.java
===================================================================
--- web/admin/src/main/java/org/glassfish/web/admin/monitor/JspProbeProvider.java	(revision 29285)
+++ web/admin/src/main/java/org/glassfish/web/admin/monitor/JspProbeProvider.java	(working copy)
@@ -37,9 +37,9 @@
 package org.glassfish.web.admin.monitor;
 
 import javax.servlet.Servlet;
-import org.glassfish.probe.provider.annotations.Probe;
-import org.glassfish.probe.provider.annotations.ProbeParam;
-import org.glassfish.probe.provider.annotations.ProbeProvider;
+import org.glassfish.external.probe.provider.annotations.Probe;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeProvider;
 
 /**
  * Provider interface for JSP related probes.
Index: web/admin/src/main/java/org/glassfish/web/admin/monitor/WebRequestStatsProvider.java
===================================================================
--- web/admin/src/main/java/org/glassfish/web/admin/monitor/WebRequestStatsProvider.java	(revision 29285)
+++ web/admin/src/main/java/org/glassfish/web/admin/monitor/WebRequestStatsProvider.java	(working copy)
@@ -38,14 +38,14 @@
 import java.util.logging.Logger;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.glassfish.api.statistics.CountStatistic;
-import org.glassfish.api.statistics.TimeStatistic;
-import org.glassfish.api.statistics.impl.CountStatisticImpl;
-import org.glassfish.api.statistics.impl.TimeStatisticImpl;
+import org.glassfish.external.statistics.CountStatistic;
+import org.glassfish.external.statistics.TimeStatistic;
+import org.glassfish.external.statistics.impl.CountStatisticImpl;
+import org.glassfish.external.statistics.impl.TimeStatisticImpl;
 import org.glassfish.flashlight.statistics.*;
 import org.glassfish.flashlight.statistics.factory.CounterFactory;
 import org.glassfish.flashlight.statistics.factory.TimeStatsFactory;
-import org.glassfish.probe.provider.annotations.*;
+import org.glassfish.external.probe.provider.annotations.*;
 import org.glassfish.gmbal.Description;
 import org.glassfish.gmbal.ManagedObject;
 import org.glassfish.gmbal.ManagedAttribute;
Index: web/admin/src/main/java/org/glassfish/web/admin/monitor/WebStatsProviderBootstrap.java
===================================================================
--- web/admin/src/main/java/org/glassfish/web/admin/monitor/WebStatsProviderBootstrap.java	(revision 29285)
+++ web/admin/src/main/java/org/glassfish/web/admin/monitor/WebStatsProviderBootstrap.java	(working copy)
@@ -29,8 +29,8 @@
 import org.glassfish.api.monitoring.TelemetryProvider;
 import org.glassfish.flashlight.datatree.TreeNode;
 import org.glassfish.flashlight.datatree.factory.TreeNodeFactory;
-import org.glassfish.probe.provider.PluginPoint;
-import org.glassfish.probe.provider.StatsProviderManager;
+import org.glassfish.external.probe.provider.PluginPoint;
+import org.glassfish.external.probe.provider.StatsProviderManager;
 import org.jvnet.hk2.annotations.Inject;
 import org.jvnet.hk2.annotations.Scoped;
 import org.jvnet.hk2.annotations.Service;
Index: web/admin/src/main/java/org/glassfish/web/admin/monitor/WebModuleProbeProvider.java
===================================================================
--- web/admin/src/main/java/org/glassfish/web/admin/monitor/WebModuleProbeProvider.java	(revision 29285)
+++ web/admin/src/main/java/org/glassfish/web/admin/monitor/WebModuleProbeProvider.java	(working copy)
@@ -36,9 +36,9 @@
 
 package org.glassfish.web.admin.monitor;
 
-import org.glassfish.probe.provider.annotations.Probe;
-import org.glassfish.probe.provider.annotations.ProbeParam;
-import org.glassfish.probe.provider.annotations.ProbeProvider;
+import org.glassfish.external.probe.provider.annotations.Probe;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeProvider;
 
 /**
  * Provider interface for web module lifecycle related probe events.
Index: web/admin/src/main/java/org/glassfish/web/admin/monitor/SessionProbeProvider.java
===================================================================
--- web/admin/src/main/java/org/glassfish/web/admin/monitor/SessionProbeProvider.java	(revision 29285)
+++ web/admin/src/main/java/org/glassfish/web/admin/monitor/SessionProbeProvider.java	(working copy)
@@ -37,9 +37,9 @@
 package org.glassfish.web.admin.monitor;
 
 import javax.servlet.http.HttpSession;
-import org.glassfish.probe.provider.annotations.Probe;
-import org.glassfish.probe.provider.annotations.ProbeParam;
-import org.glassfish.probe.provider.annotations.ProbeProvider;
+import org.glassfish.external.probe.provider.annotations.Probe;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeProvider;
 
 /**
  * Provider interface for HTTP session related probes.
Index: web/admin/src/main/java/org/glassfish/web/admin/monitor/JspStatsProvider.java
===================================================================
--- web/admin/src/main/java/org/glassfish/web/admin/monitor/JspStatsProvider.java	(revision 29285)
+++ web/admin/src/main/java/org/glassfish/web/admin/monitor/JspStatsProvider.java	(working copy)
@@ -37,9 +37,9 @@
 
 import java.util.logging.Logger;
 import javax.servlet.Servlet;
-import org.glassfish.api.statistics.CountStatistic;
-import org.glassfish.api.statistics.impl.CountStatisticImpl;
-import org.glassfish.probe.provider.annotations.*;
+import org.glassfish.external.statistics.CountStatistic;
+import org.glassfish.external.statistics.impl.CountStatisticImpl;
+import org.glassfish.external.probe.provider.annotations.*;
 import org.glassfish.gmbal.Description;
 import org.glassfish.gmbal.ManagedAttribute;
 import org.glassfish.gmbal.ManagedObject;
@@ -89,9 +89,10 @@
         @ProbeParam("appName") String appName,
         @ProbeParam("hostName") String hostName) {
 	// handle the servlet loaded probe events
-        logger.finest("JSP Loaded event received - jspName = " + 
-                             jsp.getServletConfig().getServletName() + 
-                             ": appName = " + appName + ": hostName = " + hostName);
+        //FIX jsp is null
+        //logger.finest("JSP Loaded event received - jspName = " +
+        //                     jsp.getServletConfig().getServletName() +
+        //                     ": appName = " + appName + ": hostName = " + hostName);
         if (!isValidEvent(appName, hostName)) {
             return;
         }
Index: web/admin/src/main/java/org/glassfish/web/admin/monitor/ServletProbeProvider.java
===================================================================
--- web/admin/src/main/java/org/glassfish/web/admin/monitor/ServletProbeProvider.java	(revision 29285)
+++ web/admin/src/main/java/org/glassfish/web/admin/monitor/ServletProbeProvider.java	(working copy)
@@ -38,9 +38,9 @@
 
 import java.security.Principal;
 import javax.servlet.Servlet;
-import org.glassfish.probe.provider.annotations.Probe;
-import org.glassfish.probe.provider.annotations.ProbeParam;
-import org.glassfish.probe.provider.annotations.ProbeProvider;
+import org.glassfish.external.probe.provider.annotations.Probe;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeProvider;
 
 /**
  * Provider interface for servlet related probes.
Index: web/admin/src/main/java/org/glassfish/web/admin/monitor/HttpServiceStatsProviderBootstrap.java
===================================================================
--- web/admin/src/main/java/org/glassfish/web/admin/monitor/HttpServiceStatsProviderBootstrap.java	(revision 29285)
+++ web/admin/src/main/java/org/glassfish/web/admin/monitor/HttpServiceStatsProviderBootstrap.java	(working copy)
@@ -23,8 +23,8 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.glassfish.probe.provider.PluginPoint;
-import org.glassfish.probe.provider.StatsProviderManager;
+import org.glassfish.external.probe.provider.PluginPoint;
+import org.glassfish.external.probe.provider.StatsProviderManager;
 
 /**
  *
Index: web/admin/src/main/java/org/glassfish/web/admin/monitor/statistics/WebModuleVirtualServerStatsImpl.java
===================================================================
--- web/admin/src/main/java/org/glassfish/web/admin/monitor/statistics/WebModuleVirtualServerStatsImpl.java	(revision 29285)
+++ web/admin/src/main/java/org/glassfish/web/admin/monitor/statistics/WebModuleVirtualServerStatsImpl.java	(working copy)
@@ -45,7 +45,7 @@
 import org.glassfish.j2ee.statistics.CountStatistic; 
 import org.glassfish.j2ee.statistics.TimeStatistic;
 import org.glassfish.j2ee.statistics.Stats;
-import org.glassfish.api.statistics.StringStatistic;
+import org.glassfish.external.statistics.StringStatistic;
 import org.glassfish.admin.monitor.cli.MonitorContract;
 import org.glassfish.flashlight.datatree.TreeNode;
 import org.glassfish.flashlight.MonitoringRuntimeDataRegistry;
Index: web/admin/src/main/java/org/glassfish/web/admin/monitor/HttpServiceStatsProvider.java
===================================================================
--- web/admin/src/main/java/org/glassfish/web/admin/monitor/HttpServiceStatsProvider.java	(revision 29285)
+++ web/admin/src/main/java/org/glassfish/web/admin/monitor/HttpServiceStatsProvider.java	(working copy)
@@ -39,13 +39,13 @@
 import java.util.logging.Logger;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.glassfish.api.statistics.CountStatistic;
-import org.glassfish.api.statistics.TimeStatistic;
-import org.glassfish.api.statistics.impl.CountStatisticImpl;
-import org.glassfish.api.statistics.impl.TimeStatisticImpl;
+import org.glassfish.external.statistics.CountStatistic;
+import org.glassfish.external.statistics.TimeStatistic;
+import org.glassfish.external.statistics.impl.CountStatisticImpl;
+import org.glassfish.external.statistics.impl.TimeStatisticImpl;
 import org.glassfish.flashlight.statistics.*;
 import org.glassfish.flashlight.statistics.factory.TimeStatsFactory;
-import org.glassfish.probe.provider.annotations.*;
+import org.glassfish.external.probe.provider.annotations.*;
 import org.glassfish.gmbal.Description;
 import org.glassfish.gmbal.ManagedAttribute;
 import org.glassfish.gmbal.ManagedObject;
Index: web/admin/src/main/java/org/glassfish/web/admin/monitor/RequestProbeProvider.java
===================================================================
--- web/admin/src/main/java/org/glassfish/web/admin/monitor/RequestProbeProvider.java	(revision 29285)
+++ web/admin/src/main/java/org/glassfish/web/admin/monitor/RequestProbeProvider.java	(working copy)
@@ -39,7 +39,7 @@
 import java.security.Principal;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.glassfish.probe.provider.annotations.*;
+import org.glassfish.external.probe.provider.annotations.*;
 
 /**
  * Provider interface for HTTP request/response related probes.
Index: web/admin/src/main/java/org/glassfish/web/admin/monitor/SessionStatsProvider.java
===================================================================
--- web/admin/src/main/java/org/glassfish/web/admin/monitor/SessionStatsProvider.java	(revision 29285)
+++ web/admin/src/main/java/org/glassfish/web/admin/monitor/SessionStatsProvider.java	(working copy)
@@ -37,9 +37,9 @@
 
 import java.util.logging.Logger;
 import javax.servlet.http.HttpSession;
-import org.glassfish.api.statistics.CountStatistic;
-import org.glassfish.api.statistics.impl.CountStatisticImpl;
-import org.glassfish.probe.provider.annotations.*;
+import org.glassfish.external.statistics.CountStatistic;
+import org.glassfish.external.statistics.impl.CountStatisticImpl;
+import org.glassfish.external.probe.provider.annotations.*;
 import org.glassfish.gmbal.Description;
 import org.glassfish.gmbal.ManagedAttribute;
 import org.glassfish.gmbal.ManagedObject;
Index: web/admin/src/main/java/org/glassfish/web/admin/monitor/ServletStatsProvider.java
===================================================================
--- web/admin/src/main/java/org/glassfish/web/admin/monitor/ServletStatsProvider.java	(revision 29285)
+++ web/admin/src/main/java/org/glassfish/web/admin/monitor/ServletStatsProvider.java	(working copy)
@@ -37,9 +37,9 @@
 
 import java.util.logging.Logger;
 import javax.servlet.Servlet;
-import org.glassfish.api.statistics.CountStatistic;
-import org.glassfish.api.statistics.impl.CountStatisticImpl;
-import org.glassfish.probe.provider.annotations.*;
+import org.glassfish.external.statistics.CountStatistic;
+import org.glassfish.external.statistics.impl.CountStatisticImpl;
+import org.glassfish.external.probe.provider.annotations.*;
 import org.glassfish.gmbal.Description;
 import org.glassfish.gmbal.ManagedAttribute;
 import org.glassfish.gmbal.ManagedObject;
Index: web/admin/pom.xml
===================================================================
--- web/admin/pom.xml	(revision 29285)
+++ web/admin/pom.xml	(working copy)
@@ -92,11 +92,6 @@
     
     <dependencies>
 		
-         <dependency>
-            <groupId>org.glassfish.flashlight</groupId>
-            <artifactId>flashlight-framework</artifactId>
-            <version>${project.version}</version>
-        </dependency>
 	<dependency>
             <groupId>org.glassfish.admin</groupId>
             <artifactId>monitoring-core</artifactId>
@@ -122,11 +117,6 @@
         </dependency>
         <dependency>
             <groupId>org.glassfish.common</groupId>
-            <artifactId>glassfish-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.common</groupId>
             <artifactId>container-common</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
@@ -141,8 +131,8 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.provider</groupId>
-            <artifactId>gfprobe-provider-client</artifactId>
+            <groupId>org.glassfish.external</groupId>
+            <artifactId>management-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.glassfish.gmbal</groupId>

Property changes on: web\jspcaching-connector
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: web\jstl-connector
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: web\webbeans-integration
___________________________________________________________________
Name: svn:ignore
   + target


Index: packager/glassfish-nucleus/pom.xml
===================================================================
--- packager/glassfish-nucleus/pom.xml	(revision 29285)
+++ packager/glassfish-nucleus/pom.xml	(working copy)
@@ -152,11 +152,17 @@
            <version>3.0-Prelude</version>
 	   <type>distribution-fragment</type>
        </dependency> 
+       <!-- Remove gfprobe-provider-client when all external modules are using management-api instead -->
        <dependency>
             <groupId>org.glassfish.provider</groupId>
             <artifactId>gfprobe-provider-client</artifactId>
+            <version>3.0.0-b008</version>
        </dependency>
-            <dependency>
+       <dependency>
+	    <groupId>org.glassfish.external</groupId>
+	    <artifactId>management-api</artifactId>
+	 </dependency>
+       <dependency>
             <groupId>org.glassfish.flashlight</groupId>
             <artifactId>flashlight-framework</artifactId>
             <version>${project.version}</version>

Property changes on: packager\external\jmxremote_optional
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: packager\external\antlr
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: packager\external\ant
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: packager\external\ldapbp
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: packager\external\commons-codec
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: packager\external\asm-all
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: packager\external\dbschema
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: packager\external\apache-commons
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: packager\external\schema2beans
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: packager\external\sysnet-registration
___________________________________________________________________
Name: svn:ignore
   + target


Index: webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServicesContainer.java
===================================================================
--- webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServicesContainer.java	(revision 29285)
+++ webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServicesContainer.java	(working copy)
@@ -26,8 +26,8 @@
 
 import org.glassfish.api.container.Container;
 import org.glassfish.api.deployment.Deployer;
-import org.glassfish.probe.provider.StatsProviderManager;
-import org.glassfish.probe.provider.PluginPoint;
+import org.glassfish.external.probe.provider.StatsProviderManager;
+import org.glassfish.external.probe.provider.PluginPoint;
 import org.glassfish.webservices.monitoring.Deployment109StatsProvider;
 import org.jvnet.hk2.annotations.Service;
 import org.jvnet.hk2.component.PostConstruct;
Index: webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/Deployment109StatsProvider.java
===================================================================
--- webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/Deployment109StatsProvider.java	(revision 29285)
+++ webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/Deployment109StatsProvider.java	(working copy)
@@ -3,8 +3,8 @@
 import org.glassfish.gmbal.ManagedObject;
 import org.glassfish.gmbal.ManagedAttribute;
 import org.glassfish.gmbal.Description;
-import org.glassfish.probe.provider.annotations.ProbeListener;
-import org.glassfish.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeListener;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
 
 import java.util.Collection;
 import java.util.Collections;
Index: webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/Deployment109ProbeProvider.java
===================================================================
--- webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/Deployment109ProbeProvider.java	(revision 29285)
+++ webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/Deployment109ProbeProvider.java	(working copy)
@@ -1,8 +1,8 @@
 package org.glassfish.webservices.monitoring;
 
-import org.glassfish.probe.provider.annotations.ProbeProvider;
-import org.glassfish.probe.provider.annotations.Probe;
-import org.glassfish.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeProvider;
+import org.glassfish.external.probe.provider.annotations.Probe;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
 
 /**
  * 109 deployment probe. A registered listener get to listen the emited

Property changes on: transaction\jts
___________________________________________________________________
Name: svn:ignore
   + target


Index: transaction/jta/src/main/java/com/sun/enterprise/transaction/JavaEETransactionManagerSimplified.java
===================================================================
--- transaction/jta/src/main/java/com/sun/enterprise/transaction/JavaEETransactionManagerSimplified.java	(revision 29285)
+++ transaction/jta/src/main/java/com/sun/enterprise/transaction/JavaEETransactionManagerSimplified.java	(working copy)
@@ -75,8 +75,8 @@
 import org.glassfish.api.invocation.InvocationException;
 import org.glassfish.api.invocation.ResourceHandler;
 
-import org.glassfish.probe.provider.PluginPoint;
-import org.glassfish.probe.provider.StatsProviderManager;
+import org.glassfish.external.probe.provider.PluginPoint;
+import org.glassfish.external.probe.provider.StatsProviderManager;
 
 import com.sun.enterprise.config.serverbeans.TransactionService;
 import com.sun.enterprise.config.serverbeans.ServerTags;
Index: transaction/jta/src/main/java/com/sun/enterprise/transaction/monitoring/TransactionServiceStatsProvider.java
===================================================================
--- transaction/jta/src/main/java/com/sun/enterprise/transaction/monitoring/TransactionServiceStatsProvider.java	(revision 29285)
+++ transaction/jta/src/main/java/com/sun/enterprise/transaction/monitoring/TransactionServiceStatsProvider.java	(working copy)
@@ -35,9 +35,10 @@
  */
 package com.sun.enterprise.transaction.monitoring;
 
-import org.glassfish.api.statistics.CountStatistic;
-import org.glassfish.api.statistics.impl.CountStatisticImpl;
-import org.glassfish.probe.provider.annotations.*;
+import org.glassfish.external.statistics.CountStatistic;
+import org.glassfish.external.statistics.impl.CountStatisticImpl;
+import org.glassfish.external.probe.provider.annotations.*;
+import org.glassfish.gmbal.AMXMetadata;
 import org.glassfish.gmbal.Description;
 import org.glassfish.gmbal.ManagedAttribute;
 import org.glassfish.gmbal.ManagedObject;
@@ -47,6 +48,7 @@
  *
  * @author Marina Vatkina
  */
+//@AMXMetadata(type="transaction-service-mon", group="monitoring", isSingleton=true)
 @ManagedObject
 @Description("Transaction Service Statistics")
 public class TransactionServiceStatsProvider {
Index: transaction/jta/src/main/java/com/sun/enterprise/transaction/monitoring/TransactionServiceProbeProvider.java
===================================================================
--- transaction/jta/src/main/java/com/sun/enterprise/transaction/monitoring/TransactionServiceProbeProvider.java	(revision 29285)
+++ transaction/jta/src/main/java/com/sun/enterprise/transaction/monitoring/TransactionServiceProbeProvider.java	(working copy)
@@ -35,7 +35,7 @@
  */
 package com.sun.enterprise.transaction.monitoring;
 
-import org.glassfish.probe.provider.annotations.*;
+import org.glassfish.external.probe.provider.annotations.*;
 import org.glassfish.gmbal.Description;
 
 /**
Index: transaction/jta/pom.xml
===================================================================
--- transaction/jta/pom.xml	(revision 29285)
+++ transaction/jta/pom.xml	(working copy)
@@ -86,9 +86,13 @@
             <version>${project.parent.version}</version>
         </dependency>
         <dependency>
-           <groupId>org.glassfish.provider</groupId>
-           <artifactId>gfprobe-provider-client</artifactId>
-       </dependency>
+	    <groupId>org.glassfish.external</groupId>
+	    <artifactId>management-api</artifactId>
+	 </dependency>
+	 <dependency>
+	    <groupId>org.glassfish.gmbal</groupId>
+	    <artifactId>gmbal</artifactId>
+        </dependency>
 
     </dependencies>
 </project>

Property changes on: flashlight\extra-jdk-packages
___________________________________________________________________
Name: svn:ignore
   + target


Index: flashlight/framework/src/main/java/org/glassfish/flashlight/impl/provider/FlashlightProbeProviderFactory.java
===================================================================
--- flashlight/framework/src/main/java/org/glassfish/flashlight/impl/provider/FlashlightProbeProviderFactory.java	(revision 29285)
+++ flashlight/framework/src/main/java/org/glassfish/flashlight/impl/provider/FlashlightProbeProviderFactory.java	(working copy)
@@ -42,8 +42,9 @@
 import org.glassfish.flashlight.provider.ProbeProviderFactory;
 import org.jvnet.hk2.annotations.Service;
 import org.jvnet.hk2.annotations.Inject;
-
+//REMOVE: Remove old probe.provider package when management-api integration complete with external modules
 import org.glassfish.probe.provider.annotations.*;
+import org.glassfish.external.probe.provider.annotations.*;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -86,10 +87,22 @@
     public <T> T getProbeProvider(Class<T> providerClazz)
             throws InstantiationException, IllegalAccessException {
         //TODO: check for null and generate default names
-        ProbeProvider provAnn = providerClazz.getAnnotation(ProbeProvider.class);
-        return getProbeProvider(provAnn.moduleProviderName(), provAnn.moduleName(),
+        org.glassfish.external.probe.provider.annotations.ProbeProvider provAnn = providerClazz.getAnnotation(org.glassfish.external.probe.provider.annotations.ProbeProvider.class);
+        if (provAnn != null) {
+            return getProbeProvider(provAnn.moduleProviderName(), provAnn.moduleName(),
                                 provAnn.probeProviderName(),
                                 providerClazz);
+        } else {
+            //REMOVE: Remove old probe.provider package when management-api integration complete with external modules
+            org.glassfish.probe.provider.annotations.ProbeProvider provAnnOLD = providerClazz.getAnnotation(org.glassfish.probe.provider.annotations.ProbeProvider.class);
+            return getProbeProvider(provAnnOLD.moduleProviderName(), provAnnOLD.moduleName(),
+                                provAnnOLD.probeProviderName(),
+                                providerClazz);
+        }
+
+        //return getProbeProvider(provAnn.moduleProviderName(), provAnn.moduleName(),
+        //                        provAnn.probeProviderName(),
+        //                        providerClazz);
     }
 
     public <T> T getProbeProvider(String moduleProviderName, String moduleName,
@@ -104,19 +117,37 @@
             //		+ "\tProbeProviderName= " + probeProviderName + "\tProviderClazz= " + providerClazz.toString());
             for (Method m : providerClazz.getDeclaredMethods()) {
                 int sz = m.getParameterTypes().length;
-                Probe pnameAnn = m.getAnnotation(Probe.class);
-                String probeName = (pnameAnn != null) 
+                String probeName = null;
+                org.glassfish.external.probe.provider.annotations.Probe pnameAnn =
+                    m.getAnnotation(org.glassfish.external.probe.provider.annotations.Probe.class);
+                if (pnameAnn != null) {
+                    probeName = (pnameAnn != null)
                         ? pnameAnn.name() : m.getName();
+                } else {
+                    //REMOVE: Remove old probe.provider package when management-api integration complete with external modules
+                    org.glassfish.probe.provider.annotations.Probe pnameAnnOLD =
+                    m.getAnnotation(org.glassfish.probe.provider.annotations.Probe.class);
+                    probeName = (pnameAnnOLD != null)
+                        ? pnameAnnOLD.name() : m.getName();
+                }
+                //String probeName = (pnameAnn != null)
+                //        ? pnameAnn.name() : m.getName();
                 String[] probeParamNames = new String[sz];
                 int index = 0;
                 Annotation[][] anns2 = m.getParameterAnnotations();
                 for (Annotation[] ann1 : anns2) {
                     for (Annotation ann : ann1) {
-                        if (ann instanceof ProbeParam) {
-                            ProbeParam pParam = (ProbeParam) ann;
+                        if (ann instanceof org.glassfish.external.probe.provider.annotations.ProbeParam) {
+                            org.glassfish.external.probe.provider.annotations.ProbeParam pParam = (org.glassfish.external.probe.provider.annotations.ProbeParam) ann;
                             probeParamNames[index++] = pParam.value();
                             break;
                         }
+                        //REMOVE: Remove old probe.provider package when management-api integration complete with external modules
+                        if (ann instanceof org.glassfish.probe.provider.annotations.ProbeParam) {
+                            org.glassfish.probe.provider.annotations.ProbeParam pParam = (org.glassfish.probe.provider.annotations.ProbeParam) ann;
+                            probeParamNames[index++] = pParam.value();
+                            break;
+                        }
                     }
                 }
 
Index: flashlight/framework/src/main/java/org/glassfish/flashlight/impl/client/FlashlightProbeClientMediator.java
===================================================================
--- flashlight/framework/src/main/java/org/glassfish/flashlight/impl/client/FlashlightProbeClientMediator.java	(revision 29285)
+++ flashlight/framework/src/main/java/org/glassfish/flashlight/impl/client/FlashlightProbeClientMediator.java	(working copy)
@@ -43,7 +43,7 @@
 import org.glassfish.flashlight.client.*;
 import org.glassfish.flashlight.provider.FlashlightProbe;
 import org.glassfish.flashlight.provider.ProbeRegistry;
-import org.glassfish.probe.provider.annotations.ProbeListener;
+import org.glassfish.external.probe.provider.annotations.ProbeListener;
 import org.jvnet.hk2.annotations.Service;
 import org.jvnet.hk2.component.PostConstruct;
 
Index: flashlight/framework/src/main/java/org/glassfish/flashlight/client/EjbContainerListener.java
===================================================================
--- flashlight/framework/src/main/java/org/glassfish/flashlight/client/EjbContainerListener.java	(revision 29285)
+++ flashlight/framework/src/main/java/org/glassfish/flashlight/client/EjbContainerListener.java	(working copy)
@@ -1,6 +1,6 @@
 package org.glassfish.flashlight.client;
 
-import org.glassfish.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
 
 import java.lang.reflect.Method;
 
Index: flashlight/framework/src/main/java/org/glassfish/flashlight/client/ProbeClientInvokerFactory.java
===================================================================
--- flashlight/framework/src/main/java/org/glassfish/flashlight/client/ProbeClientInvokerFactory.java	(revision 29285)
+++ flashlight/framework/src/main/java/org/glassfish/flashlight/client/ProbeClientInvokerFactory.java	(working copy)
@@ -38,7 +38,7 @@
 
 import org.glassfish.flashlight.impl.client.ReflectiveClientInvoker;
 import org.glassfish.flashlight.provider.FlashlightProbe;
-import org.glassfish.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
 import org.jvnet.hk2.annotations.Service;
 
 import java.lang.annotation.Annotation;
Index: flashlight/framework/src/main/java/org/glassfish/flashlight/client/EjbContainerProvider.java
===================================================================
--- flashlight/framework/src/main/java/org/glassfish/flashlight/client/EjbContainerProvider.java	(revision 29285)
+++ flashlight/framework/src/main/java/org/glassfish/flashlight/client/EjbContainerProvider.java	(working copy)
@@ -1,7 +1,7 @@
 package org.glassfish.flashlight.client;
 
-import org.glassfish.probe.provider.annotations.Probe;
-import org.glassfish.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.Probe;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
 
 import java.lang.reflect.Method;
 

Property changes on: flashlight\agent
___________________________________________________________________
Name: svn:ignore
   + target


Index: flashlight/agent/pom.xml
===================================================================
--- flashlight/agent/pom.xml	(revision 29285)
+++ flashlight/agent/pom.xml	(working copy)
@@ -1,58 +1,64 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/* 
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. 
-* 
-* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. 
-* 
-* The contents of this file are subject to the terms of either the GNU 
-* General Public License Version 2 only ("GPL") or the Common Development 
-* and Distribution License("CDDL") (collectively, the "License").  You 
-* may not use this file except in compliance with the License. You can obtain 
-* a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html 
-* or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific 
-* language governing permissions and limitations under the License. 
-* 
-* When distributing the software, include this License Header Notice in each 
-* file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. 
-* Sun designates this particular file as subject to the "Classpath" exception 
-* as provided by Sun in the GPL Version 2 section of the License file that 
-* accompanied this code.  If applicable, add the following below the License 
-* Header, with the fields enclosed by brackets [] replaced by your own 
-* identifying information: "Portions Copyrighted [year] 
-* [name of copyright owner]" 
-* 
-* Contributor(s): 
-* 
-* If you wish your version of this file to be governed by only the CDDL or 
-* only the GPL Version 2, indicate your decision by adding "[Contributor] 
-* elects to include this software in this distribution under the [CDDL or GPL 
-* Version 2] license."  If you don't indicate a single choice of license, a 
-* recipient has the option to distribute your version of this file under 
-* either the CDDL, the GPL Version 2 or to extend the choice of license to 
-* its licensees as provided above.  However, if you add GPL Version 2 code 
-* and therefore, elected the GPL Version 2 license, then the option applies 
-* only if the new code is made subject to such option by the copyright 
-* holder. 
-*/ 
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.glassfish.common</groupId>
-        <artifactId>common</artifactId>
-        <version>3.0-SNAPSHOT</version>
-    </parent>
-    <groupId>org.glassfish.flashlight</groupId>
-    <artifactId>flashlight-agent</artifactId>
-    <packaging>hk2-jar</packaging>
-    <name>GlassFish Flashlight Agent</name>
-            <dependencies>
-            <dependency>
-                <groupId>org.glassfish.provider</groupId>
-                <artifactId>gfprobe-provider-client</artifactId>
-            </dependency>
-
-            </dependencies>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/* 
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. 
+* 
+* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. 
+* 
+* The contents of this file are subject to the terms of either the GNU 
+* General Public License Version 2 only ("GPL") or the Common Development 
+* and Distribution License("CDDL") (collectively, the "License").  You 
+* may not use this file except in compliance with the License. You can obtain 
+* a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html 
+* or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific 
+* language governing permissions and limitations under the License. 
+* 
+* When distributing the software, include this License Header Notice in each 
+* file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. 
+* Sun designates this particular file as subject to the "Classpath" exception 
+* as provided by Sun in the GPL Version 2 section of the License file that 
+* accompanied this code.  If applicable, add the following below the License 
+* Header, with the fields enclosed by brackets [] replaced by your own 
+* identifying information: "Portions Copyrighted [year] 
+* [name of copyright owner]" 
+* 
+* Contributor(s): 
+* 
+* If you wish your version of this file to be governed by only the CDDL or 
+* only the GPL Version 2, indicate your decision by adding "[Contributor] 
+* elects to include this software in this distribution under the [CDDL or GPL 
+* Version 2] license."  If you don't indicate a single choice of license, a 
+* recipient has the option to distribute your version of this file under 
+* either the CDDL, the GPL Version 2 or to extend the choice of license to 
+* its licensees as provided above.  However, if you add GPL Version 2 code 
+* and therefore, elected the GPL Version 2 license, then the option applies 
+* only if the new code is made subject to such option by the copyright 
+* holder. 
+*/ 
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.glassfish.common</groupId>
+        <artifactId>common</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+    <groupId>org.glassfish.flashlight</groupId>
+    <artifactId>flashlight-agent</artifactId>
+    <packaging>hk2-jar</packaging>
+    <name>GlassFish Flashlight Agent</name>
+            <dependencies>
+            <!-- Remove gfprobe-provider-client when all external modules are using management-api instead -->
+            <dependency>
+                <groupId>org.glassfish.provider</groupId>
+                <artifactId>gfprobe-provider-client</artifactId>
+                <version>3.0.0-b008</version>
+            </dependency>
+            <dependency>
+	            <groupId>org.glassfish.external</groupId>
+	            <artifactId>management-api</artifactId>
+	        </dependency>
+
+            </dependencies>
+</project>

Property changes on: flashlight\client
___________________________________________________________________
Name: svn:ignore
   + target


Index: flashlight/client/src/main/java/org/glassfish/flashlight/client/ProbeClient.java
===================================================================
--- flashlight/client/src/main/java/org/glassfish/flashlight/client/ProbeClient.java	(revision 29285)
+++ flashlight/client/src/main/java/org/glassfish/flashlight/client/ProbeClient.java	(working copy)
@@ -35,8 +35,8 @@
  */
 package org.glassfish.flashlight.client;
 
-import org.glassfish.probe.provider.annotations.ProbeListener;
-import org.glassfish.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeListener;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
 
 /**
  * @author Mahesh Kannan
Index: admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderManagerDelegateImpl.java
===================================================================
--- admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderManagerDelegateImpl.java	(revision 29285)
+++ admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderManagerDelegateImpl.java	(working copy)
@@ -12,22 +12,25 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import javax.management.ObjectName;
+import javax.management.MBeanServer;
 import org.glassfish.api.amx.MBeanListener;
 import org.glassfish.flashlight.datatree.TreeNode;
 import org.glassfish.flashlight.datatree.factory.TreeNodeFactory;
 import org.glassfish.gmbal.ManagedObjectManager;
 import org.glassfish.gmbal.ManagedObjectManagerFactory;
 import org.glassfish.gmbal.ManagedAttribute;
-import org.glassfish.probe.provider.PluginPoint;
-import org.glassfish.probe.provider.StatsProviderManagerDelegate;
+import org.glassfish.external.probe.provider.PluginPoint;
+import org.glassfish.external.probe.provider.StatsProviderManagerDelegate;
 import org.glassfish.flashlight.MonitoringRuntimeDataRegistry;
 import com.sun.enterprise.config.serverbeans.*;
+import java.lang.management.ManagementFactory;
 import org.glassfish.flashlight.client.ProbeClientMediator;
 import org.glassfish.flashlight.client.ProbeClientMethodHandle;
 import org.jvnet.hk2.annotations.Scoped;
 import org.jvnet.hk2.component.Singleton;
 
 import org.glassfish.api.amx.AMXValues;
+import org.glassfish.api.amx.AMXUtil;
 
 /**
  *
@@ -43,6 +46,12 @@
     private final TreeNode serverNode;
     private static final ObjectName MONITORING_ROOT = AMXValues.monitoringRoot();
     static final ObjectName MONITORING_SERVER = AMXValues.serverMon( AMXValues.dasName() );
+    private static final String DOMAIN = MONITORING_SERVER.getDomain();
+    private static final String PP = MONITORING_SERVER.getKeyProperty(AMXValues.PARENT_PATH_KEY);
+    private static final String TYPE = MONITORING_SERVER.getKeyProperty(AMXValues.TYPE_KEY);
+    private static final String NAME = MONITORING_SERVER.getKeyProperty(AMXValues.NAME_KEY);
+    private static final String PARENT_PATH = PP + "/" + TYPE + "[" + NAME + "]" ;
+    private static final MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer();
     private boolean AMXReady = false;
     private StatsProviderRegistry statsProviderRegistry;
 
@@ -113,7 +122,7 @@
             if (AMXReady) {
                 ManagedObjectManager mom = registerGmbal(statsProvider, subTreePath);
                 //Make an entry to my own registry so I can manage the unregister, enable and disable
-                statsProviderRegistry.registerStatsProvider(configElement, 
+                statsProviderRegistry.registerStatsProvider(configElement,
                         parentNode.getCompletePathName(), childNodeNames,
                         handles, statsProvider, subTreePath, mom);
             } else {
@@ -135,16 +144,22 @@
         }
     }
 
-    public void unRegister(Object statsProvider) {
+    public void unregister(Object statsProvider) {
         try {
             //Unregister from the MonitoringDataTreeRegistry and gmbal
             statsProviderRegistry.unregisterStatsProvider(statsProvider);
         } catch (Exception ex) {
             Logger.getLogger(StatsProviderManagerDelegateImpl.class.getName()).log(Level.SEVERE, null, ex);
         }
-        
+
     }
 
+    public boolean hasListeners(String probeStr) {
+		boolean hasListeners = false;
+		//TODO implmentation
+		return hasListeners;
+	}
+
     //Called when AMX DomainRoot is loaded (when jconsole or gui is started)
     //Register statsProviders with gmbal whose configElement is enabled
     //Save mom in the spre.  Used in unregister with gmbal later for config change to OFF or undeploy
@@ -173,11 +188,13 @@
             // 1 mom per statsProvider
             mom = ManagedObjectManagerFactory.createFederated(MONITORING_SERVER);
             if (mom != null) {
-                mom.stripPackagePrefix();
-                if (mbeanName != null && !mbeanName.isEmpty()) {
-                    mom.createRoot(statsProvider, mbeanName);
-                } else {
-                    mom.createRoot(statsProvider);
+                if (!isMBeanRegistered(statsProvider, mbeanName)) {
+                    mom.stripPackagePrefix();
+                    if (mbeanName != null && !mbeanName.isEmpty()) {
+                        mom.createRoot(statsProvider, mbeanName);
+                    } else {
+                        mom.createRoot(statsProvider);
+                    }
                 }
             }
             //To register hierarchy in mom specify parent ManagedObject, and the ManagedObject itself
@@ -306,4 +323,37 @@
         return enabled;
     }
 
+    public boolean isStatsProviderRegistered(Object statsProvider, String subTreePath) {
+        boolean isStatsProviderRegistered = false;
+        Collection<StatsProviderRegistry.StatsProviderRegistryElement> spreList = statsProviderRegistry.getSpreList();
+        for (StatsProviderRegistry.StatsProviderRegistryElement spre : spreList) {
+            if (spre.getStatsProvider().equals(statsProvider) && spre.getMBeanName().equals(statsProvider)) {
+                isStatsProviderRegistered = true;
+            }
+        }
+        return isStatsProviderRegistered;
+    }
+
+    public boolean isMBeanRegistered(Object statsProvider, String subTreePath) {
+        return isMBeanRegistered(getObjectName(statsProvider, subTreePath));
+    }
+
+    public boolean isMBeanRegistered(ObjectName objectName) {
+        return mbeanServer.isRegistered(objectName);
+    }
+
+    public ObjectName getObjectName(Object statsProvider, String subTreePath) {
+        String typeValue = getTypeValue(statsProvider);
+        String nameValue = getNameValue(subTreePath);
+        return AMXUtil.newObjectName(PARENT_PATH, typeValue, nameValue);
+    }
+
+    public String getTypeValue(Object statsProvider) {
+        return statsProvider.getClass().getSimpleName();
+    }
+
+    public String getNameValue(String subTreePath) {
+        return subTreePath;
+    }
+
 }
Index: admin/monitor/src/main/java/org/glassfish/admin/monitor/MonitoringBootstrap.java
===================================================================
--- admin/monitor/src/main/java/org/glassfish/admin/monitor/MonitoringBootstrap.java	(revision 29285)
+++ admin/monitor/src/main/java/org/glassfish/admin/monitor/MonitoringBootstrap.java	(working copy)
@@ -9,7 +9,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.jvnet.hk2.component.PostConstruct;
-import org.glassfish.probe.provider.StatsProviderManager;
+import org.glassfish.external.probe.provider.StatsProviderManager;
 import org.glassfish.api.Startup;
 import com.sun.enterprise.config.serverbeans.*;
 import org.glassfish.flashlight.MonitoringRuntimeDataRegistry;
Index: admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMMemoryStatsProvider.java
===================================================================
--- admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMMemoryStatsProvider.java	(revision 29285)
+++ admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMMemoryStatsProvider.java	(working copy)
@@ -39,11 +39,13 @@
 import java.lang.management.ManagementFactory;
 import java.lang.management.MemoryMXBean;
 import java.lang.management.MemoryUsage;
+import org.glassfish.gmbal.AMXMetadata;
 import org.glassfish.gmbal.Description;
 import org.glassfish.gmbal.ManagedAttribute;
 import org.glassfish.gmbal.ManagedObject;
 
 /* jvm.memory */
+//@AMXMetadata(type="memory-mon", group="monitoring", isSingleton=true)
 @ManagedObject
 @Description( "JVM Memory Statistics" )
 public class JVMMemoryStatsProvider {
Index: admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMGCStatsProvider.java
===================================================================
--- admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMGCStatsProvider.java	(revision 29285)
+++ admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMGCStatsProvider.java	(working copy)
@@ -40,14 +40,16 @@
 import java.lang.management.ManagementFactory;
 import java.util.List;
 import org.glassfish.gmbal.Description;
+import org.glassfish.gmbal.AMXMetadata;
 import org.glassfish.gmbal.ManagedAttribute;
 import org.glassfish.gmbal.ManagedObject;
 
 /* jvm.garbage-collectors */
+//@AMXMetadata(type="garbage-collector-mon", group="monitoring")
 @ManagedObject
 @Description( "JVM Garbage Collectors Statistics" )
 public class JVMGCStatsProvider {
-    
+
     private List<GarbageCollectorMXBean> gcBeanList = ManagementFactory.getGarbageCollectorMXBeans();
     private String gcName = null;
 
@@ -79,4 +81,5 @@
             }
         return times;
     }
+
 }
\ No newline at end of file
Index: admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMStatsProviderBootstrap.java
===================================================================
--- admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMStatsProviderBootstrap.java	(revision 29285)
+++ admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMStatsProviderBootstrap.java	(working copy)
@@ -16,8 +16,8 @@
 //import org.glassfish.api.event.EventListener.Event;
 //import org.glassfish.api.event.EventTypes;
 //import org.glassfish.api.event.RestrictTo;
-import org.glassfish.probe.provider.PluginPoint;
-import org.glassfish.probe.provider.StatsProviderManager;
+import org.glassfish.external.probe.provider.PluginPoint;
+import org.glassfish.external.probe.provider.StatsProviderManager;
 import org.jvnet.hk2.component.PostConstruct;
 import org.glassfish.api.Startup;
 
Index: admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMCompilationStatsProvider.java
===================================================================
--- admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMCompilationStatsProvider.java	(revision 29285)
+++ admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMCompilationStatsProvider.java	(working copy)
@@ -39,10 +39,12 @@
 import java.lang.management.CompilationMXBean;
 import java.lang.management.ManagementFactory;
 import org.glassfish.gmbal.Description;
+import org.glassfish.gmbal.AMXMetadata;
 import org.glassfish.gmbal.ManagedAttribute;
 import org.glassfish.gmbal.ManagedObject;
 
 /* jvm.compilation-system */
+//@AMXMetadata(type="compilation-system-mon", group="monitoring", isSingleton=true)
 @ManagedObject
 @Description( "JVM Compilation Statistics" )
 public class JVMCompilationStatsProvider {
Index: admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMOSStatsProvider.java
===================================================================
--- admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMOSStatsProvider.java	(revision 29285)
+++ admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMOSStatsProvider.java	(working copy)
@@ -38,11 +38,13 @@
 
 import java.lang.management.ManagementFactory;
 import java.lang.management.OperatingSystemMXBean;
+import org.glassfish.gmbal.AMXMetadata;
 import org.glassfish.gmbal.Description;
 import org.glassfish.gmbal.ManagedAttribute;
 import org.glassfish.gmbal.ManagedObject;
 
 /* jvm.operating-system */
+//@AMXMetadata(type="operating-system-mon", group="monitoring", isSingleton=true)
 @ManagedObject
 @Description( "JVM Operating System Statistics" )
 public class JVMOSStatsProvider {
@@ -71,5 +73,5 @@
     @Description( "operating system version" )
     public String getOSVersion() {
         return osBean.getVersion();
-    }   
+    }
 }
\ No newline at end of file
Index: admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMRuntimeStatsProvider.java
===================================================================
--- admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMRuntimeStatsProvider.java	(revision 29285)
+++ admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMRuntimeStatsProvider.java	(working copy)
@@ -39,11 +39,13 @@
 import java.lang.management.ManagementFactory;
 import java.lang.management.RuntimeMXBean;
 import java.util.List;
+import org.glassfish.gmbal.AMXMetadata;
 import org.glassfish.gmbal.Description;
 import org.glassfish.gmbal.ManagedAttribute;
 import org.glassfish.gmbal.ManagedObject;
 
 /* jvm.runtime */
+//@AMXMetadata(type="runtime-mon", group="monitoring", isSingleton=true)
 @ManagedObject
 @Description( "JVM Runtime Statistics" )
 public class JVMRuntimeStatsProvider {
Index: admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMClassLoadingStatsProvider.java
===================================================================
--- admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMClassLoadingStatsProvider.java	(revision 29285)
+++ admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMClassLoadingStatsProvider.java	(working copy)
@@ -38,11 +38,13 @@
 
 import java.lang.management.ClassLoadingMXBean;
 import java.lang.management.ManagementFactory;
+import org.glassfish.gmbal.AMXMetadata;
 import org.glassfish.gmbal.Description;
 import org.glassfish.gmbal.ManagedAttribute;
 import org.glassfish.gmbal.ManagedObject;
 
 /* jvm.class-loading-system */
+//@AMXMetadata(type="class-loading-system-mon", group="monitoring", isSingleton=true)
 @ManagedObject
 @Description( "JVM Class Loading Statistics" )
 public class JVMClassLoadingStatsProvider {
Index: admin/monitor/pom.xml
===================================================================
--- admin/monitor/pom.xml	(revision 29285)
+++ admin/monitor/pom.xml	(working copy)
@@ -114,8 +114,8 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.provider</groupId>
-            <artifactId>gfprobe-provider-client</artifactId>
+            <groupId>org.glassfish.external</groupId>
+            <artifactId>management-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.glassfish.gmbal</groupId>
Index: admin/cli-optional/pom.xml
===================================================================
--- admin/cli-optional/pom.xml	(revision 29285)
+++ admin/cli-optional/pom.xml	(working copy)
@@ -112,7 +112,7 @@
                     <archive>
                         <manifestEntries>
                                <!--<Class-Path>config-api.jar glassfish-api.jar kernel.jar internal-api.jar hk2.jar hk2-core.jar config.jar auto-depends.jar tiger-types-osgi.jar bean-validator.jar glassfish-api.jar grizzly-utils.jar gmbal.jar glassfish.jar</Class-Path>-->
-                               <Class-Path>jsr311-api.jar jersey-gf-bundle.jar amx-core-impl.jar amx-core.jar glassfish-api.jar hk2.jar hk2-corejar configjar auto-dependsjar tiger-types-osgijar bean-validator.jar grizzly-utils.jar gmbal.jar glassfish-mbeanserver.jar internal-api.jar config-api.jar common-util.jar javax.servlet.jar grizzly-config.jar osgi-adapterjar jmxremote_optional-repackaged.jar amx-config-impl.jar amx-config.jar amx-ext-impl.jar kernel.jar grizzly-framework.jar grizzly-http.jar grizzly-rcm.jar grizzly-portunif.jar deployment-common.jar asm-all-repackaged.jar pkg-client.jar flashlight-framework.jar flashlight-agent.jar gfprobe-provider-client.jar security.jar dol.jar javax.annotation.jar javax.transaction.jar javax.enterprise.deploy.jar javax.persistence.jar javax.resource.jar annotation-framework.jar javax.security.auth.message.jar javax.security.jacc.jar javax.ejb.jar ejb-internal-api.jar connectors-internal-api.jar transaction-internal-api.jar ldapbp-repackaged.jar grizzly-compat.jar grizzly-comet.jar grizzly-cometd.jar grizzly-messagesbus.jar servlet-api-2.5.jar glassfish-extra-jre-packages.jar api-exporter.jar glassfish.jar admin-cli.jar cli-framework.jar launcher.jar branding.jar deployment-admin.jar deployment-autodeploy.jar glassfish-ee-api.jar osgi-mainjar glassfish-corba-omgapi.jar container-common.jar glassfish-naming.jar orb-connector.jar javax.mail.jar osgi-container.jar grizzly-container.jar monitoring-core.jar stats77.jar deployment-client.jar deployment-javaee-core.jar inmemory.jacc.provider.jar ant.jar jaxb-osgi.jar jaxb-api-osgi.jar registration-api.jar registration-impl.jar sysnet-registration-repackaged.jar commons-codec-repackaged.jar glassfish-registration.jar cli-optional.jar server-mgmt.jar admin-util.jar extra-jdk-packages.jar rest-service.jar gf-client.jar gf-client-module.jar ejb-container.jar appclient.security.jar ejb.security.jar glassfish-corba-csiv2-idl.jar glassfish-corba-orb.jar glassfish-corba-orbgeneric.jar glassfish-corba-newtimer.jar glassfish-corba-codegen.jar glassfish-corba-asm.jar orb-iiop.jar acc-config.jar webservices.security.jar webservices-osgi.jar webservices-api-osgi.jar websecurity.jar web-core.jar apache-commons.jar war-util.jar javax.servlet.jsp.jar web-naming.jar jsr109-impl.jar web-glue.jar web-cli.jar amx-j2ee.jar javax.management.j2ee.jar jsp-impl.jar jsp-api.jar el-api.jar el-impl.jar admin-core.jar web-gui-plugin-common.jar grizzly-http-servlet.jar work-management.jar connectors-inbound-runtime.jar connectors-runtime.jar jts.jar jta.jar jms-core.jar javax.jms.jar org.eclipse.persistence.core.jar org.eclipse.persistence.jpa.jar org.eclipse.persistence.oracle.jar org.eclipse.persistence.antlr.jar org.eclipse.persistence.asm.jar jpa-connector.jar persistence-common.jar appclient-connector.jar appclient-server-core.jar cmp-utility.jar cmp-model.jar dbschema-repackaged.jar cmp-generator-database.jar cmp-ejb-mapping.jar schema2beans-repackaged.jar cmp-enhancer.jar cmp-support-sqlstore.jar antlr-repackaged.jar cmp-support-ejb.jar gf-connectors-connector.jar connectors-admin.jar glassfish-oracle-jdbc-driver-packages.jar jsf-api.jar jsf-impl.jar jstl-connector.jar jstl-impl.jar jstl-api.jar javax.servlet.jsp.jstl.jar jsf-connector.jar jspcaching-connector.jar gf-web-connector.jar web-ajp.jar web-embed-api.jar web-embed-impl.jar jdbc-admin.jar console-plugin-service.jar dataprovider.jar dataprovider.jar jsftemplating.jar console-common.jar console-security-plugin.jar webui-jsf-suntheme.jar webui-jsf.jar commons-fileupload.jar xml-apis.jar json.jar console-updatecenter-plugin.jar console-community-branding-plugin.jar console-web-plugin.jar console-jdbc-plugin.jar gf-ejb-connector.jar console-ejb-lite-plugin.jar deployment-javaee-full.jar amx-j2ee-impl.jar mejb.jar console-jms-plugin.jar jms-admin.jar console-ejb-plugin.jar console-corba-plugin.jar webbeans-integration.jar webbeans-osgi-bundle.jar jsr299-api.jar webbeans-api.jar webbeans-spi.jar jms.jar webbeans-core.jar webbeans-logging.jar javassist.jar dom4j.jar gf-jruby-connector.jar grizzly-jruby-module.jar grizzly-jruby.jar grizzly-scripting-common.jar</Class-Path>
+                               <Class-Path>jsr311-api.jar jersey-gf-bundle.jar amx-core-impl.jar amx-core.jar glassfish-api.jar hk2.jar hk2-corejar configjar auto-dependsjar tiger-types-osgijar bean-validator.jar grizzly-utils.jar gmbal.jar glassfish-mbeanserver.jar internal-api.jar config-api.jar common-util.jar javax.servlet.jar grizzly-config.jar osgi-adapterjar jmxremote_optional-repackaged.jar amx-config-impl.jar amx-config.jar amx-ext-impl.jar kernel.jar grizzly-framework.jar grizzly-http.jar grizzly-rcm.jar grizzly-portunif.jar deployment-common.jar asm-all-repackaged.jar pkg-client.jar flashlight-framework.jar flashlight-agent.jar management-api.jar security.jar dol.jar javax.annotation.jar javax.transaction.jar javax.enterprise.deploy.jar javax.persistence.jar javax.resource.jar annotation-framework.jar javax.security.auth.message.jar javax.security.jacc.jar javax.ejb.jar ejb-internal-api.jar connectors-internal-api.jar transaction-internal-api.jar ldapbp-repackaged.jar grizzly-compat.jar grizzly-comet.jar grizzly-cometd.jar grizzly-messagesbus.jar servlet-api-2.5.jar glassfish-extra-jre-packages.jar api-exporter.jar glassfish.jar admin-cli.jar cli-framework.jar launcher.jar branding.jar deployment-admin.jar deployment-autodeploy.jar glassfish-ee-api.jar osgi-mainjar glassfish-corba-omgapi.jar container-common.jar glassfish-naming.jar orb-connector.jar javax.mail.jar osgi-container.jar grizzly-container.jar monitoring-core.jar stats77.jar deployment-client.jar deployment-javaee-core.jar inmemory.jacc.provider.jar ant.jar jaxb-osgi.jar jaxb-api-osgi.jar registration-api.jar registration-impl.jar sysnet-registration-repackaged.jar commons-codec-repackaged.jar glassfish-registration.jar cli-optional.jar server-mgmt.jar admin-util.jar extra-jdk-packages.jar rest-service.jar gf-client.jar gf-client-module.jar ejb-container.jar appclient.security.jar ejb.security.jar glassfish-corba-csiv2-idl.jar glassfish-corba-orb.jar glassfish-corba-orbgeneric.jar glassfish-corba-newtimer.jar glassfish-corba-codegen.jar glassfish-corba-asm.jar orb-iiop.jar acc-config.jar webservices.security.jar webservices-osgi.jar webservices-api-osgi.jar websecurity.jar web-core.jar apache-commons.jar war-util.jar javax.servlet.jsp.jar web-naming.jar jsr109-impl.jar web-glue.jar web-cli.jar amx-j2ee.jar javax.management.j2ee.jar jsp-impl.jar jsp-api.jar el-api.jar el-impl.jar admin-core.jar web-gui-plugin-common.jar grizzly-http-servlet.jar work-management.jar connectors-inbound-runtime.jar connectors-runtime.jar jts.jar jta.jar jms-core.jar javax.jms.jar org.eclipse.persistence.core.jar org.eclipse.persistence.jpa.jar org.eclipse.persistence.oracle.jar org.eclipse.persistence.antlr.jar org.eclipse.persistence.asm.jar jpa-connector.jar persistence-common.jar appclient-connector.jar appclient-server-core.jar cmp-utility.jar cmp-model.jar dbschema-repackaged.jar cmp-generator-database.jar cmp-ejb-mapping.jar schema2beans-repackaged.jar cmp-enhancer.jar cmp-support-sqlstore.jar antlr-repackaged.jar cmp-support-ejb.jar gf-connectors-connector.jar connectors-admin.jar glassfish-oracle-jdbc-driver-packages.jar jsf-api.jar jsf-impl.jar jstl-connector.jar jstl-impl.jar jstl-api.jar javax.servlet.jsp.jstl.jar jsf-connector.jar jspcaching-connector.jar gf-web-connector.jar web-ajp.jar web-embed-api.jar web-embed-impl.jar jdbc-admin.jar console-plugin-service.jar dataprovider.jar dataprovider.jar jsftemplating.jar console-common.jar console-security-plugin.jar webui-jsf-suntheme.jar webui-jsf.jar commons-fileupload.jar xml-apis.jar json.jar console-updatecenter-plugin.jar console-community-branding-plugin.jar console-web-plugin.jar console-jdbc-plugin.jar gf-ejb-connector.jar console-ejb-lite-plugin.jar deployment-javaee-full.jar amx-j2ee-impl.jar mejb.jar console-jms-plugin.jar jms-admin.jar console-ejb-plugin.jar console-corba-plugin.jar webbeans-integration.jar webbeans-osgi-bundle.jar jsr299-api.jar webbeans-api.jar webbeans-spi.jar jms.jar webbeans-core.jar webbeans-logging.jar javassist.jar dom4j.jar gf-jruby-connector.jar grizzly-jruby-module.jar grizzly-jruby.jar grizzly-scripting-common.jar</Class-Path>
                         </manifestEntries>
                     </archive>
                 </configuration>
Index: admin/rest/src/main/java/org/glassfish/admin/rest/provider/TreeNodeXmlProvider.java
===================================================================
--- admin/rest/src/main/java/org/glassfish/admin/rest/provider/TreeNodeXmlProvider.java	(revision 29285)
+++ admin/rest/src/main/java/org/glassfish/admin/rest/provider/TreeNodeXmlProvider.java	(working copy)
@@ -53,7 +53,7 @@
 import javax.ws.rs.WebApplicationException;
 
 import org.glassfish.flashlight.datatree.TreeNode;
-import org.glassfish.api.statistics.Statistic;
+import org.glassfish.external.statistics.Statistic;
 
 /**
  * @author Rajeshwar Patil
Index: admin/rest/src/main/java/org/glassfish/admin/rest/provider/TreeNodeHtmlProvider.java
===================================================================
--- admin/rest/src/main/java/org/glassfish/admin/rest/provider/TreeNodeHtmlProvider.java	(revision 29285)
+++ admin/rest/src/main/java/org/glassfish/admin/rest/provider/TreeNodeHtmlProvider.java	(working copy)
@@ -45,7 +45,7 @@
 import java.util.Map;
 
 //import javax.management.j2ee.statistics.Statistics; //?
-import  org.glassfish.api.statistics.Statistic;
+import  org.glassfish.external.statistics.Statistic;
 
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
Index: admin/rest/src/main/java/org/glassfish/admin/rest/provider/TreeNodeJsonProvider.java
===================================================================
--- admin/rest/src/main/java/org/glassfish/admin/rest/provider/TreeNodeJsonProvider.java	(revision 29285)
+++ admin/rest/src/main/java/org/glassfish/admin/rest/provider/TreeNodeJsonProvider.java	(working copy)
@@ -53,7 +53,7 @@
 import javax.ws.rs.WebApplicationException;
 
 import org.glassfish.flashlight.datatree.TreeNode;
-import  org.glassfish.api.statistics.Statistic;
+import  org.glassfish.external.statistics.Statistic;
 
 /**
  * @author Rajeshwar Patil
Index: admin/rest/src/main/java/org/glassfish/admin/rest/provider/ProviderUtil.java
===================================================================
--- admin/rest/src/main/java/org/glassfish/admin/rest/provider/ProviderUtil.java	(revision 29285)
+++ admin/rest/src/main/java/org/glassfish/admin/rest/provider/ProviderUtil.java	(working copy)
@@ -45,7 +45,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import  org.glassfish.api.statistics.Statistic;
+import  org.glassfish.external.statistics.Statistic;
 
 import javax.ws.rs.core.UriInfo;
 
Index: admin/rest/pom.xml
===================================================================
--- admin/rest/pom.xml	(revision 29285)
+++ admin/rest/pom.xml	(working copy)
@@ -77,10 +77,9 @@
             <artifactId>hk2</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.common</groupId>
-            <artifactId>glassfish-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
+	    <groupId>org.glassfish.external</groupId>
+	    <artifactId>management-api</artifactId>
+	</dependency>
         <dependency>
             <groupId>org.glassfish.common</groupId>
             <artifactId>common-util</artifactId>

Property changes on: jms\jms-core
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: jms\admin
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: admingui\jms-plugin
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: admingui\ejb-lite
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: admingui\ejb
___________________________________________________________________
Name: svn:ignore
   + target


Index: ejb/ejb-container/src/main/java/org/glassfish/ejb/security/application/EjbSecurityStatsProvider.java
===================================================================
--- ejb/ejb-container/src/main/java/org/glassfish/ejb/security/application/EjbSecurityStatsProvider.java	(revision 29285)
+++ ejb/ejb-container/src/main/java/org/glassfish/ejb/security/application/EjbSecurityStatsProvider.java	(working copy)
@@ -5,15 +5,15 @@
 
 package org.glassfish.ejb.security.application;
 
-import org.glassfish.api.statistics.CountStatistic;
-import org.glassfish.api.statistics.TimeStatistic;
-import org.glassfish.api.statistics.impl.CountStatisticImpl;
-import org.glassfish.api.statistics.impl.TimeStatisticImpl;
+import org.glassfish.external.statistics.CountStatistic;
+import org.glassfish.external.statistics.TimeStatistic;
+import org.glassfish.external.statistics.impl.CountStatisticImpl;
+import org.glassfish.external.statistics.impl.TimeStatisticImpl;
 import org.glassfish.gmbal.Description;
 import org.glassfish.gmbal.ManagedAttribute;
 import org.glassfish.gmbal.ManagedObject;
-import org.glassfish.probe.provider.annotations.ProbeListener;
-import org.glassfish.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeListener;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
 
 /**
  *
Index: ejb/ejb-container/src/main/java/org/glassfish/ejb/security/application/EJBSecurityManager.java
===================================================================
--- ejb/ejb-container/src/main/java/org/glassfish/ejb/security/application/EJBSecurityManager.java	(revision 29285)
+++ ejb/ejb-container/src/main/java/org/glassfish/ejb/security/application/EJBSecurityManager.java	(working copy)
@@ -84,9 +84,9 @@
 import com.sun.enterprise.security.factory.SecurityManagerFactory;
 import org.glassfish.ejb.security.factory.EJBSecurityManagerFactory;
 import org.glassfish.internal.api.Globals;
-import org.glassfish.probe.provider.PluginPoint;
-import org.glassfish.probe.provider.StatsProviderManager;
-import org.glassfish.probe.provider.annotations.ProbeProvider;
+import org.glassfish.external.probe.provider.PluginPoint;
+import org.glassfish.external.probe.provider.StatsProviderManager;
+import org.glassfish.external.probe.provider.annotations.ProbeProvider;
 
 /**
  * This class is used by the EJB server to manage security. All
Index: ejb/ejb-container/src/main/java/org/glassfish/ejb/security/application/EjbSecurityProbeProvider.java
===================================================================
--- ejb/ejb-container/src/main/java/org/glassfish/ejb/security/application/EjbSecurityProbeProvider.java	(revision 29285)
+++ ejb/ejb-container/src/main/java/org/glassfish/ejb/security/application/EjbSecurityProbeProvider.java	(working copy)
@@ -5,9 +5,9 @@
 
 package org.glassfish.ejb.security.application;
 
-import org.glassfish.probe.provider.annotations.Probe;
-import org.glassfish.probe.provider.annotations.ProbeParam;
-import org.glassfish.probe.provider.annotations.ProbeProvider;
+import org.glassfish.external.probe.provider.annotations.Probe;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeProvider;
 
 /**
  *

Property changes on: ejb\javax.ejb
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: jbi\serviceengine\sun-javaee-engine
___________________________________________________________________
Name: svn:ignore
   + target


Index: security/webintegration/src/main/java/com/sun/web/security/RealmAdapter.java
===================================================================
--- security/webintegration/src/main/java/com/sun/web/security/RealmAdapter.java	(revision 29285)
+++ security/webintegration/src/main/java/com/sun/web/security/RealmAdapter.java	(working copy)
@@ -84,7 +84,7 @@
 
 import org.glassfish.api.invocation.ComponentInvocation;
 import org.glassfish.internal.api.ServerContext;
-import org.glassfish.probe.provider.StatsProviderManager;
+import org.glassfish.external.probe.provider.StatsProviderManager;
 //import com.sun.enterprise.Switch;
 import com.sun.enterprise.deployment.Application;
 import com.sun.enterprise.deployment.RunAsIdentityDescriptor;
@@ -113,7 +113,7 @@
 import com.sun.enterprise.security.auth.login.DigestCredentials;
 import com.sun.enterprise.security.auth.digest.api.Key;
 import com.sun.enterprise.security.auth.digest.api.DigestParameterGenerator;
-import org.glassfish.probe.provider.PluginPoint;
+import org.glassfish.external.probe.provider.PluginPoint;
 import org.jvnet.hk2.annotations.Inject;
 import org.jvnet.hk2.component.Habitat;
 import static com.sun.enterprise.security.auth.digest.api.Constants.A1;
Index: security/webintegration/src/main/java/com/sun/web/security/LoginStatsProvider.java
===================================================================
--- security/webintegration/src/main/java/com/sun/web/security/LoginStatsProvider.java	(revision 29285)
+++ security/webintegration/src/main/java/com/sun/web/security/LoginStatsProvider.java	(working copy)
@@ -5,13 +5,13 @@
 
 package com.sun.web.security;
 
-import org.glassfish.api.statistics.CountStatistic;
-import org.glassfish.api.statistics.impl.CountStatisticImpl;
+import org.glassfish.external.statistics.CountStatistic;
+import org.glassfish.external.statistics.impl.CountStatisticImpl;
 import org.glassfish.gmbal.Description;
 import org.glassfish.gmbal.ManagedAttribute;
 import org.glassfish.gmbal.ManagedObject;
-import org.glassfish.probe.provider.annotations.ProbeListener;
-import org.glassfish.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeListener;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
 
 /**
  *
Index: security/webintegration/src/main/java/com/sun/web/security/LoginProbeProvider.java
===================================================================
--- security/webintegration/src/main/java/com/sun/web/security/LoginProbeProvider.java	(revision 29285)
+++ security/webintegration/src/main/java/com/sun/web/security/LoginProbeProvider.java	(working copy)
@@ -5,9 +5,9 @@
 
 package com.sun.web.security;
 
-import org.glassfish.probe.provider.annotations.Probe;
-import org.glassfish.probe.provider.annotations.ProbeParam;
-import org.glassfish.probe.provider.annotations.ProbeProvider;
+import org.glassfish.external.probe.provider.annotations.Probe;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeProvider;
 
 /**
  *
Index: security/webintegration/pom.xml
===================================================================
--- security/webintegration/pom.xml	(revision 29285)
+++ security/webintegration/pom.xml	(working copy)
@@ -96,10 +96,6 @@
             <groupId>org.glassfish.admin</groupId>
             <artifactId>config-api</artifactId>
             <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.common</groupId>
-            <artifactId>glassfish-api</artifactId>
         </dependency>   
         <dependency>
             <groupId>org.glassfish.common</groupId>
@@ -152,10 +148,12 @@
             <artifactId>grizzly-utils</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.provider</groupId>
-            <artifactId>gfprobe-provider-client</artifactId>
-            <!--version>${gfprobe-provider-client.version}</version-->
-            <version>3.0.0-b008</version>
+	    <groupId>org.glassfish.external</groupId>
+	    <artifactId>management-api</artifactId>
+	</dependency>
+	<dependency>
+	    <groupId>org.glassfish.gmbal</groupId>
+	    <artifactId>gmbal</artifactId>
         </dependency>
     </dependencies>
 </project>

Property changes on: security\inmemory.jacc.provider
___________________________________________________________________
Name: svn:ignore
   + target


Index: security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmsProbeProvider.java
===================================================================
--- security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmsProbeProvider.java	(revision 29285)
+++ security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmsProbeProvider.java	(working copy)
@@ -4,9 +4,9 @@
  */
 
 package com.sun.enterprise.security.auth.realm;
-import org.glassfish.probe.provider.annotations.ProbeProvider;
-import org.glassfish.probe.provider.annotations.Probe;
-import org.glassfish.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeProvider;
+import org.glassfish.external.probe.provider.annotations.Probe;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
 
 /**
  *
Index: security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmStatsProvider.java
===================================================================
--- security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmStatsProvider.java	(revision 29285)
+++ security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmStatsProvider.java	(working copy)
@@ -1,9 +1,9 @@
 package com.sun.enterprise.security.auth.realm;
 
-import org.glassfish.api.statistics.CountStatistic;
-import org.glassfish.api.statistics.impl.CountStatisticImpl;
-import org.glassfish.probe.provider.annotations.ProbeListener;
-import org.glassfish.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.statistics.CountStatistic;
+import org.glassfish.external.statistics.impl.CountStatisticImpl;
+import org.glassfish.external.probe.provider.annotations.ProbeListener;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
 
 
 import org.glassfish.gmbal.*;
Index: security/core/src/main/java/com/sun/enterprise/security/SecurityLifecycle.java
===================================================================
--- security/core/src/main/java/com/sun/enterprise/security/SecurityLifecycle.java	(revision 29285)
+++ security/core/src/main/java/com/sun/enterprise/security/SecurityLifecycle.java	(working copy)
@@ -63,8 +63,8 @@
 import java.util.Enumeration;
 import java.util.List;
 import org.glassfish.api.Startup.Lifecycle;
-import org.glassfish.probe.provider.PluginPoint;
-import org.glassfish.probe.provider.StatsProviderManager;
+import org.glassfish.external.probe.provider.PluginPoint;
+import org.glassfish.external.probe.provider.StatsProviderManager;
 import org.jvnet.hk2.annotations.Inject;
 import org.jvnet.hk2.annotations.Scoped;
 import org.jvnet.hk2.annotations.Service;
Index: security/core/src/main/java/com/sun/enterprise/security/WebSecurityDeployerStatsProvider.java
===================================================================
--- security/core/src/main/java/com/sun/enterprise/security/WebSecurityDeployerStatsProvider.java	(revision 29285)
+++ security/core/src/main/java/com/sun/enterprise/security/WebSecurityDeployerStatsProvider.java	(working copy)
@@ -5,15 +5,15 @@
 
 package com.sun.enterprise.security;
 
-import org.glassfish.api.statistics.CountStatistic;
-import org.glassfish.api.statistics.TimeStatistic;
-import org.glassfish.api.statistics.impl.CountStatisticImpl;
-import org.glassfish.api.statistics.impl.TimeStatisticImpl;
+import org.glassfish.external.statistics.CountStatistic;
+import org.glassfish.external.statistics.TimeStatistic;
+import org.glassfish.external.statistics.impl.CountStatisticImpl;
+import org.glassfish.external.statistics.impl.TimeStatisticImpl;
 import org.glassfish.gmbal.Description;
 import org.glassfish.gmbal.ManagedAttribute;
 import org.glassfish.gmbal.ManagedObject;
-import org.glassfish.probe.provider.annotations.ProbeListener;
-import org.glassfish.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeListener;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
 
 /**
  *
Index: security/core/src/main/java/com/sun/enterprise/security/WebSecurityDeployerProbeProvider.java
===================================================================
--- security/core/src/main/java/com/sun/enterprise/security/WebSecurityDeployerProbeProvider.java	(revision 29285)
+++ security/core/src/main/java/com/sun/enterprise/security/WebSecurityDeployerProbeProvider.java	(working copy)
@@ -4,9 +4,9 @@
  */
 package com.sun.enterprise.security;
 
-import org.glassfish.probe.provider.annotations.Probe;
-import org.glassfish.probe.provider.annotations.ProbeParam;
-import org.glassfish.probe.provider.annotations.ProbeProvider;
+import org.glassfish.external.probe.provider.annotations.Probe;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeProvider;
 
 /**
  *
Index: security/core/pom.xml
===================================================================
--- security/core/pom.xml	(revision 29285)
+++ security/core/pom.xml	(working copy)
@@ -209,13 +209,12 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.provider</groupId>
-            <artifactId>gfprobe-provider-client</artifactId>
+	    <groupId>org.glassfish.external</groupId>
+	    <artifactId>management-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.common</groupId>
-            <artifactId>glassfish-api</artifactId>
-            <version>${project.version}</version>
+    	    <groupId>org.glassfish.gmbal</groupId>
+	    <artifactId>gmbal</artifactId>
         </dependency>
 
 

Property changes on: verifier\verifier-jdk-extension-bundle
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: verifier\verifier-impl
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: connectors\connectors-inbound-runtime
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: connectors\work-management
___________________________________________________________________
Name: svn:ignore
   + target


Index: connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/CommonWorkManager.java
===================================================================
--- connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/CommonWorkManager.java	(revision 29285)
+++ connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/CommonWorkManager.java	(working copy)
@@ -54,8 +54,8 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.glassfish.probe.provider.StatsProviderManager;
-import org.glassfish.probe.provider.PluginPoint;
+import org.glassfish.external.probe.provider.StatsProviderManager;
+import org.glassfish.external.probe.provider.PluginPoint;
 
 
 /**
Index: connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/monitor/WorkManagementProbeProvider.java
===================================================================
--- connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/monitor/WorkManagementProbeProvider.java	(revision 29285)
+++ connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/monitor/WorkManagementProbeProvider.java	(working copy)
@@ -36,9 +36,9 @@
 
 package com.sun.enterprise.connectors.work.monitor;
 
-import org.glassfish.probe.provider.annotations.ProbeProvider;
-import org.glassfish.probe.provider.annotations.Probe;
-import org.glassfish.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeProvider;
+import org.glassfish.external.probe.provider.annotations.Probe;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
 
 
 /**
Index: connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/monitor/WorkManagementStatsProvider.java
===================================================================
--- connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/monitor/WorkManagementStatsProvider.java	(revision 29285)
+++ connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/monitor/WorkManagementStatsProvider.java	(working copy)
@@ -38,13 +38,13 @@
 import org.glassfish.gmbal.ManagedObject;
 import org.glassfish.gmbal.Description;
 import org.glassfish.gmbal.ManagedAttribute;
-import org.glassfish.api.statistics.impl.CountStatisticImpl;
-import org.glassfish.api.statistics.impl.StatisticImpl;
-import org.glassfish.api.statistics.impl.RangeStatisticImpl;
-import org.glassfish.api.statistics.CountStatistic;
-import org.glassfish.api.statistics.RangeStatistic;
-import org.glassfish.probe.provider.annotations.ProbeListener;
-import org.glassfish.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.statistics.impl.CountStatisticImpl;
+import org.glassfish.external.statistics.impl.StatisticImpl;
+import org.glassfish.external.statistics.impl.RangeStatisticImpl;
+import org.glassfish.external.statistics.CountStatistic;
+import org.glassfish.external.statistics.RangeStatistic;
+import org.glassfish.external.probe.provider.annotations.ProbeListener;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
 
 /**
  * Provides the monitoring data for Connector Work Manager
Index: connectors/work-management/pom.xml
===================================================================
--- connectors/work-management/pom.xml	(revision 29285)
+++ connectors/work-management/pom.xml	(working copy)
@@ -75,17 +75,16 @@
         </dependency>
 
         <dependency>
-           <groupId>org.glassfish.provider</groupId>
-           <artifactId>gfprobe-provider-client</artifactId>
+	    <groupId>org.glassfish.external</groupId>
+	    <artifactId>management-api</artifactId>
+	</dependency>
+	
+	<dependency>
+	    <groupId>org.glassfish.gmbal</groupId>
+	    <artifactId>gmbal</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.glassfish.admin</groupId>
-            <artifactId>monitoring-core</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-
-        <dependency>
             <groupId>org.glassfish.common</groupId>
             <artifactId>common-util</artifactId>
             <version>${project.parent.version}</version>
Index: connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/JDBCPoolStatsProviderBootstrap.java
===================================================================
--- connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/JDBCPoolStatsProviderBootstrap.java	(revision 29285)
+++ connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/JDBCPoolStatsProviderBootstrap.java	(working copy)
@@ -64,8 +64,8 @@
 import org.jvnet.hk2.annotations.Service;
 import org.jvnet.hk2.component.PostConstruct;
 import org.jvnet.hk2.component.Singleton;
-import org.glassfish.probe.provider.PluginPoint;
-import org.glassfish.probe.provider.StatsProviderManager;
+import org.glassfish.external.probe.provider.PluginPoint;
+import org.glassfish.external.probe.provider.StatsProviderManager;
 
 /**
  * Bootstrap operations of telemetry objects are done by this class.
Index: connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/JDBCPoolStatsProvider.java
===================================================================
--- connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/JDBCPoolStatsProvider.java	(revision 29285)
+++ connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/JDBCPoolStatsProvider.java	(working copy)
@@ -38,14 +38,14 @@
 import com.sun.enterprise.resource.pool.monitor.telemetry.*;
 import com.sun.enterprise.resource.pool.PoolLifeCycleListenerRegistry;
 import java.util.logging.Logger;
-import org.glassfish.api.statistics.BoundedRangeStatistic;
-import org.glassfish.api.statistics.CountStatistic;
-import org.glassfish.api.statistics.RangeStatistic;
-import org.glassfish.api.statistics.impl.BoundedRangeStatisticImpl;
-import org.glassfish.api.statistics.impl.CountStatisticImpl;
-import org.glassfish.api.statistics.impl.RangeStatisticImpl;
-import org.glassfish.probe.provider.annotations.ProbeListener;
-import org.glassfish.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.statistics.BoundedRangeStatistic;
+import org.glassfish.external.statistics.CountStatistic;
+import org.glassfish.external.statistics.RangeStatistic;
+import org.glassfish.external.statistics.impl.BoundedRangeStatisticImpl;
+import org.glassfish.external.statistics.impl.CountStatisticImpl;
+import org.glassfish.external.statistics.impl.RangeStatisticImpl;
+import org.glassfish.external.probe.provider.annotations.ProbeListener;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
 import org.glassfish.gmbal.Description;
 import org.glassfish.gmbal.ManagedAttribute;
 import org.glassfish.gmbal.ManagedObject;
Index: connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/telemetry/JDBCPoolTelemetry.java
===================================================================
--- connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/telemetry/JDBCPoolTelemetry.java	(revision 29285)
+++ connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/telemetry/JDBCPoolTelemetry.java	(working copy)
@@ -42,10 +42,10 @@
 import java.util.logging.Logger;
 import org.glassfish.flashlight.client.ProbeClientMediator;
 import org.glassfish.flashlight.client.ProbeClientMethodHandle;
-import org.glassfish.probe.provider.annotations.ProbeListener;
+import org.glassfish.external.probe.provider.annotations.ProbeListener;
 import org.glassfish.flashlight.datatree.TreeNode;
 import org.glassfish.flashlight.datatree.factory.TreeNodeFactory;
-import org.glassfish.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
 import org.glassfish.flashlight.statistics.Average;
 import org.glassfish.flashlight.statistics.Counter;
 import org.glassfish.flashlight.statistics.factory.AverageFactory;
Index: connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/JdbcConnPoolProbeProvider.java
===================================================================
--- connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/JdbcConnPoolProbeProvider.java	(revision 29285)
+++ connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/JdbcConnPoolProbeProvider.java	(working copy)
@@ -35,9 +35,9 @@
 */
 package com.sun.enterprise.resource.pool.monitor;
 
-import org.glassfish.probe.provider.annotations.ProbeParam;
-import org.glassfish.probe.provider.annotations.Probe;
-import org.glassfish.probe.provider.annotations.ProbeProvider;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.Probe;
+import org.glassfish.external.probe.provider.annotations.ProbeProvider;
 
 /**
  * Probe provider interface for JDBC connection pool related events to provide 
Index: connectors/connectors-runtime/pom.xml
===================================================================
--- connectors/connectors-runtime/pom.xml	(revision 29285)
+++ connectors/connectors-runtime/pom.xml	(working copy)
@@ -104,11 +104,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.glassfish.common</groupId>
-            <artifactId>glassfish-api</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>org.glassfish.transaction</groupId>
             <artifactId>transaction-internal-api</artifactId>
             <version>${project.parent.version}</version>
@@ -157,10 +152,13 @@
         </dependency>
 
         <dependency>
-            <groupId>org.glassfish.provider</groupId>
-            <artifactId>gfprobe-provider-client</artifactId>
-            <version>${gfprobe-provider-client.version}</version>
+            <groupId>org.glassfish.external</groupId>
+            <artifactId>management-api</artifactId>
         </dependency>
+        <dependency>
+	    <groupId>org.glassfish.gmbal</groupId>
+	    <artifactId>gmbal</artifactId>
+        </dependency>
 
     </dependencies>
 </project>