Index: appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml
===================================================================
--- appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml	(revision 50131)
+++ appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml	(revision 50132)
@@ -151,7 +151,7 @@
         </dependency>
         <dependency>
             <groupId>org.glassfish.packager</groupId>
-            <artifactId>glassfish-common-tmp</artifactId>
+            <artifactId>glassfish-common</artifactId>
             <version>${project.version}</version>
             <type>zip</type>
             <optional>true</optional>
@@ -277,7 +277,7 @@
         </dependency>
         <dependency>
             <groupId>org.glassfish.packager</groupId>
-            <artifactId>glassfish-common-web</artifactId>
+            <artifactId>glassfish-common-web-tmp</artifactId>
             <version>${project.version}</version>
             <type>zip</type>
             <optional>true</optional>
Index: appserver/packager/glassfish-common-web-tmp/pom.xml
===================================================================
--- appserver/packager/glassfish-common-web-tmp/pom.xml	(revision 0)
+++ appserver/packager/glassfish-common-web-tmp/pom.xml	(revision 50132)
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+    Copyright (c) 2011 Oracle and/or its affiliates. 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_1_1.html
+    or packager/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 packager/legal/LICENSE.txt.
+
+    GPL Classpath Exception:
+    Oracle designates this particular file as subject to the "Classpath"
+    exception as provided by Oracle in the GPL Version 2 section of the License
+    file that accompanied this code.
+
+    Modifications:
+    If applicable, add the following below the License Header, with the fields
+    enclosed by brackets [] replaced by your own identifying information:
+    "Portions Copyright [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.packager</groupId>
+        <artifactId>packages</artifactId>
+        <version>4.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>glassfish-common-web-tmp</artifactId>
+    <name>Glassfish Commons intermediate package artifact for Web Profile Distribution </name>
+    <packaging>distribution-base-zip</packaging>
+    <description>This pom describes how to assemble the GlassFish Commons intermediate package artifact for Web Profile Distribution package</description>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
+                <artifactId>maven-antrun-extended-plugin</artifactId>
+                <configuration>
+                    <tasks>
+                        <if test="${do.compression}">
+			    <property name="compression" value="true" />
+			</if>
+                        <ant dir="." antfile="build.xml" target="create.package"/>
+                    </tasks>
+                </configuration>               
+             </plugin>
+             <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/artifacts</outputDirectory>
+                            <useSubDirectoryPerType>true</useSubDirectoryPerType>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>                            
+                            <includeScope>compile</includeScope>
+                            <includeScope>runtime</includeScope>
+                            <excludeArtifactIds>${packager.artifact.excludes}</excludeArtifactIds>
+                            <stripVersion>true</stripVersion>
+                        </configuration>
+                   </execution>                  
+               </executions>
+           </plugin>
+        </plugins>
+    </build>
+
+
+    <dependencies>
+        <!--
+          modules to be included in this bundle
+        -->       
+        
+       <dependency>
+            <groupId>org.glassfish.security</groupId>
+            <artifactId>security-all</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type> 
+        </dependency>
+        <dependency>
+            <groupId>com.sun.pkg</groupId>
+            <artifactId>pkg-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.common</groupId>
+            <artifactId>amx-javaee</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+           <groupId>org.glassfish.common</groupId>
+           <artifactId>annotation-framework</artifactId>
+           <version>${project.version}</version>
+       </dependency>
+        <dependency>
+           <groupId>org.glassfish.common</groupId>
+           <artifactId>container-common</artifactId>
+           <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.deployment</groupId>
+            <artifactId>deployment-client</artifactId>
+            <version>${project.version}</version>
+   	 </dependency>
+    	<dependency>
+            <groupId>org.glassfish.deployment</groupId>
+            <artifactId>deployment-javaee-core</artifactId>
+            <version>${project.version}</version>
+    	</dependency>
+        <dependency>
+            <groupId>org.glassfish.deployment</groupId>
+            <artifactId>dol</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.admin</groupId>
+            <artifactId>cli-optional</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.admin</groupId>
+            <artifactId>admin-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.ejb</groupId>
+            <artifactId>ejb-internal-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.connectors</groupId>
+            <artifactId>connectors-internal-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+             <groupId>org.glassfish.orb</groupId>
+             <artifactId>orb-connector</artifactId>
+             <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.extras</groupId>
+            <artifactId>osgi-container</artifactId>
+            <version>${project.version}</version>
+        </dependency>	
+        <dependency>
+    	    <groupId>org.glassfish</groupId>
+            <artifactId>paas.gfplugin</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+    	    <groupId>org.glassfish</groupId>
+            <artifactId>paas.javadbplugin</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+    	    <groupId>org.glassfish</groupId>
+            <artifactId>paas.lbplugin</artifactId>
+            <version>${project.version}</version>
+        </dependency>      
+        <!-- Shared OSGi support for Java EE -->
+       <dependency>
+            <groupId>org.glassfish.fighterfish</groupId>
+            <artifactId>osgi-javaee-base</artifactId>
+        </dependency>
+<!-- disabling due to config bean changes for jdbc and connector resources -->
+<!--       <dependency>
+            <groupId>org.glassfish.fighterfish</groupId>
+            <artifactId>osgi-ee-resources</artifactId>
+        </dependency>-->
+        <!-- HA API  -->
+        <dependency>
+            <groupId>org.glassfish.ha</groupId>
+            <artifactId>ha-api</artifactId>
+        </dependency>    
+        <dependency>
+           <groupId>org.glassfish.ha</groupId>
+           <artifactId>ha-file-store</artifactId>
+           <version>${project.version}</version>
+       </dependency>
+        <!-- TODO: move to glassfish-nucleus after nucleus distro build moves
+             to its own workspace -->
+        <dependency>
+           <groupId>org.glassfish.packager</groupId>
+           <artifactId>appserver-base</artifactId>
+           <version>${project.version}</version>
+           <type>zip</type>
+        </dependency>
+        <!-- TODO: move to glassfish-cluster after nucleus distro build moves
+             to its own workspace or create dedicated cluster package-->
+        <dependency>
+              <groupId>org.glassfish.loadbalancer</groupId>
+              <artifactId>load-balancer-admin</artifactId>
+              <version>${project.version}</version>
+        </dependency>
+        <!-- TODO: move back to shoal package after nucleus distro build moves
+             to its own workspace -->
+        <dependency>
+              <groupId>org.shoal</groupId>
+              <artifactId>shoal-cache</artifactId>
+          </dependency>
+        <!-- schema2beans - both CMP and LB admin now depend on it -->
+        <dependency>
+            <groupId>org.glassfish.external</groupId>
+            <artifactId>schema2beans-repackaged</artifactId>
+            <version>${project.version}</version>
+        </dependency>          
+        <!-- javaee.jar containing Manifest Classpath of JavaEE API jars -->
+        <dependency>
+           <groupId>org.glassfish.extras</groupId>
+           <artifactId>javaee-frag</artifactId>
+           <version>${project.version}</version>
+           <type>distribution-fragment</type>
+        </dependency>
+
+        <!-- appserv-rt.jar containing Manifest Classpath of gf-client.jar -->
+        <dependency>
+           <groupId>org.glassfish.extras</groupId>
+           <artifactId>appserv-rt-frag</artifactId>
+           <version>${project.version}</version>
+           <type>distribution-fragment</type>
+        </dependency>
+
+        <!-- embedded shell fragment -->
+        <dependency>
+           <groupId>org.glassfish.extras</groupId>
+           <artifactId>glassfish-embedded-shell-frag</artifactId>
+           <version>${project.version}</version>
+           <type>distribution-fragment</type>
+        </dependency>
+
+   	<!-- now, listing package dependencies so that their content
+             can be excluded during staging -->	
+      
+       <dependency>        
+           <groupId>org.glassfish.packager</groupId>
+           <artifactId>glassfish-grizzly-full</artifactId>
+           <version>${project.version}</version>
+	   <classifier>artifacts</classifier>
+	   <type>properties</type>
+           <scope>provided</scope>
+       </dependency> 
+     
+    </dependencies>  
+
+</project>
+

