Index: appclient/client/acc/pom.xml
===================================================================
--- appclient/client/acc/pom.xml	(revision 51312)
+++ appclient/client/acc/pom.xml	(working copy)
@@ -303,7 +303,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: orb/orb-iiop/pom.xml
===================================================================
--- orb/orb-iiop/pom.xml	(revision 51312)
+++ orb/orb-iiop/pom.xml	(working copy)
@@ -85,28 +85,28 @@
             <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>
         <dependency>
-            <groupId>com.sun.corba</groupId>
+            <groupId>org.glassfish.corba</groupId>
             <artifactId>glassfish-corba-orbgeneric</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.sun.corba</groupId>
+            <groupId>org.glassfish.corba</groupId>
             <artifactId>glassfish-corba-codegen</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.sun.corba</groupId>
+            <groupId>org.glassfish.corba</groupId>
             <artifactId>glassfish-corba-asm</artifactId>
         </dependency>
         <dependency>
Index: orb/orb-connector/pom.xml
===================================================================
--- orb/orb-connector/pom.xml	(revision 51312)
+++ orb/orb-connector/pom.xml	(working copy)
@@ -69,15 +69,15 @@
     </developers>
     <dependencies>
         <dependency>
-            <groupId>com.sun.corba</groupId>
+            <groupId>org.glassfish.corba</groupId>
             <artifactId>glassfish-corba-orbgeneric</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: pom.xml
===================================================================
--- pom.xml	(revision 51312)
+++ pom.xml	(working copy)
@@ -138,7 +138,7 @@
         <build.id>${user.name}-private</build.id><!-- on Hudson and RE, this gets replaced by real build ID -->
         <stax-api.version>1.0-2</stax-api.version>
         <jsftemplating.version>2.1.0</jsftemplating.version>
-        <glassfish-corba.version>3.1.0-b030</glassfish-corba.version>
+        <glassfish-corba.version>3.1.0-b032</glassfish-corba.version>
         <uc-pkg-client.version>1.122-55.2842</uc-pkg-client.version>
         <uc-pkg-bootstrap.version>1.122-55.2842</uc-pkg-bootstrap.version>
 
@@ -1387,42 +1387,42 @@
             </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-orbgeneric</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-internal-api</artifactId>
                 <version>${glassfish-corba.version}</version>
             </dependency>
             <dependency>
-                <groupId>com.sun.corba</groupId>
+                <groupId>org.glassfish.corba</groupId>
                 <artifactId>glassfish-corba-codegen</artifactId>
                 <version>${glassfish-corba.version}</version>
             </dependency>
             <dependency>
-                <groupId>com.sun.corba</groupId>
+                <groupId>org.glassfish.corba</groupId>
                 <artifactId>glassfish-corba-asm</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-newtimer</artifactId>
                 <version>${glassfish-corba.version}</version>
             </dependency>
Index: packager/glassfish-corba-base/pom.xml
===================================================================
--- packager/glassfish-corba-base/pom.xml	(revision 51312)
+++ packager/glassfish-corba-base/pom.xml	(working copy)
@@ -99,15 +99,15 @@
           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>
          <dependency>
-            <groupId>com.sun.corba</groupId>
+            <groupId>org.glassfish.corba</groupId>
             <artifactId>glassfish-corba-orbgeneric</artifactId>
          </dependency>
         <!-- now, listing package dependencies so that their content
Index: packager/glassfish-corba/pom.xml
===================================================================
--- packager/glassfish-corba/pom.xml	(revision 51312)
+++ packager/glassfish-corba/pom.xml	(working copy)
@@ -99,23 +99,23 @@
 	  -->   
 
         <dependency>
-            <groupId>com.sun.corba</groupId>
+            <groupId>org.glassfish.corba</groupId>
             <artifactId>glassfish-corba-codegen</artifactId>
         </dependency>
 	<dependency>
-            <groupId>com.sun.corba</groupId>
+            <groupId>org.glassfish.corba</groupId>
             <artifactId>glassfish-corba-asm</artifactId>
         </dependency> 
        <dependency>
-            <groupId>com.sun.corba</groupId>
+            <groupId>org.glassfish.corba</groupId>
             <artifactId>glassfish-corba-newtimer</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: packager/resources/pkg_conf.py
===================================================================
--- packager/resources/pkg_conf.py	(revision 51312)
+++ packager/resources/pkg_conf.py	(working copy)
@@ -63,7 +63,7 @@
 glassfish_version="3.1.2,0-${build.id}"
 felix_version="4.0.2,0-0"
 javadb_version="10.5.3.0,0-0"
-corba_version="3.1.0,0-30"
+corba_version="3.1.0,0-32"
 jsf_version="2.1.5,0-4"
 grizzly_version="1.9.42,0-1"
 metro_version="2.2,0-10"
Index: transaction/jts/pom.xml
===================================================================
--- transaction/jts/pom.xml	(revision 51312)
+++ transaction/jts/pom.xml	(working copy)
@@ -155,15 +155,15 @@
             <version>${project.parent.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>
             <optional>true</optional>
         </dependency>
Index: common/glassfish-naming/pom.xml
===================================================================
--- common/glassfish-naming/pom.xml	(revision 51312)
+++ common/glassfish-naming/pom.xml	(working copy)
@@ -91,11 +91,11 @@
     </build>
     <dependencies>
         <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: ejb/ejb-container/pom.xml
===================================================================
--- ejb/ejb-container/pom.xml	(revision 51312)
+++ ejb/ejb-container/pom.xml	(working copy)
@@ -248,7 +248,7 @@
             <version>${hk2.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.sun.corba</groupId>
+            <groupId>org.glassfish.corba</groupId>
             <artifactId>glassfish-corba-codegen</artifactId>
             <version>${glassfish-corba.version}</version>
 	    <optional>true</optional> 
Index: security/ejb.security/pom.xml
===================================================================
--- security/ejb.security/pom.xml	(revision 51312)
+++ security/ejb.security/pom.xml	(working copy)
@@ -150,19 +150,19 @@
             <version>${project.version}</version>
         </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>