Index: autoupdate/nbproject/project.xml
===================================================================
RCS file: /cvs/autoupdate/nbproject/project.xml,v
retrieving revision 1.27
diff -u -u -r1.27 project.xml
--- autoupdate/nbproject/project.xml	10 Jan 2007 14:00:33 -0000	1.27
+++ autoupdate/nbproject/project.xml	1 Feb 2007 23:54:04 -0000
@@ -161,8 +161,8 @@
                 </test-type>
             </test-dependencies>
             <friend-packages>
-                <friend>com.sun.rave.extension.autoupdate</friend>
                 <friend>org.netbeans.modules.updatecenters</friend>
+                <friend>org.netbeans.modules.visualweb.extension.autoupdate</friend>
                 <package>org.netbeans.modules.autoupdate</package>
             </friend-packages>
             <class-path-extension>
Index: db/dbapi/nbproject/project.xml
===================================================================
RCS file: /cvs/db/dbapi/nbproject/project.xml,v
retrieving revision 1.3
diff -u -u -r1.3 project.xml
--- db/dbapi/nbproject/project.xml	30 Jan 2007 16:20:00 -0000	1.3
+++ db/dbapi/nbproject/project.xml	1 Feb 2007 23:54:38 -0000
@@ -66,8 +66,8 @@
                 </dependency>
             </module-dependencies>
             <friend-packages>
-                <friend>com.sun.rave.dataconnectivity</friend>
-                <friend>com.sun.rave.queryeditor</friend>
+                <friend>org.netbeans.modules.visualweb.dataconnectivity</friend>
+                <friend>org.netbeans.modules.db.sql.visualeditor</friend>
                 <friend>org.netbeans.modules.db.sql.editor</friend>
                 <friend>org.netbeans.modules.j2ee.jpa.verification</friend>
                 <friend>org.netbeans.modules.j2ee.persistence</friend>
Index: db/derby/nbproject/project.xml
===================================================================
RCS file: /cvs/db/derby/nbproject/project.xml,v
retrieving revision 1.12
diff -u -u -r1.12 project.xml
--- db/derby/nbproject/project.xml	7 Nov 2006 23:43:44 -0000	1.12
+++ db/derby/nbproject/project.xml	1 Feb 2007 23:54:38 -0000
@@ -144,7 +144,7 @@
                 </test-type>
             </test-dependencies>
             <friend-packages>
-                <friend>com.sun.rave.dataconnectivity</friend>
+                <friend>org.netbeans.modules.visualweb.dataconnectivity</friend>
                 <friend>org.netbeans.modules.derby.bundled</friend>
                 <friend>org.netbeans.modules.j2ee.blueprints</friend>
                 <friend>org.netbeans.modules.j2ee.samples</friend>
Index: ide/golden/friend-packages.txt
===================================================================
RCS file: /cvs/ide/golden/friend-packages.txt,v
retrieving revision 1.96
diff -u -u -r1.96 friend-packages.txt
--- ide/golden/friend-packages.txt	1 Feb 2007 13:48:32 -0000	1.96
+++ ide/golden/friend-packages.txt	1 Feb 2007 23:55:36 -0000
@@ -34,10 +34,10 @@
   FRIEND org.netbeans.modules.uihandler (nb)
   PACKAGE org.netbeans.lib.uihandler
 MODULE org.netbeans.libs.glassfish_logging/1 (j2ee)
-  EXTERNAL com.sun.rave.j2ee14classloaderprovider
-  EXTERNAL com.sun.rave.j2ee15classloaderprovider
-  EXTERNAL com.sun.rave.libs.apache.commons
-  EXTERNAL com.sun.rave.libs.jsf.ri12
+  EXTERNAL org.netbeans.modules.visualweb.j2ee14classloaderprovider
+  EXTERNAL org.netbeans.modules.visualweb.j2ee15classloaderprovider
+  EXTERNAL org.netbeans.modules.visualweb.libs.apache.commons
+  EXTERNAL org.netbeans.modules.visualweb.libs.jsf.ri12
   FRIEND org.netbeans.modules.web.jspparser/2 (j2ee)
   PACKAGE com.sun.org.apache.commons.logging
   PACKAGE com.sun.org.apache.commons.logging.impl
