This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.
Summary: | Need to update the friend declarations for the new refactored visualweb modules | ||
---|---|---|---|
Product: | obsolete | Reporter: | Ch Nguyen <cnguyencasj> |
Component: | visualweb | Assignee: | _ sandipchitale <sandipchitale> |
Status: | RESOLVED FIXED | ||
Severity: | blocker | CC: | abadea, emononen, jbecicka, mkuchtiak, pbuzek, pjiricka, ppisl, sandipchitale |
Priority: | P2 | Keywords: | API_REVIEW_FAST |
Version: | 5.x | ||
Hardware: | All | ||
OS: | Windows XP | ||
Issue Type: | DEFECT | Exception Reporter: | |
Bug Depends on: | |||
Bug Blocks: | 90449 | ||
Attachments: |
unified diffs
Diff including the ide/golden/friend-packages.txt and ide/golden/group-friend-packages.txt |
Description
Ch Nguyen
2007-01-29 07:45:27 UTC
BTW, this issue is just an FYI. Sine the changes are trivial, we'll have a person that has access to all these modules to make the changes. Honza, Petr, Milan, Andrei and Erno, could you please review the changes in your modules? Thanks. No concerns on my part. Well, 1. I see that target is M7. Refactoring module will not have any friend APIs in M7 - probably just incorrect target milestone. 2. Proposed change is not compatible. Compatible way is to add a new module, not to rename old one. I'm ok with these changes. I also agree with Jan that these are not compatible changes, but in these case we don't have to care. So will everybody do a part or there will be one, who do all changes in one commit? IMHO one commit is better. Yes, it'll be under 1 commit. Sandip Chitale has volunteered to make these changes. Most likely he'll proceed sometime today if no objections. Thanks, Sandip. I did not see any objections, go ahead. The changes in db and j2ee look OK to me (I haven't looked at others). I would have preferred they were described in an unified diff though, since that is easier to read. I will be adding the universal diff as well as performing the commit today. The original list specified by Chau was based on NB5.5. I am attaching the unified diff for the changes I will be making tomorrow. Yes the refactoring support in VW is not planned for M7. Thus we will not be needing that. I am also aware that I have to switch over to the new refactoring APIs. That will most likely come in M8. I think Petr Pisl also has some dependency on that. Here are the unified diffs: 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 00:37:49 -0000 @@ -161,7 +161,7 @@ </test-type> </test-dependencies> <friend-packages> - <friend>com.sun.rave.extension.autoupdate</friend> + <friend>org.netbeans.modules.visualweb.extension.autoupdate</friend> <friend>org.netbeans.modules.updatecenters</friend> <package>org.netbeans.modules.autoupdate</package> </friend-packages> 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 00:39:50 -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 00:39:51 -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: 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 00:44:12 -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 00:44:40 -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 1 Feb 2007 00:51:21 -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 1 Feb 2007 00:51:49 - 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 1 Feb 2007 00:51:50 -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 1 Feb 2007 00:51:59 -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 1 Feb 2007 00:52:34 -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 1 Feb 2007 00:52:35 -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 1 Feb 2007 00:52:36 -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 1 Feb 2007 00:52:56 -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> Thanks to Sandip. One more request. Could you attach the diff as a file? If you put the file directly, then it lost formating and is not so easy to apply the patch to try it :). Created attachment 37932 [details]
unified diffs
As per Petrs suggestions added the diffs as an attachment. Created attachment 37946 [details]
Diff including the ide/golden/friend-packages.txt and ide/golden/group-friend-packages.txt
Attached the diff including the diffs to the ide/golden/friend-packages.txt and ide/golden/group-friend-packages.txt Checking in ide/golden/friend-packages.txt; /cvs/ide/golden/friend-packages.txt,v <-- friend-packages.txt new revision: 1.97; previous revision: 1.96 done Checking in ide/golden/group-friend-packages.txt; /cvs/ide/golden/group-friend-packages.txt,v <-- group-friend-packages.txt new revision: 1.34; previous revision: 1.33 done Checking in autoupdate/nbproject/project.xml; /cvs/autoupdate/nbproject/project.xml,v <-- project.xml new revision: 1.28; previous revision: 1.27 done Checking in db/dbapi/nbproject/project.xml; /cvs/db/dbapi/nbproject/project.xml,v <-- project.xml new revision: 1.4; previous revision: 1.3 done Checking in db/derby/nbproject/project.xml; /cvs/db/derby/nbproject/project.xml,v <-- project.xml new revision: 1.13; previous revision: 1.12 done Checking in j2ee/persistenceapi/nbproject/project.xml; /cvs/j2ee/persistenceapi/nbproject/project.xml,v <-- project.xml new revision: 1.4; previous revision: 1.3 done Checking in j2ee/utilities/nbproject/project.xml; /cvs/j2ee/utilities/nbproject/project.xml,v <-- project.xml new revision: 1.54; previous revision: 1.53 done Checking in web/core/nbproject/project.xml; /cvs/web/core/nbproject/project.xml,v <-- project.xml new revision: 1.24; previous revision: 1.23 done Checking in web/libs/glassfish_logging/nbproject/project.xml; /cvs/web/libs/glassfish_logging/nbproject/project.xml,v <-- project.xml new revision: 1.3; previous revision: 1.2 done Checking in web/project/nbproject/project.xml; /cvs/web/project/nbproject/project.xml,v <-- project.xml new revision: 1.52; previous revision: 1.51 done Checking in websvc/clientapi/nbproject/project.xml; /cvs/websvc/clientapi/nbproject/project.xml,v <-- project.xml new revision: 1.12; previous revision: 1.11 done Checking in websvc/jaxwsapi/nbproject/project.xml; /cvs/websvc/jaxwsapi/nbproject/project.xml,v <-- project.xml new revision: 1.6; previous revision: 1.5 done Checking in websvc/jaxwsmodel/nbproject/project.xml; /cvs/websvc/jaxwsmodel/nbproject/project.xml,v <-- project.xml new revision: 1.4; previous revision: 1.3 done Checking in websvc/websvcapi/nbproject/project.xml; /cvs/websvc/websvcapi/nbproject/project.xml,v <-- project.xml new revision: 1.20; previous revision: 1.19 done Checking in xml/multiview/nbproject/project.xml; /cvs/xml/multiview/nbproject/project.xml,v <-- project.xml new revision: 1.13; previous revision: 1.12 done The changes have been checked in. |