Property changes on: appserver/packager/glassfish-common-web-tmp/pom.xml
___________________________________________________________________
Added: svn:eol-style
   + native

Index: appserver/packager/glassfish-common-web-tmp/build.xml
===================================================================
--- appserver/packager/glassfish-common-web-tmp/build.xml	(revision 0)
+++ appserver/packager/glassfish-common-web-tmp/build.xml	(revision 50132)
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!--
+
+    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+    Copyright (c) 2011 Oracle and/or its affiliates. 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_1_1.html
+    or packager/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 packager/legal/LICENSE.txt.
+
+    GPL Classpath Exception:
+    Oracle designates this particular file as subject to the "Classpath"
+    exception as provided by Oracle in the GPL Version 2 section of the License
+    file that accompanied this code.
+
+    Modifications:
+    If applicable, add the following below the License Header, with the fields
+    enclosed by brackets [] replaced by your own identifying information:
+    "Portions Copyright [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 name="glassfish-common-web-tmp package creation" default="create.package" basedir=".">
+       <import file="${basedir}/../common-targets.xml"/>
+
+ <target name="create.package">
+	 <property name="package.name" value="glassfish-common-web-tmp"/> 
+         <property name="previous.package.name" value="glassfish-grizzly-full" />
+       
+       <antcall target="filter-module-artifacts"/>
+        
+       <stage-module-jars/>
+       <stage-distribution-fragments/>
+
+       <!-- overriding nucleus-base content with appserver-base -->
+       <resolveArtifact artifactId="appserver-base" property="appserver-base.zip"/>
+       
+       <unzip src="${appserver-base.zip}" 
+              dest="target/stage/${install.dir.name}/glassfish"
+              overwrite="true"/>
+
+       <mkdir dir="target/stage/${install.dir.name}/glassfish/modules/endorsed"/>
+
+       <move file="target/stage/${install.dir.name}/glassfish/modules/javax.annotation.jar" todir="target/stage/${install.dir.name}/glassfish/modules/endorsed" failonerror="false"/>          
+
+       <mkdir dir="target/stage/${install.dir.name}/glassfish/modules/autostart"/>
+
+       <move file="target/stage/${install.dir.name}/glassfish/modules/osgi-javaee-base.jar" todir="target/stage/${install.dir.name}/glassfish/modules/autostart" failonerror="false"/>
+<!-- disabling due to config bean changes of jdbc and connector resources -->
+<!--      <move file="target/stage/${install.dir.name}/glassfish/modules/osgi-ee-resources.jar" todir="target/stage/${install.dir.name}/glassfish/modules/autostart" failonerror="false"/>-->
+  
+       <if test="${compression}">
+	       <antcall target="pack.compression" />
+       </if>
+
+       <antcall target="create-zip-artifact"/>  
+       <antcall target="create-list-artifact"/>  
+
+   </target>
+</project>
+