@@ -58,18 +58,18 @@
   PACKAGE org.netbeans.modules.ant.freeform.spi
   PACKAGE org.netbeans.modules.ant.freeform.spi.support
 MODULE org.netbeans.modules.autoupdate/1 (platform)
-  EXTERNAL com.sun.rave.extension.autoupdate
   FRIEND org.netbeans.modules.updatecenters/1 (nb)
+  EXTERNAL org.netbeans.modules.visualweb.extension.autoupdate
   PACKAGE org.netbeans.modules.autoupdate
 MODULE org.netbeans.modules.db.core (ide)
   FRIEND org.netbeans.modules.db.sql.editor (ide)
   PACKAGE org.netbeans.modules.db.api.sql.execute
 MODULE org.netbeans.modules.dbapi (ide)
-  EXTERNAL com.sun.rave.dataconnectivity
-  EXTERNAL com.sun.rave.queryeditor
   FRIEND org.netbeans.modules.db.sql.editor (ide)
+  EXTERNAL org.netbeans.modules.db.sql.visualeditor
   FRIEND org.netbeans.modules.j2ee.jpa.verification (j2ee)
   FRIEND org.netbeans.modules.j2ee.persistence (j2ee)
+  EXTERNAL org.netbeans.modules.visualweb.dataconnectivity
   PACKAGE org.netbeans.modules.db.api.explorer
   PACKAGE org.netbeans.modules.db.api.sql
 MODULE org.netbeans.modules.dbschema/1 (j2ee)
@@ -85,11 +85,11 @@
   PACKAGE org.netbeans.modules.dbschema.nodes
   PACKAGE org.netbeans.modules.dbschema.util
 MODULE org.netbeans.modules.derby (j2ee)
-  EXTERNAL com.sun.rave.dataconnectivity
   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
 MODULE org.netbeans.modules.editor.settings.storage/1 (ide)
@@ -120,7 +120,6 @@
   FRIEND org.netbeans.modules.j2ee.earproject (j2ee)
   PACKAGE org.netbeans.modules.j2ee.clientproject.api
 MODULE org.netbeans.modules.j2ee.common/1 (j2ee)
-  EXTERNAL com.sun.rave.project.jsfproject
   FRIEND org.netbeans.modules.j2ee.archive (j2ee)
   FRIEND org.netbeans.modules.j2ee.clientproject (j2ee)
   FRIEND org.netbeans.modules.j2ee.earproject (j2ee)
@@ -129,6 +128,7 @@
   FRIEND org.netbeans.modules.j2ee.ejbjarproject (j2ee)
   FRIEND org.netbeans.modules.j2ee.persistence (j2ee)
   EXTERNAL org.netbeans.modules.mobility.end2end
+  EXTERNAL org.netbeans.modules.visualweb.project.jsfproject
   FRIEND org.netbeans.modules.web.core/1 (j2ee)
   FRIEND org.netbeans.modules.web.jsf/1 (j2ee)
   FRIEND org.netbeans.modules.web.project (j2ee)
@@ -175,13 +175,13 @@
   PACKAGE org.netbeans.modules.j2ee.persistence.wizard.fromdb
   PACKAGE org.netbeans.modules.j2ee.persistence.wizard.unit
 MODULE org.netbeans.modules.j2ee.persistenceapi/1 (ide)
-  EXTERNAL com.sun.rave.project.jsfproject
   FRIEND org.netbeans.modules.j2ee.clientproject (j2ee)
   FRIEND org.netbeans.modules.j2ee.ejbjarproject (j2ee)
   FRIEND org.netbeans.modules.j2ee.jpa.verification (j2ee)
   FRIEND org.netbeans.modules.j2ee.persistence (j2ee)
   EXTERNAL org.netbeans.modules.j2ee.refactoring
   FRIEND org.netbeans.modules.java.j2seproject/1 (ide)
+  EXTERNAL org.netbeans.modules.visualweb.project.jsfproject
   FRIEND org.netbeans.modules.web.jsf/1 (j2ee)
   FRIEND org.netbeans.modules.web.project (j2ee)
   PACKAGE org.netbeans.modules.j2ee.persistence.api
