Index: appserver/appclient/client/acc/pom.xml
===================================================================
--- appserver/appclient/client/acc/pom.xml	(revision 49193)
+++ appserver/appclient/client/acc/pom.xml	(working copy)
@@ -312,7 +312,7 @@
             so I have just included it here.
         -->
         <dependency>
-            <groupId>com.sun.corba</groupId>
+            <groupId>org.glassfish.corba</groupId>
             <artifactId>glassfish-corba-orb</artifactId>
         </dependency>
 
Index: appserver/orb/orb-iiop/pom.xml
===================================================================
--- appserver/orb/orb-iiop/pom.xml	(revision 49193)
+++ appserver/orb/orb-iiop/pom.xml	(working copy)
@@ -90,15 +90,15 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.sun.corba</groupId>
+            <groupId>org.glassfish.corba</groupId>
             <artifactId>glassfish-corba-omgapi</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.sun.corba</groupId>
+            <groupId>org.glassfish.corba</groupId>
             <artifactId>glassfish-corba-internal-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.sun.corba</groupId>
+            <groupId>org.glassfish.corba</groupId>
             <artifactId>glassfish-corba-orb</artifactId>
             <type>jar</type>
         </dependency>
Index: appserver/orb/orb-connector/pom.xml
===================================================================
--- appserver/orb/orb-connector/pom.xml	(revision 49193)
+++ appserver/orb/orb-connector/pom.xml	(working copy)
@@ -78,11 +78,11 @@
             <artifactId>pfl-basic</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.sun.corba</groupId>
+            <groupId>org.glassfish.corba</groupId>
             <artifactId>glassfish-corba-omgapi</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.sun.corba</groupId>
+            <groupId>org.glassfish.corba</groupId>
             <artifactId>glassfish-corba-internal-api</artifactId>
         </dependency>
         <dependency>
Index: appserver/packager/glassfish-corba-base/pom.xml
===================================================================
--- appserver/packager/glassfish-corba-base/pom.xml	(revision 49193)
+++ appserver/packager/glassfish-corba-base/pom.xml	(working copy)
@@ -99,11 +99,11 @@
           modules to be included in this bundle
         -->       
          <dependency>
-            <groupId>com.sun.corba</groupId>
+            <groupId>org.glassfish.corba</groupId>
             <artifactId>glassfish-corba-omgapi</artifactId>
          </dependency>
          <dependency>
-            <groupId>com.sun.corba</groupId>
+            <groupId>org.glassfish.corba</groupId>
             <artifactId>glassfish-corba-internal-api</artifactId>
          </dependency>
 
Index: appserver/packager/glassfish-corba/pom.xml
===================================================================
--- appserver/packager/glassfish-corba/pom.xml	(revision 49193)
+++ appserver/packager/glassfish-corba/pom.xml	(working copy)
@@ -111,11 +111,11 @@
             <artifactId>pfl-tf</artifactId>
        </dependency>
        <dependency>
-            <groupId>com.sun.corba</groupId>
+            <groupId>org.glassfish.corba</groupId>
             <artifactId>glassfish-corba-orb</artifactId>
        </dependency>
        <dependency>
-            <groupId>com.sun.corba</groupId>
+            <groupId>org.glassfish.corba</groupId>
             <artifactId>glassfish-corba-csiv2-idl</artifactId>
         </dependency>
 
Index: appserver/packager/resources/pkg_conf.py
===================================================================
--- appserver/packager/resources/pkg_conf.py	(revision 49193)
+++ appserver/packager/resources/pkg_conf.py	(working copy)
@@ -63,7 +63,7 @@
 glassfish_version="3.2,0-${build.id}"
 felix_version="3.0.8,0-0"
 javadb_version="10.5.3.0,0-0"
-corba_version="3.2.0,0-2"
+corba_version="3.2.0,0-6"
 jsf_version="2.1.3,0-4"
 grizzly_version="2.1.2,0-0"
 metro_version="2.1,0-30"
