diff -r 79b2a68dde5b glassfish.common/src/org/netbeans/modules/glassfish/common/GlassfishInstanceProvider.java
--- a/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassfishInstanceProvider.java	Tue Jul 01 10:09:52 2008 +0200
+++ b/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassfishInstanceProvider.java	Wed Jul 02 20:32:39 2008 +0200
@@ -81,9 +81,12 @@
             Collections.synchronizedMap(new HashMap<String, GlassfishInstance>());
     private final ChangeSupport support = new ChangeSupport(this);
 
+    static {
+        registerDefaultInstance();
+    }
+    
     private GlassfishInstanceProvider() {
         try {
-            registerDefaultInstance();
             loadServerInstances();
         } catch(Exception ex) {
             Logger.getLogger("glassfish").log(Level.INFO, null, ex);
@@ -252,7 +255,7 @@
         return instance;
     }
 
-    private void writeInstanceToFile(GlassfishInstance instance) throws IOException {
+    private static void writeInstanceToFile(GlassfishInstance instance) throws IOException {
         String glassfishRoot = instance.getGlassfishRoot();
         if(glassfishRoot == null) {
             getLogger().log(Level.SEVERE, NbBundle.getMessage(GlassfishInstanceProvider.class, "MSG_NullServerFolder"));
@@ -321,7 +324,7 @@
         return null;
     }
 
-    private FileObject getRepositoryDir(String path, boolean create) {
+    private static FileObject getRepositoryDir(String path, boolean create) {
         FileSystem fs = Repository.getDefault().getDefaultFileSystem();
         FileObject dir = fs.findResource(path);
         if(dir == null && create) {
@@ -380,9 +383,9 @@
         return result;
     }
     
-    private void registerDefaultInstance() {
+    private static void registerDefaultInstance() {
         final boolean needToRegisterDefaultServer =
-                !NbPreferences.forModule(this.getClass()).getBoolean(PROP_FIRST_RUN, false);
+                !NbPreferences.forModule(GlassfishInstanceProvider.class).getBoolean(PROP_FIRST_RUN, false);
 
         if (needToRegisterDefaultServer) {
             try {
@@ -399,18 +402,18 @@
                                 f.getCanonicalPath() + File.separator + "glassfish");
                         if (f.canWrite()) {
                             ip.put(GlassfishModule.DISPLAY_NAME_ATTR,
-                                NbBundle.getMessage(this.getClass(), "DEFAULT_DOMAIN_NAME"));
+                                NbBundle.getMessage(GlassfishInstanceProvider.class, "DEFAULT_DOMAIN_NAME"));
                             ip.put(GlassfishModule.HTTPPORT_ATTR,
                                     Integer.toString(8080));
                             ip.put(GlassfishModule.ADMINPORT_ATTR,
                                     Integer.toString(4848));
                             GlassfishInstance gi = GlassfishInstance.create(ip);
-                            addServerInstance(gi);
-                            NbPreferences.forModule(this.getClass()).putBoolean(PROP_FIRST_RUN, true);
+                            writeInstanceToFile(gi);
+                            NbPreferences.forModule(GlassfishInstanceProvider.class).putBoolean(PROP_FIRST_RUN, true);
                         } else {
                             Map<String, String> createProps = new HashMap<String, String>();
                             ip.put(GlassfishModule.DISPLAY_NAME_ATTR,
-                                NbBundle.getMessage(this.getClass(), "PERSONAL_DOMAIN_NAME")); // NOI18N
+                                NbBundle.getMessage(GlassfishInstanceProvider.class, "PERSONAL_DOMAIN_NAME")); // NOI18N
                             String domainsFolderValue = System.getProperty("netbeans.user"); // NOI18N
                             String domainNameValue = "GlassfishV3Domain";    // NOI18N
                             ip.put(GlassfishModule.DOMAINS_FOLDER_ATTR, domainsFolderValue);
@@ -426,11 +429,12 @@
                     }
                 }
             } catch (IOException ioe) {
+                Logger.getLogger("glassfish").log(Level.FINE, null, ioe);
             }
         }
     }
 
-    private void computePorts(Map<String, String> ip, Map<String, String> createProps) {
+    private static void computePorts(Map<String, String> ip, Map<String, String> createProps) {
         int portBase = 8900;
         int kicker = ip.get(GlassfishModule.DOMAINS_FOLDER_ATTR).hashCode() % 50000;
         kicker = kicker < 0 ? -kicker : kicker;
diff -r 79b2a68dde5b glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2DeploymentFactory.java
--- a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2DeploymentFactory.java	Tue Jul 01 10:09:52 2008 +0200
+++ b/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2DeploymentFactory.java	Wed Jul 02 20:32:39 2008 +0200
@@ -44,6 +44,7 @@
 import javax.enterprise.deploy.spi.DeploymentManager;
 import javax.enterprise.deploy.spi.exceptions.DeploymentManagerCreationException;
 import javax.enterprise.deploy.spi.factories.DeploymentFactory;
+import org.netbeans.modules.glassfish.spi.ServerUtilities;
 import org.openide.util.NbBundle;
 
 
@@ -57,7 +58,7 @@
 
     private static DeploymentFactory instance;
 
-
+    
     /**
      * 
      * @return 
@@ -66,6 +67,9 @@
         if (instance == null) {
             instance = new Hk2DeploymentFactory();
             DeploymentFactoryManager.getInstance().registerDeploymentFactory(instance);
+
+            // invokes static initializer
+            ServerUtilities.getServerProvider();
         }
         return instance;
     }