Index: v3/common/pom.xml
===================================================================
--- pom.xml	(revision 38610)
+++ pom.xml	(working copy)
@@ -53,7 +53,6 @@
     <modules>
     	<module>glassfish-api</module>
         <module>mbeanserver</module>
-        
     	<module>stats77</module>
     	<module>amx-core</module>
     	<module>amx-core-impl</module>
@@ -62,9 +61,9 @@
     	<module>amx-j2ee</module>
     	<module>amx-j2ee-impl</module>
     	<module>amx-ext-impl</module>
-	<module>mejb</module>
-	<module>mejb-frag</module>
-    	
+        <module>amx-all</module>
+	    <module>mejb</module>
+	    <module>mejb-frag</module>    	
         <module>glassfish-ee-api</module>
     	<module>internal-api</module>
         <module>annotation-framework</module>


Index: v3/extras/mx/scripts/mx
===================================================================
--- mx/scripts/mx	(revision 38606)
+++ mx/scripts/mx	(working copy)
@@ -62,7 +62,7 @@
 # 'D' is simply an abbreviation to keep things compact.
 JARS_DIR=$SCRIPT_DIR/jars
 OPTIONAL_JARS=$D/mx-optional.jar
-USER_JARS=$JARS_DIR/amx-core.jar${CPS}$JARS_DIR/glassfish-api.jar${CPS}$JARS_DIR/management-api.jar${CPS}$JARS_DIR/jmxremote_optional.jar${CPS}$JARS_DIR/javax.management.j2ee.jar
+USER_JARS=$JARS_DIR/amx-all.jar${CPS}$JARS_DIR/glassfish-api.jar${CPS}$JARS_DIR/management-api.jar${CPS}$JARS_DIR/jmxremote_optional.jar${CPS}$JARS_DIR/javax.management.j2ee.jar
 
 #
 # Support jars are usually already incorporated, but can be separated out.


Index: v3/extras/mx/mk
===================================================================
--- mx/mk	(revision 38606)
+++ mx/mk	(working copy)
@@ -105,8 +105,8 @@
 echo "---------  THIS WONT WORK IF THE PATH IS WRONG -----------"
 echo "Copying various GlassFish V3 jars from assumed location: " $JARS_LOC
 
-echo "Copying" $JARS_LOC/amx-core.jar
-cp $JARS_LOC/amx-core.jar $PUBLISH_DIR/jars
+echo "Copying" $JARS_LOC/amx-all.jar
+cp $JARS_LOC/amx-all.jar $PUBLISH_DIR/jars
 cp $JARS_LOC/glassfish-api.jar $PUBLISH_DIR/jars
 cp $JARS_LOC/management-api.jar $PUBLISH_DIR/jars


Index: v3/packager/glassfish-common-tmp/build.xml
===================================================================
--- build.xml	(revision 38610)
+++ build.xml	(working copy)
@@ -45,6 +45,21 @@
            plugin and fix the issue at the source -->
            
        <delete file="target/stage/${install.dir.name}/glassfish/modules/activation.jar" failonerror="false" />
+
+		<delete file="target/stage/${install.dir.name}/glassfish/modules/amx-core.jar" failonerror="false" />
+		
+		<delete file="target/stage/${install.dir.name}/glassfish/modules/amx-core-impl.jar" failonerror="false" />
+
+		<delete file="target/stage/${install.dir.name}/glassfish/modules/amx-config.jar" failonerror="false" />
+
+		<delete file="target/stage/${install.dir.name}/glassfish/modules/amx-config-impl.jar" failonerror="false" />
+
+		<delete file="target/stage/${install.dir.name}/glassfish/modules/amx-j2ee.jar" failonerror="false" />
+
+		<delete file="target/stage/${install.dir.name}/glassfish/modules/amx-j2ee-impl.jar" failonerror="false" />
+
+		<delete file="target/stage/${install.dir.name}/glassfish/modules/amx-ext-impl.jar" failonerror="false" />
+
        
        <mkdir dir="target/stage/${install.dir.name}/glassfish/modules/endorsed"/>


Index: v3/packager/glassfish-common-tmp/pom.xml
===================================================================
--- glassfish-common-tmp/pom.xml	(revision 38606)
+++ glassfish-common-tmp/pom.xml	(working copy)
@@ -137,24 +137,9 @@
      <!-- moving from glassfish-amx package -->       
         <dependency>
             <groupId>org.glassfish.common</groupId>
-            <artifactId>amx-core-impl</artifactId>
+            <artifactId>amx-all</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.glassfish.common</groupId>
-            <artifactId>amx-config-impl</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.common</groupId>
-            <artifactId>amx-ext-impl</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.common</groupId>
-            <artifactId>amx-j2ee-impl</artifactId>
-            <version>${project.version}</version>
-        </dependency>
 
    <!--  moving stuff from killed glassfish-deployment package -->
         <dependency>


Index: v3/packager/glassfish-common-full/pom.xml
===================================================================
--- glassfish-common-full/pom.xml	(revision 38606)
+++ glassfish-common-full/pom.xml	(working copy)
@@ -84,7 +84,7 @@
         </dependency> 
         <dependency>
             <groupId>org.glassfish.common</groupId>
-            <artifactId>amx-j2ee-impl</artifactId>
+            <artifactId>amx-all</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>


Index: v3/tests/quicklook/build.xml
===================================================================
--- build.xml	(revision 38606)
+++ build.xml	(working copy)
@@ -354,8 +354,7 @@
             <fileset dir="${glassfish.home}/modules">
                <include name="**/hk2*.jar"/>
                <include name="**/glassfish-api.jar"/>
-               <include name="**/amx-core.jar"/>
-               <include name="**/amx-config.jar"/>
+               <include name="**/amx-all.jar"/>
                <include name="**/management-api.jar"/>
                <include name="**/gf-client.jar"/>
             </fileset>


Index: v3/tests/quicklook/gfproject/build-impl.xml
===================================================================
--- build-impl.xml	(revision 38606)
+++ build-impl.xml	(working copy)
@@ -63,8 +63,7 @@
         <fileset dir="${glassfish.home}/modules">
             <include name="**/hk2*.jar"/>
             <include name="**/glassfish-api.jar"/>
-            <include name="**/amx-core.jar"/>
-            <include name="**/amx-config.jar"/>
+            <include name="**/amx-all.jar"/>
             <include name="**/gf-client.jar"/>
         </fileset>
         <pathelement location="${class.output}"/>