Index: core/kernel/src/main/java/com/sun/enterprise/v3/admin/AdminConsoleConfigUpgrade.java
===================================================================
--- core/kernel/src/main/java/com/sun/enterprise/v3/admin/AdminConsoleConfigUpgrade.java	(revision 44566)
+++ core/kernel/src/main/java/com/sun/enterprise/v3/admin/AdminConsoleConfigUpgrade.java	(working copy)
@@ -1,7 +1,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
@@ -84,6 +84,11 @@
     @Inject
     Configs configs;
 
+    // This will force the Grizzly upgrade code to run before
+    // AdminConsoleConfigUpgrade runs.
+    @Inject(name="grizzlyconfigupgrade", optional=true)
+    ConfigurationUpgrade precondition = null;
+
     @Override
     public void postConstruct() {
         Config config = configs.getConfigByName("server-config");
Index: admin/config-api/src/main/java/org/glassfish/config/support/DomainXml.java
===================================================================
--- admin/config-api/src/main/java/org/glassfish/config/support/DomainXml.java	(revision 44566)
+++ admin/config-api/src/main/java/org/glassfish/config/support/DomainXml.java	(working copy)
@@ -145,7 +145,21 @@
     }
 
     protected void upgrade() {
+        /* START HACK */
+        String abc = "com.sun.enterprise.v3.admin.AdminConsoleConfigUpgrade";
 
+        for (Inhabitant<? extends ConfigurationUpgrade> cu : habitat.getInhabitants(ConfigurationUpgrade.class)) {
+            if (abc.equals(cu.typeName())) {
+                try {
+                    cu.get(); // run the upgrade
+                }
+                catch (Throwable t) {
+                    javax.swing.JOptionPane.showMessageDialog(null, t.getMessage());
+                }
+            }
+        }
+        /* END HACK */
+
         // run the upgrades...
         for (Inhabitant<? extends ConfigurationUpgrade> cu : habitat.getInhabitants(ConfigurationUpgrade.class)) {
             try {