Property changes on: appserver/packager/glassfish-common-web-tmp/build.xml
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: appserver/packager/glassfish-common-web-tmp
___________________________________________________________________
Added: svn:ignore
   + target


Index: appserver/packager/glassfish-common-web/pom.xml
===================================================================
--- appserver/packager/glassfish-common-web/pom.xml	(revision 50131)
+++ appserver/packager/glassfish-common-web/pom.xml	(revision 50132)
@@ -67,208 +67,36 @@
                         <ant dir="." antfile="build.xml" target="create.package"/>
                     </tasks>
                 </configuration>               
-             </plugin>
-             <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-dependencies</id>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/artifacts</outputDirectory>
-                            <useSubDirectoryPerType>true</useSubDirectoryPerType>
-                            <overWriteReleases>false</overWriteReleases>
-                            <overWriteSnapshots>true</overWriteSnapshots>                            
-                            <includeScope>compile</includeScope>
-                            <includeScope>runtime</includeScope>
-                            <excludeArtifactIds>${packager.artifact.excludes}</excludeArtifactIds>
-                            <stripVersion>true</stripVersion>
-                        </configuration>
-                   </execution>                  
-               </executions>
-           </plugin>
+             </plugin>            
         </plugins>
     </build>
 
-
     <dependencies>
-        <!--
-          modules to be included in this bundle
-        -->       
         
        <dependency>
-            <groupId>org.glassfish.security</groupId>
-            <artifactId>security-all</artifactId>
+            <groupId>org.glassfish.packager</groupId>
+            <artifactId>glassfish-common-web-tmp</artifactId>
             <version>${project.version}</version>
-            <type>pom</type> 
+            <type>zip</type> 
         </dependency>
+        
+        <!-- embedded shell fragment -->
         <dependency>