@@ -266,22 +266,22 @@
   PACKAGE org.netbeans.modules.versioning.spi
   PACKAGE org.netbeans.modules.versioning.util
 MODULE org.netbeans.modules.web.core/1 (j2ee)
-  EXTERNAL com.sun.rave.project.jsfloader
+  EXTERNAL org.netbeans.modules.visualweb.project.jsfloader
   PACKAGE org.netbeans.modules.web.core.jsploader.api
 MODULE org.netbeans.modules.web.project (j2ee)
-  EXTERNAL com.sun.rave.project.jsfproject
   FRIEND org.netbeans.modules.j2ee.archive (j2ee)
   FRIEND org.netbeans.modules.j2ee.earproject (j2ee)
+  EXTERNAL org.netbeans.modules.visualweb.project.jsfproject
   PACKAGE org.netbeans.modules.web.project.api
   PACKAGE org.netbeans.modules.web.project.spi
 MODULE org.netbeans.modules.websvc.clientapi (ide)
-  EXTERNAL com.sun.rave.project.jsfproject
   EXTERNAL org.netbeans.modules.e2e.end2end
   FRIEND org.netbeans.modules.j2ee.clientproject (j2ee)
   FRIEND org.netbeans.modules.j2ee.ejbjarproject (j2ee)
   FRIEND org.netbeans.modules.java.j2seproject/1 (ide)
   EXTERNAL org.netbeans.modules.mobility.end2end
   EXTERNAL org.netbeans.modules.tcpmon.integration
+  EXTERNAL org.netbeans.modules.visualweb.project.jsfproject
   FRIEND org.netbeans.modules.web.project (j2ee)
   FRIEND org.netbeans.modules.websvc.core (j2ee)
   FRIEND org.netbeans.modules.websvc.customization (j2ee)
@@ -353,10 +353,10 @@
   PACKAGE javax.xml.ws
   PACKAGE javax.xml.ws.soap
 MODULE org.netbeans.modules.websvc.jaxwsapi (ide)
-  EXTERNAL com.sun.rave.project.jsfproject
   EXTERNAL org.netbeans.modules.identity.profile.ui
   FRIEND org.netbeans.modules.j2ee.ejbjarproject (j2ee)
   EXTERNAL org.netbeans.modules.j2ee.refactoring
+  EXTERNAL org.netbeans.modules.visualweb.project.jsfproject
   FRIEND org.netbeans.modules.web.project (j2ee)
   FRIEND org.netbeans.modules.websvc.core (j2ee)
   FRIEND org.netbeans.modules.websvc.customization (j2ee)
@@ -366,13 +366,13 @@
   PACKAGE org.netbeans.modules.websvc.jaxws.api
   PACKAGE org.netbeans.modules.websvc.jaxws.spi
 MODULE org.netbeans.modules.websvc.jaxwsmodel/1 (ide)
-  EXTERNAL com.sun.rave.project.jsfproject
   EXTERNAL org.netbeans.modules.identity.profile.ui
   FRIEND org.netbeans.modules.j2ee.clientproject (j2ee)
   FRIEND org.netbeans.modules.j2ee.ejbjarproject (j2ee)
   EXTERNAL org.netbeans.modules.j2ee.refactoring
   FRIEND org.netbeans.modules.java.j2seproject/1 (ide)
   EXTERNAL org.netbeans.modules.tcpmon.integration
+  EXTERNAL org.netbeans.modules.visualweb.project.jsfproject
   FRIEND org.netbeans.modules.web.project (j2ee)
   FRIEND org.netbeans.modules.websvc.clientapi (ide)
   FRIEND org.netbeans.modules.websvc.core (j2ee)
@@ -384,16 +384,15 @@
   PACKAGE org.netbeans.modules.websvc.api.jaxws.project.config
   PACKAGE org.netbeans.modules.websvc.api.jaxws.wsdlmodel
 MODULE org.netbeans.modules.websvc.websvcapi (j2ee)
-  EXTERNAL com.sun.rave.project.jsfproject
   EXTERNAL org.netbeans.modules.identity.profile.ui
   FRIEND org.netbeans.modules.j2ee.ejbjarproject (j2ee)
   EXTERNAL org.netbeans.modules.j2ee.refactoring
