cvs diff (in directory P:\trunk2\nb_all\nbbuild\) Index: cluster.properties =================================================================== RCS file: /cvs/nbbuild/cluster.properties,v retrieving revision 1.205 diff -u -r1.205 cluster.properties --- cluster.properties 30 Mar 2007 03:56:06 -0000 1.205 +++ cluster.properties 30 Mar 2007 20:42:33 -0000 @@ -218,6 +218,7 @@ db,\ db/core,\ db/dbapi,\ + db/derby,\ db/model,\ db/sqleditor,\ extbrowser,\ @@ -278,7 +279,6 @@ nb.cluster.ide,\ nb.cluster.platform nb.cluster.j2ee=\ - db/derby,\ j2ee/archiveproject,\ j2ee/blueprints,\ j2ee/clientproject,\ cvs diff (in directory P:\trunk2\nb_all\ide\golden\) Index: cluster-deps.txt =================================================================== RCS file: /cvs/ide/golden/cluster-deps.txt,v retrieving revision 1.85 diff -u -r1.85 cluster-deps.txt --- cluster-deps.txt 29 Mar 2007 06:39:26 -0000 1.85 +++ cluster-deps.txt 31 Mar 2007 04:43:27 -0000 @@ -51,6 +51,7 @@ REQUIRES org.netbeans.modules.ant.freeform/1 (ide) REQUIRES org.netbeans.modules.db/0 (ide) REQUIRES org.netbeans.modules.dbschema/1 (ide) + REQUIRES org.netbeans.modules.derby (ide) REQUIRES org.netbeans.modules.editor/3 (ide) REQUIRES org.netbeans.modules.editor.completion/1 (ide) REQUIRES org.netbeans.modules.editor.errorstripe.api/1 (ide) Index: deps.txt =================================================================== RCS file: /cvs/ide/golden/deps.txt,v retrieving revision 1.498 diff -u -r1.498 deps.txt --- deps.txt 30 Mar 2007 03:37:54 -0000 1.498 +++ deps.txt 31 Mar 2007 05:07:25 -0000 @@ -464,7 +464,7 @@ REQUIRES org.openide.windows (platform) MODULE org.netbeans.modules.defaults/1 (ide) REQUIRES org.openide.modules.ModuleFormat1 -MODULE org.netbeans.modules.derby (j2ee) +MODULE org.netbeans.modules.derby (ide) REQUIRES org.jdesktop.layout/1 (platform) REQUIRES org.netbeans.api.progress/1 (platform) REQUIRES org.netbeans.modules.db/0 (ide) @@ -1262,7 +1262,7 @@ MODULE org.netbeans.modules.j2ee.samples (j2ee) REQUIRES org.jdesktop.layout/1 (platform) REQUIRES org.netbeans.modules.db/0 (ide) - REQUIRES org.netbeans.modules.derby (j2ee) + REQUIRES org.netbeans.modules.derby (ide) REQUIRES org.netbeans.modules.j2eeserver/4 (j2ee) REQUIRES org.netbeans.modules.projectapi/1 (ide) REQUIRES org.netbeans.modules.projectuiapi/1 (ide) @@ -1304,7 +1304,7 @@ REQUIRES org.netbeans.api.xml/1 (ide) REQUIRES org.netbeans.libs.xerces/1 (ide) REQUIRES org.netbeans.modules.db/0 (ide) - REQUIRES org.netbeans.modules.derby (j2ee) + REQUIRES org.netbeans.modules.derby (ide) REQUIRES org.netbeans.modules.j2ee.dd/1 (j2ee) REQUIRES org.netbeans.modules.j2ee.sun.appsrv/1 (j2ee) REQUIRES org.netbeans.modules.j2ee.sun.dd/1 (j2ee) Index: files-layout.txt =================================================================== RCS file: /cvs/ide/golden/files-layout.txt,v retrieving revision 1.222 diff -u -r1.222 files-layout.txt --- files-layout.txt 30 Mar 2007 04:13:29 -0000 1.222 +++ files-layout.txt 30 Mar 2007 21:15:41 -0000 @@ -313,7 +313,6 @@ enterprise4/apache-tomcat-5.5.17/work/dummy enterprise4/config/Modules/org-netbeans-api-web-webmodule.xml enterprise4/config/Modules/org-netbeans-libs-glassfish_logging.xml -enterprise4/config/Modules/org-netbeans-modules-derby.xml enterprise4/config/Modules/org-netbeans-modules-el-lexer.xml enterprise4/config/Modules/org-netbeans-modules-j2ee-ant.xml enterprise4/config/Modules/org-netbeans-modules-j2ee-api-ejbmodule.xml @@ -380,7 +379,6 @@ enterprise4/modules/ext/blueprints/commons-io-1.2.jar enterprise4/modules/ext/blueprints/commons-logging-1.1.jar enterprise4/modules/ext/blueprints/shale-remoting.jar -enterprise4/modules/ext/derbysampledb.zip enterprise4/modules/ext/glassfish-jspparser.jar enterprise4/modules/ext/glassfish-logging.jar enterprise4/modules/ext/jsf/commons-beanutils.jar @@ -407,7 +405,6 @@ enterprise4/modules/ext/websvcregistry.jar enterprise4/modules/org-netbeans-api-web-webmodule.jar enterprise4/modules/org-netbeans-libs-glassfish_logging.jar -enterprise4/modules/org-netbeans-modules-derby.jar enterprise4/modules/org-netbeans-modules-el-lexer.jar enterprise4/modules/org-netbeans-modules-j2ee-ant.jar enterprise4/modules/org-netbeans-modules-j2ee-api-ejbmodule.jar @@ -458,7 +455,6 @@ enterprise4/modules/org-netbeans-modules-websvc-websvcapi.jar enterprise4/update_tracking/org-netbeans-api-web-webmodule.xml enterprise4/update_tracking/org-netbeans-libs-glassfish_logging.xml -enterprise4/update_tracking/org-netbeans-modules-derby.xml enterprise4/update_tracking/org-netbeans-modules-el-lexer.xml enterprise4/update_tracking/org-netbeans-modules-j2ee-ant.xml enterprise4/update_tracking/org-netbeans-modules-j2ee-api-ejbmodule.xml @@ -627,6 +623,7 @@ ide8/config/Modules/org-netbeans-modules-debugger-jpda-ui.xml ide8/config/Modules/org-netbeans-modules-debugger-jpda.xml ide8/config/Modules/org-netbeans-modules-defaults.xml +ide8/config/Modules/org-netbeans-modules-derby.xml ide8/config/Modules/org-netbeans-modules-diff.xml ide8/config/Modules/org-netbeans-modules-editor-bookmarks.xml ide8/config/Modules/org-netbeans-modules-editor-codetemplates.xml @@ -746,6 +743,7 @@ ide8/modules/ext/AbsoluteLayout.jar ide8/modules/ext/commons-logging-1.0.4.jar ide8/modules/ext/ddl.jar +ide8/modules/ext/derbysampledb.zip ide8/modules/ext/flute.jar ide8/modules/ext/freemarker-2.3.8.jar ide8/modules/ext/ini4j.jar @@ -837,6 +835,7 @@ ide8/modules/org-netbeans-modules-debugger-jpda-ui.jar ide8/modules/org-netbeans-modules-debugger-jpda.jar ide8/modules/org-netbeans-modules-defaults.jar +ide8/modules/org-netbeans-modules-derby.jar ide8/modules/org-netbeans-modules-diff.jar ide8/modules/org-netbeans-modules-editor-bookmarks.jar ide8/modules/org-netbeans-modules-editor-codetemplates.jar @@ -983,6 +982,7 @@ ide8/update_tracking/org-netbeans-modules-debugger-jpda-ui.xml ide8/update_tracking/org-netbeans-modules-debugger-jpda.xml ide8/update_tracking/org-netbeans-modules-defaults.xml +ide8/update_tracking/org-netbeans-modules-derby.xml ide8/update_tracking/org-netbeans-modules-diff.xml ide8/update_tracking/org-netbeans-modules-editor-bookmarks.xml ide8/update_tracking/org-netbeans-modules-editor-codetemplates.xml Index: friend-packages.txt =================================================================== RCS file: /cvs/ide/golden/friend-packages.txt,v retrieving revision 1.132 diff -u -r1.132 friend-packages.txt --- friend-packages.txt 30 Mar 2007 04:39:40 -0000 1.132 +++ friend-packages.txt 31 Mar 2007 04:44:08 -0000 @@ -88,7 +88,7 @@ PACKAGE org.netbeans.modules.dbschema.migration.archiver.serializer PACKAGE org.netbeans.modules.dbschema.nodes PACKAGE org.netbeans.modules.dbschema.util -MODULE org.netbeans.modules.derby (j2ee) +MODULE org.netbeans.modules.derby (ide) EXTERNAL org.netbeans.modules.derby.bundled FRIEND org.netbeans.modules.j2ee.blueprints/1 (j2ee) FRIEND org.netbeans.modules.j2ee.samples (j2ee) Index: group-friend-packages.txt =================================================================== RCS file: /cvs/ide/golden/group-friend-packages.txt,v retrieving revision 1.60 diff -u -r1.60 group-friend-packages.txt --- group-friend-packages.txt 30 Mar 2007 03:37:55 -0000 1.60 +++ group-friend-packages.txt 31 Mar 2007 04:44:09 -0000 @@ -52,8 +52,11 @@ PACKAGE org.netbeans.modules.dbschema.migration.archiver.serializer PACKAGE org.netbeans.modules.dbschema.nodes PACKAGE org.netbeans.modules.dbschema.util -MODULE org.netbeans.modules.derby (j2ee) +MODULE org.netbeans.modules.derby (ide) EXTERNAL org.netbeans.modules.derby.bundled + FRIEND org.netbeans.modules.j2ee.blueprints/1 (j2ee) + FRIEND org.netbeans.modules.j2ee.samples (j2ee) + FRIEND org.netbeans.modules.j2ee.sun.appsrv81/1 (j2ee) EXTERNAL org.netbeans.modules.visualweb.dataconnectivity PACKAGE org.netbeans.modules.derby.api PACKAGE org.netbeans.modules.derby.spi.support Index: modules.txt =================================================================== RCS file: /cvs/ide/golden/modules.txt,v retrieving revision 1.124 diff -u -r1.124 modules.txt --- modules.txt 30 Mar 2007 03:37:56 -0000 1.124 +++ modules.txt 31 Mar 2007 04:43:27 -0000 @@ -52,7 +52,7 @@ MODULE org.netbeans.modules.debugger.jpda.projects (ide) MODULE org.netbeans.modules.debugger.jpda.ui/1 (ide) MODULE org.netbeans.modules.defaults/1 (ide) -MODULE org.netbeans.modules.derby (j2ee) +MODULE org.netbeans.modules.derby (ide) MODULE org.netbeans.modules.diff/1 (ide) MODULE org.netbeans.modules.editor/3 (ide) MODULE org.netbeans.modules.editor.bookmarks/1 (ide)