-            <groupId>com.sun.pkg</groupId>
-            <artifactId>pkg-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.common</groupId>
-            <artifactId>amx-javaee</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-           <groupId>org.glassfish.common</groupId>
-           <artifactId>annotation-framework</artifactId>
-           <version>${project.version}</version>
-       </dependency>
-        <dependency>
-           <groupId>org.glassfish.common</groupId>
-           <artifactId>container-common</artifactId>
-           <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.deployment</groupId>
-            <artifactId>deployment-client</artifactId>
-            <version>${project.version}</version>
-   	 </dependency>
-    	<dependency>
-            <groupId>org.glassfish.deployment</groupId>
-            <artifactId>deployment-javaee-core</artifactId>
-            <version>${project.version}</version>
-    	</dependency>
-        <dependency>
-            <groupId>org.glassfish.deployment</groupId>
-            <artifactId>dol</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.admin</groupId>
-            <artifactId>cli-optional</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.admin</groupId>
-            <artifactId>admin-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.ejb</groupId>
-            <artifactId>ejb-internal-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.connectors</groupId>
-            <artifactId>connectors-internal-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-             <groupId>org.glassfish.orb</groupId>
-             <artifactId>orb-connector</artifactId>
-             <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.extras</groupId>
-            <artifactId>osgi-container</artifactId>
-            <version>${project.version}</version>
-        </dependency>	
-        <dependency>
-    	    <groupId>org.glassfish</groupId>
-            <artifactId>paas.gfplugin</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-    	    <groupId>org.glassfish</groupId>
-            <artifactId>paas.javadbplugin</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-    	    <groupId>org.glassfish</groupId>
-            <artifactId>paas.lbplugin</artifactId>
-            <version>${project.version}</version>
-        </dependency>      
-        <!-- Shared OSGi support for Java EE -->
-       <dependency>
-            <groupId>org.glassfish.fighterfish</groupId>
-            <artifactId>osgi-javaee-base</artifactId>
-        </dependency>
-<!-- disabling due to config bean changes for jdbc and connector resources -->
-<!--       <dependency>
-            <groupId>org.glassfish.fighterfish</groupId>
-            <artifactId>osgi-ee-resources</artifactId>
-        </dependency>-->
-        <!-- HA API  -->
-        <dependency>
-            <groupId>org.glassfish.ha</groupId>
-            <artifactId>ha-api</artifactId>
-        </dependency>    
-        <dependency>
-           <groupId>org.glassfish.ha</groupId>
-           <artifactId>ha-file-store</artifactId>
-           <version>${project.version}</version>
-       </dependency>
-        <!-- TODO: move to glassfish-nucleus after nucleus distro build moves
-             to its own workspace -->
-        <dependency>
-           <groupId>org.glassfish.packager</groupId>
-           <artifactId>appserver-base</artifactId>
-           <version>${project.version}</version>
-           <type>zip</type>
-        </dependency>
-        <!-- TODO: move to glassfish-cluster after nucleus distro build moves
-             to its own workspace or create dedicated cluster package-->
-        <dependency>
-              <groupId>org.glassfish.loadbalancer</groupId>
-              <artifactId>load-balancer-admin</artifactId>
-              <version>${project.version}</version>
-        </dependency>
-        <!-- TODO: move back to shoal package after nucleus distro build moves
-             to its own workspace -->
-        <dependency>
-              <groupId>org.shoal</groupId>
-              <artifactId>shoal-cache</artifactId>
-          </dependency>
-        <!-- schema2beans - both CMP and LB admin now depend on it -->
-        <dependency>
-            <groupId>org.glassfish.external</groupId>
-            <artifactId>schema2beans-repackaged</artifactId>
-            <version>${project.version}</version>
-        </dependency>          
-        <!-- javaee.jar containing Manifest Classpath of JavaEE API jars -->
-        <dependency>
            <groupId>org.glassfish.extras</groupId>
-           <artifactId>javaee-frag</artifactId>
+           <artifactId>glassfish-embedded-static-shell-frag</artifactId>
            <version>${project.version}</version>
            <type>distribution-fragment</type>
         </dependency>