Index: appserver/transaction/jts/pom.xml
===================================================================
--- appserver/transaction/jts/pom.xml	(revision 49193)
+++ appserver/transaction/jts/pom.xml	(working copy)
@@ -161,15 +161,15 @@
             <artifactId>pfl-basic</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.sun.corba</groupId>
+            <groupId>org.glassfish.corba</groupId>
             <artifactId>glassfish-corba-omgapi</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.sun.corba</groupId>
+            <groupId>org.glassfish.corba</groupId>
             <artifactId>glassfish-corba-internal-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.sun.corba</groupId>
+            <groupId>org.glassfish.corba</groupId>
             <artifactId>glassfish-corba-orb</artifactId>
             <optional>true</optional>
         </dependency>
Index: appserver/security/ejb.security/pom.xml
===================================================================
--- appserver/security/ejb.security/pom.xml	(revision 49193)
+++ appserver/security/ejb.security/pom.xml	(working copy)
@@ -128,19 +128,19 @@
             <artifactId>pfl-basic</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.sun.corba</groupId>
+            <groupId>org.glassfish.corba</groupId>
             <artifactId>glassfish-corba-csiv2-idl</artifactId>
         </dependency>
          <dependency>
-            <groupId>com.sun.corba</groupId>
+            <groupId>org.glassfish.corba</groupId>
             <artifactId>glassfish-corba-omgapi</artifactId>
         </dependency>
          <dependency>
-            <groupId>com.sun.corba</groupId>
+            <groupId>org.glassfish.corba</groupId>
             <artifactId>glassfish-corba-internal-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.sun.corba</groupId>
+            <groupId>org.glassfish.corba</groupId>
             <artifactId>glassfish-corba-orb</artifactId>
         </dependency>
         <dependency>
Index: pom.xml
===================================================================
--- pom.xml	(revision 49193)
+++ pom.xml	(working copy)
@@ -129,7 +129,7 @@
 
         <pfl.version>3.2.0-b001</pfl.version>
         <gmbal.version>3.2.0-b003</gmbal.version>
-        <glassfish-corba.version>3.2.0-b005</glassfish-corba.version>
+        <glassfish-corba.version>3.2.0-b006</glassfish-corba.version>
 
         <uc-pkg-client.version>1.122-54.2834</uc-pkg-client.version>
         <uc-pkg-bootstrap.version>1.122-54.2834</uc-pkg-bootstrap.version>
@@ -1140,22 +1140,22 @@
             </dependency>
 
             <dependency>
-                <groupId>com.sun.corba</groupId>
+                <groupId>org.glassfish.corba</groupId>
                 <artifactId>glassfish-corba-orb</artifactId>
                 <version>${glassfish-corba.version}</version>
             </dependency>
             <dependency>
-                <groupId>com.sun.corba</groupId>
+                <groupId>org.glassfish.corba</groupId>
                 <artifactId>glassfish-corba-omgapi</artifactId>
                 <version>${glassfish-corba.version}</version>
             </dependency>
             <dependency>
-                <groupId>com.sun.corba</groupId>
+                <groupId>org.glassfish.corba</groupId>
                 <artifactId>glassfish-corba-csiv2-idl</artifactId>
                 <version>${glassfish-corba.version}</version>
             </dependency>
             <dependency>
-                <groupId>com.sun.corba</groupId>
+                <groupId>org.glassfish.corba</groupId>
                 <artifactId>glassfish-corba-internal-api</artifactId>
                 <version>${glassfish-corba.version}</version>
             </dependency>
Index: nucleus/common/glassfish-naming/pom.xml
===================================================================
--- nucleus/common/glassfish-naming/pom.xml	(revision 49193)
+++ nucleus/common/glassfish-naming/pom.xml	(working copy)
@@ -87,7 +87,7 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>com.sun.corba</groupId>
+            <groupId>org.glassfish.corba</groupId>
             <artifactId>glassfish-corba-internal-api</artifactId>
         </dependency>
         <dependency>