+  EXTERNAL org.netbeans.modules.visualweb.project.jsfproject
   FRIEND org.netbeans.modules.web.project (j2ee)
   FRIEND org.netbeans.modules.websvc.jaxrpc (j2ee)
   PACKAGE org.netbeans.modules.websvc.api.webservices
   PACKAGE org.netbeans.modules.websvc.spi.webservices
 MODULE org.netbeans.modules.xml.multiview/1 (ide)
-  EXTERNAL com.sun.rave.project.navigationloader
   EXTERNAL de.genomatix.graphmlsupport
   EXTERNAL de.genomatix.jasperreporteditor
   EXTERNAL org.netbeans.modules.e2e.end2end
@@ -401,6 +400,7 @@
   EXTERNAL org.netbeans.modules.identity.profile.ui
   EXTERNAL org.netbeans.modules.j2ee.ddloaders
   FRIEND org.netbeans.modules.j2ee.persistence (j2ee)
+  EXTERNAL org.netbeans.modules.visualweb.project.navigationloader
   EXTERNAL org.netbeans.modules.websvc.wsitconf
   PACKAGE org.netbeans.modules.xml.multiview
   PACKAGE org.netbeans.modules.xml.multiview.cookies
Index: ide/golden/group-friend-packages.txt
===================================================================
RCS file: /cvs/ide/golden/group-friend-packages.txt,v
retrieving revision 1.33
diff -u -u -r1.33 group-friend-packages.txt
--- ide/golden/group-friend-packages.txt	30 Jan 2007 16:20:04 -0000	1.33
+++ ide/golden/group-friend-packages.txt	1 Feb 2007 23:55:36 -0000
@@ -16,10 +16,10 @@
   PACKAGE org.netbeans.core.startup
   PACKAGE org.netbeans.core.startup.layers
 MODULE org.netbeans.libs.glassfish_logging/1 (j2ee)
-  EXTERNAL com.sun.rave.j2ee14classloaderprovider
-  EXTERNAL com.sun.rave.j2ee15classloaderprovider
-  EXTERNAL com.sun.rave.libs.apache.commons
-  EXTERNAL com.sun.rave.libs.jsf.ri12
+  EXTERNAL org.netbeans.modules.visualweb.j2ee14classloaderprovider
+  EXTERNAL org.netbeans.modules.visualweb.j2ee15classloaderprovider
+  EXTERNAL org.netbeans.modules.visualweb.libs.apache.commons
+  EXTERNAL org.netbeans.modules.visualweb.libs.jsf.ri12
   PACKAGE com.sun.org.apache.commons.logging
   PACKAGE com.sun.org.apache.commons.logging.impl
 MODULE org.netbeans.modules.ant.freeform/1 (ide)
@@ -29,19 +29,19 @@
   PACKAGE org.netbeans.modules.ant.freeform.spi
   PACKAGE org.netbeans.modules.ant.freeform.spi.support
 MODULE org.netbeans.modules.autoupdate/1 (platform)
-  EXTERNAL com.sun.rave.extension.autoupdate
   FRIEND org.netbeans.modules.updatecenters/1 (nb)
+  EXTERNAL org.netbeans.modules.visualweb.extension.autoupdate
   PACKAGE org.netbeans.modules.autoupdate
 MODULE org.netbeans.modules.dbapi (ide)
-  EXTERNAL com.sun.rave.dataconnectivity
-  EXTERNAL com.sun.rave.queryeditor
+  EXTERNAL org.netbeans.modules.db.sql.visualeditor
   FRIEND org.netbeans.modules.j2ee.jpa.verification (j2ee)
   FRIEND org.netbeans.modules.j2ee.persistence (j2ee)
+  EXTERNAL org.netbeans.modules.visualweb.dataconnectivity
   PACKAGE org.netbeans.modules.db.api.explorer
   PACKAGE org.netbeans.modules.db.api.sql
 MODULE org.netbeans.modules.derby (j2ee)
-  EXTERNAL com.sun.rave.dataconnectivity
   EXTERNAL org.netbeans.modules.derby.bundled
