1.1 --- a/jnlpmodules/src/org/netbeans/modules/jnlpmodules/ClasspathModule.java	Tue Nov 22 12:13:48 2005 +0000
     1.2 +++ b/jnlpmodules/src/org/netbeans/modules/jnlpmodules/ClasspathModule.java	Tue Nov 22 22:54:00 2005 +0000
     1.3 @@ -202,13 +202,14 @@
     1.4       * and cannot be uninstalled or manipulated in any way.
     1.5       */
     1.6      public boolean isFixed() {
     1.7 -        return getCodeName().equals("org.openide/1") ||
     1.8 -               getCodeName().equals("org.netbeans.core/1") ||
     1.9 -               getCodeName().equals("org.openide.loaders") ||
    1.10 -               getCodeName().equals("org.netbeans.libs.xerces/1") ||
    1.11 -               getCodeName().equals("org.netbeans.modules.zeroadmin/1");
    1.12 +        return getCodeName().equals("org.netbeans.bootstrap/1") ||
    1.13 +               getCodeName().equals("org.netbeans.core.startup/1") ||
    1.14 +               getCodeName().equals("org.netbeans.modules.jnlpmodules") ||
    1.15 +               getCodeName().equals("org.openide.modules") ||
    1.16 +               getCodeName().equals("org.openide.util") ||
    1.17 +               getCodeName().equals("org.openide.filesystems"); // ??? getCodeName().equals("org.netbeans.libs.xerces/1") ||
    1.18      }
    1.19 -    
    1.20 +
    1.21      /** Find any extensions loaded by the module, as well as any localized
    1.22       * variants of the module or its extensions.
    1.23       */
    1.24 @@ -439,11 +440,12 @@
    1.25          
    1.26          try {
    1.27                  if ((delegate != null) &&
    1.28 -                    ( (getCodeName().equals("org.openide/1")) ||
    1.29 -                      (getCodeName().equals("org.netbeans.core/1")) ||
    1.30 -                      (getCodeName().equals("org.openide.loaders")) || 
    1.31 -                      (getCodeName().equals("org.netbeans.libs.xerces/1")) ||
    1.32 -                      (getCodeName().equals("org.netbeans.modules.zeroadmin/1"))
    1.33 +                    ( (getCodeName().equals("org.netbeans.bootstrap/1")) ||
    1.34 +                      (getCodeName().equals("org.netbeans.core.startup/1")) ||
    1.35 +                      (getCodeName().equals("org.netbeans.modules.jnlpmodules")) || 
    1.36 +                      (getCodeName().equals("org.openide.modules")) ||
    1.37 +                      (getCodeName().equals("org.openide.util")) ||
    1.38 +                      (getCodeName().equals("org.openide.filesystems")) //  ??? (getCodeName().equals("org.netbeans.libs.xerces/1")) ||
    1.39                      )
    1.40                  ) {
    1.41                      classloader = delegate;

     2.1 --- a/jnlpmodules/src/org/netbeans/modules/jnlpmodules/JNLPModuleFactory.java	Tue Nov 22 12:13:48 2005 +0000
     2.2 +++ b/jnlpmodules/src/org/netbeans/modules/jnlpmodules/JNLPModuleFactory.java	Tue Nov 22 22:54:00 2005 +0000
     2.3 @@ -287,11 +287,12 @@
     2.4              Set m = mgr.getModules();
     2.5              for (Iterator it = m.iterator(); it.hasNext(); ) {
     2.6                  Module m1 = (Module)it.next();
     2.7 -                if (  (m1.getCodeName().equals("org.openide/1")) ||
     2.8 -                      (m1.getCodeName().equals("org.netbeans.core/1")) ||
     2.9 -                      (m1.getCodeName().equals("org.openide.loaders")) ||
    2.10 -                      (m1.getCodeName().equals("org.netbeans.libs.xerces/1")) ||
    2.11 -                      (m1.getCodeName().equals("org.netbeans.modules.zeroadmin/1")) 
    2.12 +                if (  m1.getCodeName().equals("org.netbeans.bootstrap/1") ||
    2.13 +                      m1.getCodeName().equals("org.netbeans.core.startup/1") ||
    2.14 +                      m1.getCodeName().equals("org.netbeans.modules.jnlpmodules") ||
    2.15 +                      m1.getCodeName().equals("org.openide.modules") ||
    2.16 +                      m1.getCodeName().equals("org.openide.util") ||
    2.17 +                      m1.getCodeName().equals("org.openide.filesystems")
    2.18                  ) {
    2.19                      if (m1 instanceof ClasspathModule) {
    2.20                          ClasspathModule cpm1 = (ClasspathModule)m1;