-
-        <!-- appserv-rt.jar containing Manifest Classpath of gf-client.jar -->
-        <dependency>
-           <groupId>org.glassfish.extras</groupId>
-           <artifactId>appserv-rt-frag</artifactId>
-           <version>${project.version}</version>
-           <type>distribution-fragment</type>
-        </dependency>
-
-   	<!-- now, listing package dependencies so that their content
-             can be excluded during staging -->	
-      
-       <dependency>        
-           <groupId>org.glassfish.packager</groupId>
-           <artifactId>glassfish-grizzly-full</artifactId>
-           <version>${project.version}</version>
-	   <classifier>artifacts</classifier>
-	   <type>properties</type>
-           <scope>provided</scope>
-       </dependency> 
-     
     </dependencies>
 
-    <profiles>
+     <profiles>
         <profile>
             <!--
                 Activate this profile with "mvn -Drepo.url=<ips-repository> -Dpython=<python> -P ips"
              -->
             <id>ips</id>
 	    <activation>
-	       <activeByDefault>false</activeByDefault> 
+	       <activeByDefault>false</activeByDefault>  
 	    </activation>
 	    <build>
             <plugins>
Index: appserver/packager/glassfish-common-web/build.xml
===================================================================
--- appserver/packager/glassfish-common-web/build.xml	(revision 50131)
+++ appserver/packager/glassfish-common-web/build.xml	(revision 50132)
@@ -46,37 +46,36 @@
 
  <target name="create.package">
 	 <property name="package.name" value="glassfish-common-web"/> 
-         <property name="previous.package.name" value="glassfish-grizzly-full" />
-       
-       <antcall target="filter-module-artifacts"/>
+
         
-       <stage-module-jars/>
-       <stage-distribution-fragments/>
 
-       <!-- overriding nucleus-base content with appserver-base -->
-       <resolveArtifact artifactId="appserver-base" property="appserver-base.zip"/>
-       
-       <unzip src="${appserver-base.zip}" 
-              dest="target/stage/${install.dir.name}/glassfish"
-              overwrite="true"/>
+       <resolveArtifact property="glassfish-common-web-tmp.zip" groupID="org.glassfish.packager" artifactID="glassfish-common-web-tmp" type="zip" />
 
-       <mkdir dir="target/stage/${install.dir.name}/glassfish/modules/endorsed"/>
 
-       <move file="target/stage/${install.dir.name}/glassfish/modules/javax.annotation.jar" todir="target/stage/${install.dir.name}/glassfish/modules/endorsed" failonerror="false"/>          
+       <unzip src="${glassfish-common-web-tmp.zip}"
+           dest="target/stage">
+          <patternset>
+		  <exclude name="META-INF/**"/>
+	  </patternset>
+       </unzip> 
 
-       <mkdir dir="target/stage/${install.dir.name}/glassfish/modules/autostart"/>
+       <resolveArtifact property="embedded-fragment.zip" groupID="org.glassfish.extras" artifactID="glassfish-embedded-static-shell-frag" />
 
-       <move file="target/stage/${install.dir.name}/glassfish/modules/osgi-javaee-base.jar" todir="target/stage/${install.dir.name}/glassfish/modules/autostart" failonerror="false"/>
-<!-- disabling due to config bean changes of jdbc and connector resources -->
-<!--      <move file="target/stage/${install.dir.name}/glassfish/modules/osgi-ee-resources.jar" todir="target/stage/${install.dir.name}/glassfish/modules/autostart" failonerror="false"/>-->
-  
+
+       <unzip src="${embedded-fragment.zip}"
+           dest="target/stage/${install.dir.name}">
+          <patternset>
+		  <exclude name="META-INF/**"/>
+	  </patternset>
+       </unzip>  
+      
        <if test="${compression}">
 	       <antcall target="pack.compression" />
        </if>
 
-       <antcall target="create-zip-artifact"/>  
-       <antcall target="create-list-artifact"/>  
+       <antcall target="create-zip-artifact"/>		
 
+
    </target>
 </project>
 
Index: appserver/packager/pom.xml
===================================================================
--- appserver/packager/pom.xml	(revision 50131)
+++ appserver/packager/pom.xml	(revision 50132)
@@ -87,14 +87,14 @@
 	<module>glassfish-grizzly</module>
         <module>glassfish-nucleus</module>
 	<module>glassfish-corba-base</module>