+  EXTERNAL org.netbeans.modules.visualweb.dataconnectivity
   PACKAGE org.netbeans.modules.derby.api
   PACKAGE org.netbeans.modules.derby.spi.support
 MODULE org.netbeans.modules.editor.settings.storage/1 (ide)
@@ -62,8 +62,8 @@
   PACKAGE org.netbeans.editor.ext.html.dtd
   PACKAGE org.netbeans.editor.ext.html.parser
 MODULE org.netbeans.modules.j2ee.common/1 (j2ee)
-  EXTERNAL com.sun.rave.project.jsfproject
   EXTERNAL org.netbeans.modules.mobility.end2end
+  EXTERNAL org.netbeans.modules.visualweb.project.jsfproject
   PACKAGE org.netbeans.modules.j2ee.common
   PACKAGE org.netbeans.modules.j2ee.common.method
   PACKAGE org.netbeans.modules.j2ee.common.queries.api
@@ -77,12 +77,12 @@
   PACKAGE org.netbeans.modules.j2ee.ejbcore.api.ui
   PACKAGE org.netbeans.modules.j2ee.ejbcore.spi
 MODULE org.netbeans.modules.j2ee.persistenceapi/1 (ide)
-  EXTERNAL com.sun.rave.project.jsfproject
   FRIEND org.netbeans.modules.j2ee.clientproject (j2ee)
   FRIEND org.netbeans.modules.j2ee.ejbjarproject (j2ee)
   FRIEND org.netbeans.modules.j2ee.jpa.verification (j2ee)
   FRIEND org.netbeans.modules.j2ee.persistence (j2ee)
   EXTERNAL org.netbeans.modules.j2ee.refactoring
+  EXTERNAL org.netbeans.modules.visualweb.project.jsfproject
   FRIEND org.netbeans.modules.web.jsf/1 (j2ee)
   FRIEND org.netbeans.modules.web.project (j2ee)
   PACKAGE org.netbeans.modules.j2ee.persistence.api
@@ -141,19 +141,19 @@
   EXTERNAL org.netbeans.modules.startpage
   PACKAGE org.netbeans.modules.project.ui.api
 MODULE org.netbeans.modules.web.core/1 (j2ee)
-  EXTERNAL com.sun.rave.project.jsfloader
+  EXTERNAL org.netbeans.modules.visualweb.project.jsfloader
   PACKAGE org.netbeans.modules.web.core.jsploader.api
 MODULE org.netbeans.modules.web.project (j2ee)
-  EXTERNAL com.sun.rave.project.jsfproject
+  EXTERNAL org.netbeans.modules.visualweb.project.jsfproject
   PACKAGE org.netbeans.modules.web.project.api
   PACKAGE org.netbeans.modules.web.project.spi
 MODULE org.netbeans.modules.websvc.clientapi (ide)
-  EXTERNAL com.sun.rave.project.jsfproject
   EXTERNAL org.netbeans.modules.e2e.end2end
   FRIEND org.netbeans.modules.j2ee.clientproject (j2ee)
   FRIEND org.netbeans.modules.j2ee.ejbjarproject (j2ee)
   EXTERNAL org.netbeans.modules.mobility.end2end
   EXTERNAL org.netbeans.modules.tcpmon.integration
+  EXTERNAL org.netbeans.modules.visualweb.project.jsfproject
   FRIEND org.netbeans.modules.web.project (j2ee)
   FRIEND org.netbeans.modules.websvc.core (j2ee)
   FRIEND org.netbeans.modules.websvc.customization (j2ee)
@@ -224,10 +224,10 @@
   PACKAGE javax.xml.ws
   PACKAGE javax.xml.ws.soap
 MODULE org.netbeans.modules.websvc.jaxwsapi (ide)
-  EXTERNAL com.sun.rave.project.jsfproject
   EXTERNAL org.netbeans.modules.identity.profile.ui
   FRIEND org.netbeans.modules.j2ee.ejbjarproject (j2ee)
   EXTERNAL org.netbeans.modules.j2ee.refactoring
+  EXTERNAL org.netbeans.modules.visualweb.project.jsfproject
   FRIEND org.netbeans.modules.web.project (j2ee)
   FRIEND org.netbeans.modules.websvc.core (j2ee)
   FRIEND org.netbeans.modules.websvc.customization (j2ee)
