Index: pom.xml
===================================================================
--- pom.xml	(revision 29260)
+++ 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>
Index: admin/rest/pom.xml
===================================================================
--- admin/rest/pom.xml	(revision 29260)
+++ 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>
Index: admin/monitor/pom.xml
===================================================================
--- admin/monitor/pom.xml	(revision 29260)
+++ 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: connectors/connectors-runtime/pom.xml
===================================================================
--- connectors/connectors-runtime/pom.xml	(revision 29260)
+++ 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>
Index: connectors/work-management/pom.xml
===================================================================
--- connectors/work-management/pom.xml	(revision 29260)
+++ 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: transaction/jta/pom.xml
===================================================================
--- transaction/jta/pom.xml	(revision 29260)
+++ 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>
Index: web/admin/pom.xml
===================================================================
--- web/admin/pom.xml	(revision 29260)
+++ 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>
Index: admin/cli-optional/pom.xml
===================================================================
--- admin/cli-optional/pom.xml	(revision 29260)
+++ 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: core/kernel/pom.xml
===================================================================
--- core/kernel/pom.xml	(revision 29260)
+++ 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>
Index: security/core/pom.xml
===================================================================
--- security/core/pom.xml	(revision 29260)
+++ 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>
 
 
Index: security/webintegration/pom.xml
===================================================================
--- security/webintegration/pom.xml	(revision 29260)
+++ 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>
Index: webservices/jsr109-impl/pom.xml
===================================================================
--- webservices/jsr109-impl/pom.xml	(revision 29260)
+++ webservices/jsr109-impl/pom.xml	(working copy)
@@ -129,11 +129,6 @@
         </dependency>
         <dependency>
             <groupId>org.glassfish.common</groupId>
-            <artifactId>glassfish-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.common</groupId>
             <artifactId>internal-api</artifactId>
             <version>${project.version}</version>
         </dependency>
Index: flashlight/agent/pom.xml
===================================================================
--- flashlight/agent/pom.xml	(revision 29260)
+++ flashlight/agent/pom.xml	(working copy)
@@ -49,10 +49,14 @@
     <packaging>hk2-jar</packaging>
     <name>GlassFish Flashlight Agent</name>
             <dependencies>
-            <dependency>
-                <groupId>org.glassfish.provider</groupId>
-                <artifactId>gfprobe-provider-client</artifactId>
-            </dependency>
+		<dependency>
+	            <groupId>org.glassfish.external</groupId>
+	            <artifactId>management-api</artifactId>
+	        </dependency>
+	        <dependency>
+	            <groupId>org.glassfish.gmbal</groupId>
+	            <artifactId>gmbal</artifactId>
+        	</dependency>
 
             </dependencies>
 </project>