-	<module>glassfish-common-tmp</module>
+	<module>glassfish-common</module>
 	<module>shoal</module>
 	<module>glassfish-cluster</module>
 	<module>glassfish-javahelp</module>
 	<module>glassfish-registration</module>
 	<module>glassfish-management</module>
         <module>glassfish-grizzly-full</module>
-        <module>glassfish-common-web</module>
+        <module>glassfish-common-web-tmp</module>
         <module>glassfish-ha</module>
 	<module>glassfish-jca</module>
 	<module>glassfish-jpa</module>
@@ -120,7 +120,7 @@
 	<module>jersey</module>
 	<module>glassfish-jcdi</module>
 	<module>mq</module>
-	<module>glassfish-common</module>
+	<module>glassfish-common-web</module>
 	<module>glassfish-virtualization</module>
         <module>glassfish-paas-gui</module>
 	<module>glassfish-web-incorporation</module>
Index: appserver/packager/glassfish-common/pom.xml
===================================================================
--- appserver/packager/glassfish-common/pom.xml	(revision 50131)
+++ appserver/packager/glassfish-common/pom.xml	(revision 50132)
@@ -68,31 +68,104 @@
                     </tasks>
                 </configuration>               
              </plugin>
+             <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/artifacts</outputDirectory>
+                            <useSubDirectoryPerType>true</useSubDirectoryPerType>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>                            
+                            <includeScope>compile</includeScope>
+                            <includeScope>runtime</includeScope>
+                            <excludeArtifactIds>${packager.artifact.excludes}</excludeArtifactIds>
+                            <stripVersion>true</stripVersion>
+                        </configuration>
+                   </execution>                  
+               </executions>
+           </plugin>
         </plugins>
     </build>
 
 
     <dependencies>
         <!--
-	modules to be included in this bundle - embedded shell static
-	fragment plus intermediate glassfish-common package
+          modules to be included in this bundle
         -->       
-     
-        <!-- embedded shell fragment -->
+
         <dependency>
-           <groupId>org.glassfish.extras</groupId>
-           <artifactId>glassfish-embedded-static-shell-frag</artifactId>
+           <groupId>org.glassfish.common</groupId>
+           <artifactId>glassfish-naming</artifactId>
            <version>${project.version}</version>
+   	</dependency>
+    	<dependency>
+           <groupId>org.glassfish.deployment</groupId>
+           <artifactId>dtds</artifactId>
+           <version>${project.version}</version>
            <type>distribution-fragment</type>
         </dependency>
+        <dependency>
+           <groupId>org.glassfish.deployment</groupId>
+           <artifactId>schemas</artifactId>
+           <version>${project.version}</version>
+           <type>distribution-fragment</type>
+       </dependency>
+        <dependency>
+    	    <groupId>org.glassfish.admin</groupId>
+            <artifactId>monitoring-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+ 
+        <dependency>
+            <groupId>org.glassfish</groupId>
+            <artifactId>paas.orchestrator</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <!-- moving stuff from killed glassfish-security package -->
+        <dependency>
+            <groupId>org.glassfish.security</groupId>
+            <artifactId>security</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+ 
+        <!-- gms-bootstrap module -->
+       <dependency>
+            <groupId>org.glassfish.cluster</groupId>
+            <artifactId>gms-bootstrap</artifactId>
+            <version>${project.version}</version>
+       </dependency>
+ 
+        <!-- mimepull - shared dependency of metro and jersey -->
+        <dependency>
+            <groupId>org.jvnet</groupId>
+            <artifactId>mimepull</artifactId>
+        </dependency>
+
+        
+    
+      	<!-- now, listing package dependencies so that their content
+             can be excluded during staging -->	
+	<!-- package level dependency -->
+
  	<dependency>        
            <groupId>org.glassfish.packager</groupId>
-           <artifactId>glassfish-common-tmp</artifactId>
+           <artifactId>glassfish-corba-base</artifactId>
            <version>${project.version}</version>
-           <type>zip</type>
-        </dependency>   
-
-    </dependencies>
+           <classifier>artifacts</classifier>
+	   <type>properties</type>
+           <scope>provided</scope>
+       </dependency> 
+  
+    </dependencies>    
+    
     <profiles>
         <profile>
             <!--