@@ -237,12 +237,12 @@
   PACKAGE org.netbeans.modules.websvc.jaxws.api
   PACKAGE org.netbeans.modules.websvc.jaxws.spi
 MODULE org.netbeans.modules.websvc.jaxwsmodel/1 (ide)
-  EXTERNAL com.sun.rave.project.jsfproject
   EXTERNAL org.netbeans.modules.identity.profile.ui
   FRIEND org.netbeans.modules.j2ee.clientproject (j2ee)
   FRIEND org.netbeans.modules.j2ee.ejbjarproject (j2ee)
   EXTERNAL org.netbeans.modules.j2ee.refactoring
   EXTERNAL org.netbeans.modules.tcpmon.integration
+  EXTERNAL org.netbeans.modules.visualweb.project.jsfproject
   FRIEND org.netbeans.modules.web.project (j2ee)
   FRIEND org.netbeans.modules.websvc.core (j2ee)
   FRIEND org.netbeans.modules.websvc.customization (j2ee)
@@ -252,13 +252,12 @@
   PACKAGE org.netbeans.modules.websvc.api.jaxws.project.config
   PACKAGE org.netbeans.modules.websvc.api.jaxws.wsdlmodel
 MODULE org.netbeans.modules.websvc.websvcapi (j2ee)
-  EXTERNAL com.sun.rave.project.jsfproject
   EXTERNAL org.netbeans.modules.identity.profile.ui
   EXTERNAL org.netbeans.modules.j2ee.refactoring
+  EXTERNAL org.netbeans.modules.visualweb.project.jsfproject
   PACKAGE org.netbeans.modules.websvc.api.webservices
   PACKAGE org.netbeans.modules.websvc.spi.webservices
 MODULE org.netbeans.modules.xml.multiview/1 (ide)
-  EXTERNAL com.sun.rave.project.navigationloader
   EXTERNAL de.genomatix.graphmlsupport
   EXTERNAL de.genomatix.jasperreporteditor
   EXTERNAL org.netbeans.modules.e2e.end2end
@@ -266,6 +265,7 @@
   EXTERNAL org.netbeans.modules.identity.profile.ui
   EXTERNAL org.netbeans.modules.j2ee.ddloaders
   FRIEND org.netbeans.modules.j2ee.persistence (j2ee)
+  EXTERNAL org.netbeans.modules.visualweb.project.navigationloader
   EXTERNAL org.netbeans.modules.websvc.wsitconf
   PACKAGE org.netbeans.modules.xml.multiview
   PACKAGE org.netbeans.modules.xml.multiview.cookies
Index: j2ee/persistenceapi/nbproject/project.xml
===================================================================
RCS file: /cvs/j2ee/persistenceapi/nbproject/project.xml,v
retrieving revision 1.3
diff -u -u -r1.3 project.xml
--- j2ee/persistenceapi/nbproject/project.xml	30 Jan 2007 16:20:07 -0000	1.3
+++ j2ee/persistenceapi/nbproject/project.xml	1 Feb 2007 23:56:21 -0000
@@ -41,7 +41,7 @@
                 </dependency>
             </module-dependencies>
             <friend-packages>
-                <friend>com.sun.rave.project.jsfproject</friend>
+                <friend>org.netbeans.modules.visualweb.project.jsfproject</friend>
                 <friend>org.netbeans.modules.j2ee.clientproject</friend>
                 <friend>org.netbeans.modules.j2ee.ejbjarproject</friend>
                 <friend>org.netbeans.modules.j2ee.jpa.verification</friend>
Index: j2ee/utilities/nbproject/project.xml
===================================================================
RCS file: /cvs/j2ee/utilities/nbproject/project.xml,v
retrieving revision 1.53
diff -u -u -r1.53 project.xml
--- j2ee/utilities/nbproject/project.xml	30 Jan 2007 06:31:36 -0000	1.53
+++ j2ee/utilities/nbproject/project.xml	1 Feb 2007 23:56:51 -0000
@@ -263,7 +263,7 @@
                 </test-type>
             </test-dependencies>
             <friend-packages>
