Index: golden/cluster-deps.txt =================================================================== RCS file: /cvs/ide/golden/cluster-deps.txt,v retrieving revision 1.41 diff -u -r1.41 cluster-deps.txt --- golden/cluster-deps.txt 12 Nov 2005 07:41:36 -0000 1.41 +++ golden/cluster-deps.txt 9 Dec 2005 12:54:42 -0000 @@ -1,4 +1,5 @@ GROUP ide + REQUIRES org.jdesktop.layout/1 (platform) REQUIRES org.netbeans.modules.javahelp/1 (platform) REQUIRES org.netbeans.api.progress/1 (platform) REQUIRES org.netbeans.core/2 (platform) @@ -33,7 +34,7 @@ REQUIRES javax.jmi.model/1 (ide) REQUIRES javax.jmi.reflect/1 (ide) REQUIRES org.apache.tools.ant.module/3 (ide) - REQUIRES org.jdesktop.layout/1 (ide) + REQUIRES org.jdesktop.layout/1 (platform) REQUIRES org.netbeans.api.debugger/1 (ide) REQUIRES org.netbeans.api.debugger.jpda/2 (ide) REQUIRES org.netbeans.api.java/1 (ide) Index: golden/deps.txt =================================================================== RCS file: /cvs/ide/golden/deps.txt,v retrieving revision 1.263 diff -u -r1.263 deps.txt --- golden/deps.txt 7 Dec 2005 19:01:42 -0000 1.263 +++ golden/deps.txt 9 Dec 2005 12:54:46 -0000 @@ -4,7 +4,7 @@ MODULE javax.jmi.reflect/1 (ide) REQUIRES org.openide.modules.ModuleFormat1 MODULE org.apache.tools.ant.module/3 (ide) - REQUIRES org.jdesktop.layout/1 (ide) + REQUIRES org.jdesktop.layout/1 (platform) REQUIRES org.netbeans.api.progress/1 (platform) REQUIRES org.netbeans.api.xml/1 (ide) REQUIRES org.netbeans.libs.formlayout/1 (ide) @@ -27,7 +27,7 @@ REQUIRES org.openide.util (platform) REQUIRES org.openide.windows (platform) REQUIRES org.netbeans.core.output2/1 (platform) -MODULE org.jdesktop.layout/1 (ide) +MODULE org.jdesktop.layout/1 (platform) REQUIRES org.openide.modules.ModuleFormat1 MODULE org.netbeans.api.debugger/1 (ide) REQUIRES org.openide.filesystems (platform) @@ -372,7 +372,7 @@ REQUIRES org.openide.windows (platform) REQUIRES org.netbeans.core.output2/1 (platform) MODULE org.netbeans.modules.db/0 (ide) - REQUIRES org.jdesktop.layout/1 (ide) + REQUIRES org.jdesktop.layout/1 (platform) REQUIRES org.netbeans.modules.javahelp/1 (platform) REQUIRES org.netbeans.api.progress/1 (platform) REQUIRES org.openide.actions (platform) @@ -479,7 +479,7 @@ MODULE org.netbeans.modules.defaults/1 (ide) REQUIRES org.openide.modules.ModuleFormat1 MODULE org.netbeans.modules.derby (j2ee) - REQUIRES org.jdesktop.layout/1 (ide) + REQUIRES org.jdesktop.layout/1 (platform) REQUIRES org.netbeans.api.progress/1 (platform) REQUIRES org.netbeans.modules.db/0 (ide) REQUIRES org.netbeans.modules.java.platform/1 (ide) @@ -659,7 +659,7 @@ REQUIRES org.openide.windows (platform) MODULE org.netbeans.modules.form/2 (ide) REQUIRES javax.jmi.reflect/1 (ide) - REQUIRES org.jdesktop.layout/1 (ide) + REQUIRES org.jdesktop.layout/1 (platform) REQUIRES org.netbeans.api.java/1 (ide) REQUIRES org.netbeans.api.mdr/1 (ide) REQUIRES org.netbeans.core.multiview/1 (platform) @@ -1135,7 +1135,7 @@ REQUIRES org.openide.text (platform) REQUIRES org.openide.util (platform) MODULE org.netbeans.modules.j2ee.sun.appsrv/1 (j2ee) - REQUIRES org.jdesktop.layout/1 (ide) + REQUIRES org.jdesktop.layout/1 (platform) REQUIRES org.netbeans.api.xml/1 (ide) REQUIRES org.netbeans.modules.db/0 (ide) REQUIRES org.netbeans.modules.j2ee.sun.dd/1 (j2ee) @@ -1158,7 +1158,7 @@ REQUIRES org.openide.options (platform) REQUIRES org.openide.util (platform) MODULE org.netbeans.modules.j2ee.sun.appsrv81/1 (j2ee) - REQUIRES org.jdesktop.layout/1 (ide) + REQUIRES org.jdesktop.layout/1 (platform) REQUIRES org.netbeans.api.debugger/1 (ide) REQUIRES org.netbeans.api.debugger.jpda/2 (ide) REQUIRES org.netbeans.api.xml/1 (ide) @@ -1883,7 +1883,7 @@ REQUIRES org.openide.modules.ModuleFormat1 REQUIRES org.openide.util (platform) MODULE org.netbeans.modules.versioning.system.cvss/1 (ide) - REQUIRES org.jdesktop.layout/1 (ide) + REQUIRES org.jdesktop.layout/1 (platform) REQUIRES org.netbeans.api.progress/1 (platform) REQUIRES org.netbeans.api.xml/1 (ide) REQUIRES org.netbeans.lib.cvsclient/1 (ide) @@ -2086,7 +2086,7 @@ MODULE org.netbeans.modules.web.project (j2ee) REQUIRES javax.jmi.reflect/1 (ide) REQUIRES org.apache.tools.ant.module/3 (ide) - REQUIRES org.jdesktop.layout/1 (ide) + REQUIRES org.jdesktop.layout/1 (platform) REQUIRES org.netbeans.api.debugger/1 (ide) REQUIRES org.netbeans.api.debugger.jpda/2 (ide) REQUIRES org.netbeans.api.java/1 (ide) Index: golden/files-layout.txt =================================================================== RCS file: /cvs/ide/golden/files-layout.txt,v retrieving revision 1.123 diff -u -r1.123 files-layout.txt --- golden/files-layout.txt 9 Dec 2005 10:42:50 -0000 1.123 +++ golden/files-layout.txt 9 Dec 2005 12:54:50 -0000 @@ -584,7 +584,6 @@ ide6/config/Modules/javax-jmi-model.xml ide6/config/Modules/javax-jmi-reflect.xml ide6/config/Modules/org-apache-tools-ant-module.xml -ide6/config/Modules/org-jdesktop-layout.xml ide6/config/Modules/org-netbeans-api-debugger-jpda.xml ide6/config/Modules/org-netbeans-api-debugger.xml ide6/config/Modules/org-netbeans-api-java.xml @@ -698,7 +697,6 @@ ide6/docs/html40.zip ide6/docs/junit-3.8.1-api.zip ide6/docs/org/netbeans/modules/usersguide/ide.css -ide6/docs/swing-layout-1.0-doc.zip ide6/modules/docs/org-netbeans-modules-apisupport-project.jar ide6/modules/docs/org-netbeans-modules-db.jar ide6/modules/docs/org-netbeans-modules-usersguide.jar @@ -734,7 +732,6 @@ ide6/modules/ext/resolver-1_1_nb.jar ide6/modules/ext/sac.jar ide6/modules/ext/servlet-2.2.jar -ide6/modules/ext/swing-layout-1.0.jar ide6/modules/ext/webserver.jar ide6/modules/ext/xerces-2.6.2.jar ide6/modules/ext/xml-commons-dom-ranges-1.0.b2.jar @@ -743,7 +740,6 @@ ide6/modules/lib/extbrowser.dll ide6/modules/lib/extbrowser64.dll ide6/modules/org-apache-tools-ant-module.jar -ide6/modules/org-jdesktop-layout.jar ide6/modules/org-netbeans-api-debugger-jpda.jar ide6/modules/org-netbeans-api-debugger.jar ide6/modules/org-netbeans-api-java.jar @@ -859,7 +855,6 @@ ide6/update_tracking/javax-jmi-model.xml ide6/update_tracking/javax-jmi-reflect.xml ide6/update_tracking/org-apache-tools-ant-module.xml -ide6/update_tracking/org-jdesktop-layout.xml ide6/update_tracking/org-netbeans-api-debugger-jpda.xml ide6/update_tracking/org-netbeans-api-debugger.xml ide6/update_tracking/org-netbeans-api-java.xml @@ -1093,6 +1088,7 @@ platform6/config/ModuleAutoDeps/org-netbeans-modules-queries.xml platform6/config/ModuleAutoDeps/org-openide-execution.xml platform6/config/ModuleAutoDeps/org-openide-modules.xml +platform6/config/Modules/org-jdesktop-layout.xml platform6/config/Modules/org-netbeans-api-progress.xml platform6/config/Modules/org-netbeans-core-execution.xml platform6/config/Modules/org-netbeans-core-multiview.xml @@ -1124,6 +1120,7 @@ platform6/core/core.jar platform6/core/ide.ks platform6/core/org-openide-filesystems.jar +platform6/docs/swing-layout-1.0-doc.zip platform6/lib/boot.jar platform6/lib/nbexec platform6/lib/nbexec.cmd @@ -1131,7 +1128,9 @@ platform6/lib/org-openide-modules.jar platform6/lib/org-openide-util.jar platform6/modules/ext/jh-2.0_02.jar +platform6/modules/ext/swing-layout-1.0.jar platform6/modules/ext/updater.jar +platform6/modules/org-jdesktop-layout.jar platform6/modules/org-netbeans-api-progress.jar platform6/modules/org-netbeans-core-execution.jar platform6/modules/org-netbeans-core-multiview.jar @@ -1160,6 +1159,7 @@ platform6/modules/org-openide-text.jar platform6/modules/org-openide-util-enumerations.jar platform6/modules/org-openide-windows.jar +platform6/update_tracking/org-jdesktop-layout.xml platform6/update_tracking/org-netbeans-api-progress.xml platform6/update_tracking/org-netbeans-bootstrap.xml platform6/update_tracking/org-netbeans-core-execution.xml Index: golden/moduleconfigs.txt =================================================================== RCS file: /cvs/ide/golden/moduleconfigs.txt,v retrieving revision 1.14 diff -u -r1.14 moduleconfigs.txt --- golden/moduleconfigs.txt 29 Nov 2005 23:19:43 -0000 1.14 +++ golden/moduleconfigs.txt 9 Dec 2005 12:54:51 -0000 @@ -363,6 +363,7 @@ platform:core/swing/tabcontrol platform:core/ui platform:core/windows +platform:libs/swing-layout platform:openide/actions platform:openide/awt platform:openide/compat Index: golden/modules.txt =================================================================== RCS file: /cvs/ide/golden/modules.txt,v retrieving revision 1.57 diff -u -r1.57 modules.txt --- golden/modules.txt 12 Nov 2005 06:49:17 -0000 1.57 +++ golden/modules.txt 9 Dec 2005 12:54:51 -0000 @@ -1,7 +1,7 @@ MODULE javax.jmi.model/1 (ide) MODULE javax.jmi.reflect/1 (ide) MODULE org.apache.tools.ant.module/3 (ide) -MODULE org.jdesktop.layout/1 (ide) +MODULE org.jdesktop.layout/1 (platform) MODULE org.netbeans.api.debugger/1 (ide) MODULE org.netbeans.api.debugger.jpda/2 (ide) MODULE org.netbeans.api.java/1 (ide)