Index: appserver/packager/glassfish-common/build.xml
===================================================================
--- appserver/packager/glassfish-common/build.xml	(revision 50131)
+++ appserver/packager/glassfish-common/build.xml	(revision 50132)
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2010-2011 Oracle and/or its affiliates. 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
@@ -41,39 +41,30 @@
 
 -->
 
-<project name="glassfish common package creation" default="create.package" basedir=".">
+<project name="glassfish common tmp package creation" default="create.package" basedir=".">
     <import file="${basedir}/../common-targets.xml"/>
 
  <target name="create.package">
- <property name="package.name" value="glassfish-common"/> 
+     <property name="package.name" value="glassfish-common"/> 
+     <property name="previous.package.name" value="glassfish-corba-base" />
 
-        
+       <antcall target="filter-module-artifacts"/>
 
-       <resolveArtifact property="glassfish-common-tmp.zip" groupID="org.glassfish.packager" artifactID="glassfish-common-tmp" type="zip" />
+       <stage-module-jars/>
+       <stage-distribution-fragments/>
+       
+       <!-- brute force cleanup at this point, need to look into extended ant
+           plugin and fix the issue at the source -->
+           
+       <delete file="target/stage/${install.dir.name}/glassfish/modules/activation.jar" failonerror="false" />
+     
 
-
-       <unzip src="${glassfish-common-tmp.zip}"
-           dest="target/stage">
-          <patternset>
-		  <exclude name="META-INF/**"/>
-	  </patternset>
-       </unzip> 
-
-       <resolveArtifact property="embedded-fragment.zip" groupID="org.glassfish.extras" artifactID="glassfish-embedded-static-shell-frag" />
-
-
-       <unzip src="${embedded-fragment.zip}"
-           dest="target/stage/${install.dir.name}">
-          <patternset>
-		  <exclude name="META-INF/**"/>
-	  </patternset>
-       </unzip>  
-      
        <if test="${compression}">
 	       <antcall target="pack.compression" />
        </if>
 
        <antcall target="create-zip-artifact"/>		
+       <antcall target="create-list-artifact"/>
 
    </target>
 </project>
Index: appserver/packager/shoal/pom.xml
===================================================================
--- appserver/packager/shoal/pom.xml	(revision 50131)
+++ appserver/packager/shoal/pom.xml	(revision 50132)
@@ -114,7 +114,7 @@
 
   	<dependency>        
            <groupId>org.glassfish.packager</groupId>
-           <artifactId>glassfish-common-tmp</artifactId>
+           <artifactId>glassfish-common</artifactId>
            <version>${project.version}</version>
            <classifier>artifacts</classifier>
 	   <type>properties</type>
Index: appserver/packager/shoal/build.xml
===================================================================
--- appserver/packager/shoal/build.xml	(revision 50131)
+++ appserver/packager/shoal/build.xml	(revision 50132)
@@ -46,7 +46,7 @@
 
  <target name="create.package">
       <property name="package.name" value="shoal"/> 
-      <property name="previous.package.name" value="glassfish-common-tmp" />
+      <property name="previous.package.name" value="glassfish-common" />
         
        <antcall target="filter-module-artifacts"/>
 
Index: appserver/packager/glassfish-ha/pom.xml
===================================================================
--- appserver/packager/glassfish-ha/pom.xml	(revision 50131)
+++ appserver/packager/glassfish-ha/pom.xml	(revision 50132)
@@ -119,7 +119,7 @@
 
   	<dependency>        
            <groupId>org.glassfish.packager</groupId>
-           <artifactId>glassfish-common-web</artifactId>
+           <artifactId>glassfish-common-web-tmp</artifactId>
            <version>${project.version}</version>
            <classifier>artifacts</classifier>
 	   <type>properties</type>
Index: appserver/packager/glassfish-ha/build.xml
===================================================================
--- appserver/packager/glassfish-ha/build.xml	(revision 50131)
+++ appserver/packager/glassfish-ha/build.xml	(revision 50132)
@@ -46,7 +46,7 @@
 
  <target name="create.package">
       <property name="package.name" value="glassfish-ha"/> 
-      <property name="previous.package.name" value="glassfish-common-web" />
+      <property name="previous.package.name" value="glassfish-common-web-tmp" />
 
       <antcall target="filter-module-artifacts"/>