-                <friend>com.sun.rave.project.jsfproject</friend>
+                <friend>org.netbeans.modules.visualweb.project.jsfproject</friend>
                 <friend>org.netbeans.modules.j2ee.archive</friend>
                 <friend>org.netbeans.modules.j2ee.clientproject</friend>
                 <friend>org.netbeans.modules.j2ee.earproject</friend>
Index: web/core/nbproject/project.xml
===================================================================
RCS file: /cvs/web/core/nbproject/project.xml,v
retrieving revision 1.23
diff -u -u -r1.23 project.xml
--- web/core/nbproject/project.xml	15 Dec 2006 11:15:04 -0000	1.23
+++ web/core/nbproject/project.xml	2 Feb 2007 00:02:51 -0000
@@ -353,7 +353,7 @@
                 </test-type>
             </test-dependencies>
             <friend-packages>
-                <friend>com.sun.rave.project.jsfloader</friend>
+                <friend>org.netbeans.modules.visualweb.project.jsfloader</friend>
                 <package>org.netbeans.modules.web.core.jsploader.api</package>
             </friend-packages>
         </data>
Index: web/libs/glassfish_logging/nbproject/project.xml
===================================================================
RCS file: /cvs/web/libs/glassfish_logging/nbproject/project.xml,v
retrieving revision 1.2
diff -u -u -r1.2 project.xml
--- web/libs/glassfish_logging/nbproject/project.xml	12 Oct 2006 14:32:53 -0000	1.2
+++ web/libs/glassfish_logging/nbproject/project.xml	2 Feb 2007 00:03:19 -0000
@@ -25,10 +25,10 @@
             <module-dependencies/>
             <friend-packages>
                 <friend>org.netbeans.modules.web.jspparser</friend>
-                <friend>com.sun.rave.libs.apache.commons</friend>
-                <friend>com.sun.rave.libs.jsf.ri12</friend>
-                <friend>com.sun.rave.j2ee14classloaderprovider</friend>
-                <friend>com.sun.rave.j2ee15classloaderprovider</friend>
+                <friend>org.netbeans.modules.visualweb.libs.apache.commons</friend>
+                <friend>org.netbeans.modules.visualweb.libs.jsf.ri12</friend>
+                <friend>org.netbeans.modules.visualweb.j2ee14classloaderprovider</friend>
+                <friend>org.netbeans.modules.visualweb.j2ee15classloaderprovider</friend>
                 <package>com.sun.org.apache.commons.logging</package>
                 <package>com.sun.org.apache.commons.logging.impl</package>
             </friend-packages>
Index: web/project/nbproject/project.xml
===================================================================
RCS file: /cvs/web/project/nbproject/project.xml,v
retrieving revision 1.51
diff -u -u -r1.51 project.xml
--- web/project/nbproject/project.xml	24 Jan 2007 14:10:20 -0000	1.51
+++ web/project/nbproject/project.xml	2 Feb 2007 00:03:20 -0000
@@ -385,7 +385,7 @@
             <friend-packages>
                 <friend>org.netbeans.modules.j2ee.earproject</friend>
                 <friend>org.netbeans.modules.j2ee.archive</friend>
-                <friend>com.sun.rave.project.jsfproject</friend>
+                <friend>org.netbeans.modules.visualweb.project.jsfproject</friend>
                 <package>org.netbeans.modules.web.project.api</package>
                 <package>org.netbeans.modules.web.project.spi</package>
             </friend-packages>
Index: websvc/clientapi/nbproject/project.xml
===================================================================
RCS file: /cvs/websvc/clientapi/nbproject/project.xml,v
retrieving revision 1.11
diff -u -u -r1.11 project.xml
--- websvc/clientapi/nbproject/project.xml	18 Dec 2006 14:39:17 -0000	1.11
+++ websvc/clientapi/nbproject/project.xml	2 Feb 2007 00:03:26 -0000
@@ -128,7 +128,7 @@
                 <friend>org.netbeans.modules.websvc.wsitconf</friend>
                 -->
                 <friend>org.netbeans.modules.websvc.customization</friend>
-                <friend>com.sun.rave.project.jsfproject</friend>
+                <friend>org.netbeans.modules.visualweb.project.jsfproject</friend>
                 <package>org.netbeans.modules.websvc.api.client</package>
                 <package>org.netbeans.modules.websvc.api.jaxws.client</package>
                 <package>org.netbeans.modules.websvc.spi.client</package>
Index: websvc/jaxwsapi/nbproject/project.xml
===================================================================
RCS file: /cvs/websvc/jaxwsapi/nbproject/project.xml,v
retrieving revision 1.5
diff -u -u -r1.5 project.xml
--- websvc/jaxwsapi/nbproject/project.xml	30 Jan 2007 06:30:45 -0000	1.5
+++ websvc/jaxwsapi/nbproject/project.xml	2 Feb 2007 00:03:55 -0000
@@ -105,7 +105,7 @@
                 </test-type>
             </test-dependencies>
             <friend-packages>
-                <friend>com.sun.rave.project.jsfproject</friend>
+                <friend>org.netbeans.modules.visualweb.project.jsfproject</friend>
                 <friend>org.netbeans.modules.identity.profile.ui</friend>
                 <friend>org.netbeans.modules.j2ee.ejbjarproject</friend>
                 <friend>org.netbeans.modules.j2ee.refactoring</friend>
Index: websvc/jaxwsmodel/nbproject/project.xml
===================================================================
RCS file: /cvs/websvc/jaxwsmodel/nbproject/project.xml,v
retrieving revision 1.3
diff -u -u -r1.3 project.xml
--- websvc/jaxwsmodel/nbproject/project.xml	24 Oct 2006 12:59:37 -0000	1.3
+++ websvc/jaxwsmodel/nbproject/project.xml	2 Feb 2007 00:03:55 -0000
@@ -198,7 +198,7 @@
                 <friend>org.netbeans.modules.websvc.dev</friend>
                 <friend>org.netbeans.modules.websvc.jaxwsapi</friend>
                 <friend>org.netbeans.modules.websvc.wsitconf</friend>
-                <friend>com.sun.rave.project.jsfproject</friend>
+                <friend>org.netbeans.modules.visualweb.project.jsfproject</friend>
                 <package>org.netbeans.modules.websvc.api.jaxws.project</package>
                 <package>org.netbeans.modules.websvc.api.jaxws.project.config</package>
                 <package>org.netbeans.modules.websvc.api.jaxws.wsdlmodel</package>
Index: websvc/websvcapi/nbproject/project.xml
===================================================================
RCS file: /cvs/websvc/websvcapi/nbproject/project.xml,v
retrieving revision 1.19
diff -u -u -r1.19 project.xml
--- websvc/websvcapi/nbproject/project.xml	15 Dec 2006 12:10:54 -0000	1.19
+++ websvc/websvcapi/nbproject/project.xml	2 Feb 2007 00:03:56 -0000
@@ -116,7 +116,7 @@
                 <friend>org.netbeans.modules.j2ee.refactoring</friend>
                 <friend>org.netbeans.modules.web.project</friend>
                 <friend>org.netbeans.modules.websvc.jaxrpc</friend>
-                <friend>com.sun.rave.project.jsfproject</friend>
+                <friend>org.netbeans.modules.visualweb.project.jsfproject</friend>
                 <package>org.netbeans.modules.websvc.api.webservices</package>
                 <package>org.netbeans.modules.websvc.spi.webservices</package>
             </friend-packages>
Index: xml/multiview/nbproject/project.xml
===================================================================
RCS file: /cvs/xml/multiview/nbproject/project.xml,v
retrieving revision 1.12
diff -u -u -r1.12 project.xml
--- xml/multiview/nbproject/project.xml	9 Nov 2006 16:54:13 -0000	1.12
+++ xml/multiview/nbproject/project.xml	2 Feb 2007 00:04:13 -0000
@@ -142,7 +142,7 @@
             <friend-packages>
                 <friend>org.netbeans.modules.identity.profile.ui</friend>
                 <friend>org.netbeans.modules.websvc.wsitconf</friend>
-                <friend>com.sun.rave.project.navigationloader</friend>
+                <friend>org.netbeans.modules.visualweb.project.navigationloader</friend>
                 <friend>org.netbeans.modules.e2e.end2end</friend>
                 <friend>org.netbeans.modules.e2e.jsr172</friend>
                 <friend>org.netbeans.modules.j2ee.persistence</friend>