Index: ide/golden/cluster-deps.txt
===================================================================
RCS file: /cvs/ide/golden/cluster-deps.txt,v
retrieving revision 1.20
diff -u -r1.20 cluster-deps.txt
--- ide/golden/cluster-deps.txt	21 Jul 2005 09:42:59 -0000	1.20
+++ ide/golden/cluster-deps.txt	29 Jul 2005 13:10:36 -0000
@@ -1,6 +1,7 @@
 GROUP ide
   REQUIRES org.netbeans.modules.javahelp/1 (platform)
   REQUIRES org.netbeans.api.progress/1 (platform)
+  REQUIRES org.netbeans.bootstrap/1 (platform)
   REQUIRES org.netbeans.core/1 (platform)
   REQUIRES org.netbeans.core.execution/1 (platform)
   REQUIRES org.netbeans.core.multiview/1 (platform)
Index: ide/golden/deps.txt
===================================================================
RCS file: /cvs/ide/golden/deps.txt,v
retrieving revision 1.116
diff -u -r1.116 deps.txt
--- ide/golden/deps.txt	29 Jul 2005 08:34:10 -0000	1.116
+++ ide/golden/deps.txt	29 Jul 2005 13:10:36 -0000
@@ -1606,66 +1606,27 @@
   REQUIRES org.openide.nodes (platform)
   REQUIRES org.openide.util (platform)
   REQUIRES org.openidex.util/3 (ide)
-MODULE org.netbeans.modules.vcs.advanced/1 (ide)
-  REQUIRES org.netbeans.modules.diff/1 (ide)
-  REQUIRES org.netbeans.modules.queries/1 (platform)
-  REQUIRES org.netbeans.modules.vcscore/1 (ide)
-  REQUIRES org.openide.actions (platform)
-  REQUIRES org.openide.awt (platform)
-  REQUIRES org.openide.compat (platform)
-  REQUIRES org.openide.dialogs (platform)
-  REQUIRES org.openide.explorer (platform)
+MODULE org.netbeans.modules.versioning/1 (ide)
   REQUIRES org.openide.filesystems (platform)
-  REQUIRES org.openide.io (platform)
-  REQUIRES org.openide.loaders (platform)
-  REQUIRES org.openide.modules (platform)
   REQUIRES org.openide.modules.ModuleFormat1
-  REQUIRES org.openide.nodes (platform)
-  REQUIRES org.openide.options (platform)
   REQUIRES org.openide.util (platform)
-  REQUIRES org.openide.windows (platform)
-  REQUIRES org.netbeans.core.output2/1 (platform)
-MODULE org.netbeans.modules.vcs.profiles.cvsprofiles/1 (ide)
+MODULE org.netbeans.modules.versioning.system.cvss/1 (ide)
+  REQUIRES org.netbeans.api.progress/1 (platform)
+  REQUIRES org.netbeans.api.xml/1 (ide)
+  REQUIRES org.netbeans.bootstrap/1 (platform)
+  REQUIRES org.netbeans.core.startup/1 (platform)
   REQUIRES org.netbeans.lib.cvsclient/1 (ide)
   REQUIRES org.netbeans.modules.diff/1 (ide)
-  REQUIRES org.netbeans.modules.queries/1 (platform)
-  REQUIRES org.netbeans.modules.vcs.advanced/1 (ide)
-  REQUIRES org.netbeans.modules.vcscore/1 (ide)
-  REQUIRES org.openide.awt (platform)
-  REQUIRES org.openide.dialogs (platform)
-  REQUIRES org.openide.filesystems (platform)
-  REQUIRES org.openide.loaders (platform)
-  REQUIRES org.openide.modules.ModuleFormat1
-  REQUIRES org.openide.nodes (platform)
-  REQUIRES org.openide.util (platform)
-  REQUIRES org.openide.windows (platform)
-MODULE org.netbeans.modules.vcs.profiles.pvcs/1 (ide)
-  REQUIRES org.netbeans.modules.diff/1 (ide)
-  REQUIRES org.netbeans.modules.vcs.advanced/1 (ide)
-  REQUIRES org.netbeans.modules.vcscore/1 (ide)
-  REQUIRES org.openide.dialogs (platform)
-  REQUIRES org.openide.filesystems (platform)
-  REQUIRES org.openide.loaders (platform)
-  REQUIRES org.openide.modules.ModuleFormat1
-  REQUIRES org.openide.nodes (platform)
-  REQUIRES org.openide.util (platform)
-MODULE org.netbeans.modules.vcs.profiles.vss/1 (ide)
-  REQUIRES org.netbeans.modules.vcs.advanced/1 (ide)
-  REQUIRES org.netbeans.modules.vcscore/1 (ide)
-  REQUIRES org.openide.dialogs (platform)
-  REQUIRES org.openide.filesystems (platform)
-  REQUIRES org.openide.loaders (platform)
-  REQUIRES org.openide.modules.ModuleFormat1
-  REQUIRES org.openide.nodes (platform)
-  REQUIRES org.openide.util (platform)
-MODULE org.netbeans.modules.vcscore/1 (ide)
+  REQUIRES org.netbeans.modules.editor/3 (ide)
+  REQUIRES org.netbeans.modules.editor.fold/1 (ide)
+  REQUIRES org.netbeans.modules.editor.lib/1 (ide)
   REQUIRES org.netbeans.modules.masterfs/1 (platform)
+  REQUIRES org.netbeans.modules.projectapi/1 (ide)
+  REQUIRES org.netbeans.modules.projectuiapi/1 (ide)
   REQUIRES org.netbeans.modules.queries/1 (platform)
-  REQUIRES org.openide.actions (platform)
+  REQUIRES org.netbeans.modules.versioning/1 (ide)
   REQUIRES org.openide.awt (platform)
-  REQUIRES org.openide.compat (platform)
   REQUIRES org.openide.dialogs (platform)
-  REQUIRES org.openide.execution (platform)
   REQUIRES org.openide.explorer (platform)
   REQUIRES org.openide.filesystems (platform)
   REQUIRES org.openide.io (platform)
@@ -1677,16 +1638,6 @@
   REQUIRES org.openide.text (platform)
   REQUIRES org.openide.util (platform)
   REQUIRES org.openide.windows (platform)
-  REQUIRES org.netbeans.core.output2/1 (platform)
-  REQUIRES org.openidex.util/3 (ide)
-MODULE org.netbeans.modules.vcscore.javacorebridge/1 (ide)
-  REQUIRES org.netbeans.modules.javacore/1 (ide)
-  REQUIRES org.netbeans.modules.jmiutils/1 (ide)
-  REQUIRES org.netbeans.modules.vcscore/1 (ide)
-  REQUIRES org.openide.filesystems (platform)
-  REQUIRES org.openide.modules (platform)
-  REQUIRES org.openide.modules.ModuleFormat1
-  REQUIRES org.openide.util (platform)
 MODULE org.netbeans.modules.web.core/1 (j2ee)
   REQUIRES org.apache.tools.ant.module/3 (ide)
   REQUIRES org.netbeans.api.java/1 (ide)
Index: ide/golden/external-libraries.txt
===================================================================
RCS file: /cvs/ide/golden/external-libraries.txt,v
retrieving revision 1.3
diff -u -r1.3 external-libraries.txt
--- ide/golden/external-libraries.txt	12 Jan 2005 00:04:24 -0000	1.3
+++ ide/golden/external-libraries.txt	29 Jul 2005 13:10:36 -0000
@@ -75,6 +75,7 @@
 LIBRARY jmiutils.jar                                               478112 6da3245b5f55e119fc079d96480fa9bc
 LIBRARY jmx.jar                                                    343900 ea83210b8d7ccef9b628ca7a43d50f56
 LIBRARY jmxri.jar                                                  353549 25e5dc92e0f5ae76e87962f4e0150676
+LIBRARY jsch-0.1.20.jar                                            143723 4ae158def2f7d037f1616455f83c6389
 LIBRARY jsp-api-2.0.jar                                             50491 76da369ed350701072a86af42f3750a7
 LIBRARY jsp-api.jar                                                 50491 76da369ed350701072a86af42f3750a7
 LIBRARY jsp-parser-ext.jar                                          91283 9edd56ae920afc7852aca337ad9d555c
Index: ide/golden/files-layout.txt
===================================================================
RCS file: /cvs/ide/golden/files-layout.txt,v
retrieving revision 1.70
diff -u -r1.70 files-layout.txt
--- ide/golden/files-layout.txt	29 Jul 2005 10:23:15 -0000	1.70
+++ ide/golden/files-layout.txt	29 Jul 2005 13:10:36 -0000
@@ -615,12 +615,8 @@
 ide6/config/Modules/org-netbeans-modules-usersguide.xml
 ide6/config/Modules/org-netbeans-modules-utilities-project.xml
 ide6/config/Modules/org-netbeans-modules-utilities.xml
-ide6/config/Modules/org-netbeans-modules-vcs-advanced.xml
-ide6/config/Modules/org-netbeans-modules-vcs-profiles-cvsprofiles.xml
-ide6/config/Modules/org-netbeans-modules-vcs-profiles-pvcs.xml
-ide6/config/Modules/org-netbeans-modules-vcs-profiles-vss.xml
-ide6/config/Modules/org-netbeans-modules-vcscore-javacorebridge.xml
-ide6/config/Modules/org-netbeans-modules-vcscore.xml
+ide6/config/Modules/org-netbeans-modules-versioning-system-cvss.xml
+ide6/config/Modules/org-netbeans-modules-versioning.xml
 ide6/config/Modules/org-netbeans-modules-websvc-clientapi.xml
 ide6/config/Modules/org-netbeans-modules-xml-catalog.xml
 ide6/config/Modules/org-netbeans-modules-xml-core.xml
@@ -643,7 +639,7 @@
 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
-ide6/modules/docs/org-netbeans-modules-vcs-advanced.jar
+ide6/modules/docs/org-netbeans-modules-versioning-system-cvss.jar
 ide6/modules/ext/AbsoluteLayout.jar
 ide6/modules/ext/commons-logging-1.0.4.jar
 ide6/modules/ext/ddl.jar
@@ -652,6 +648,7 @@
 ide6/modules/ext/java-parser.jar
 ide6/modules/ext/jmi.jar
 ide6/modules/ext/jmiutils.jar
+ide6/modules/ext/jsch-0.1.20.jar
 ide6/modules/ext/junit-3.8.1.jar
 ide6/modules/ext/mdr.jar
 ide6/modules/ext/mof.jar
@@ -747,12 +744,8 @@
 ide6/modules/org-netbeans-modules-usersguide.jar
 ide6/modules/org-netbeans-modules-utilities-project.jar
 ide6/modules/org-netbeans-modules-utilities.jar
-ide6/modules/org-netbeans-modules-vcs-advanced.jar
-ide6/modules/org-netbeans-modules-vcs-profiles-cvsprofiles.jar
-ide6/modules/org-netbeans-modules-vcs-profiles-pvcs.jar
-ide6/modules/org-netbeans-modules-vcs-profiles-vss.jar
-ide6/modules/org-netbeans-modules-vcscore-javacorebridge.jar
-ide6/modules/org-netbeans-modules-vcscore.jar
+ide6/modules/org-netbeans-modules-versioning-system-cvss.jar
+ide6/modules/org-netbeans-modules-versioning.jar
 ide6/modules/org-netbeans-modules-websvc-clientapi.jar
 ide6/modules/org-netbeans-modules-xml-catalog.jar
 ide6/modules/org-netbeans-modules-xml-core.jar
@@ -851,12 +844,8 @@
 ide6/update_tracking/org-netbeans-modules-usersguide.xml
 ide6/update_tracking/org-netbeans-modules-utilities-project.xml
 ide6/update_tracking/org-netbeans-modules-utilities.xml
-ide6/update_tracking/org-netbeans-modules-vcs-advanced.xml
-ide6/update_tracking/org-netbeans-modules-vcs-profiles-cvsprofiles.xml
-ide6/update_tracking/org-netbeans-modules-vcs-profiles-pvcs.xml
-ide6/update_tracking/org-netbeans-modules-vcs-profiles-vss.xml
-ide6/update_tracking/org-netbeans-modules-vcscore-javacorebridge.xml
-ide6/update_tracking/org-netbeans-modules-vcscore.xml
+ide6/update_tracking/org-netbeans-modules-versioning-system-cvss.xml
+ide6/update_tracking/org-netbeans-modules-versioning.xml
 ide6/update_tracking/org-netbeans-modules-websvc-clientapi.xml
 ide6/update_tracking/org-netbeans-modules-xml-catalog.xml
 ide6/update_tracking/org-netbeans-modules-xml-core.xml
Index: ide/golden/impl-deps.txt
===================================================================
RCS file: /cvs/ide/golden/impl-deps.txt,v
retrieving revision 1.20
diff -u -r1.20 impl-deps.txt
--- ide/golden/impl-deps.txt	18 Jul 2005 15:28:53 -0000	1.20
+++ ide/golden/impl-deps.txt	29 Jul 2005 13:10:37 -0000
@@ -63,12 +63,7 @@
   REQUIRES org.netbeans.modules.suggestions_framework/2 (ide)
   REQUIRES org.netbeans.modules.tasklist.core/2 (ide)
   REQUIRES org.netbeans.tasklistapi/1 (ide)
-MODULE org.netbeans.modules.vcs.advanced/1 (ide)
-  REQUIRES org.netbeans.modules.diff/1 (ide)
-  REQUIRES org.netbeans.modules.vcscore/1 (ide)
-MODULE org.netbeans.modules.vcs.profiles.cvsprofiles/1 (ide)
-  REQUIRES org.netbeans.modules.diff/1 (ide)
-MODULE org.netbeans.modules.vcs.profiles.pvcs/1 (ide)
+MODULE org.netbeans.modules.versioning.system.cvss/1 (ide)
   REQUIRES org.netbeans.modules.diff/1 (ide)
 MODULE org.netbeans.modules.web.core/1 (j2ee)
   REQUIRES org.netbeans.modules.j2ee.dd/1 (j2ee)
Index: ide/golden/modules.txt
===================================================================
RCS file: /cvs/ide/golden/modules.txt,v
retrieving revision 1.28
diff -u -r1.28 modules.txt
--- ide/golden/modules.txt	29 Jul 2005 08:34:10 -0000	1.28
+++ ide/golden/modules.txt	29 Jul 2005 13:10:37 -0000
@@ -128,12 +128,8 @@
 MODULE org.netbeans.modules.usersguide/1 (ide)
 MODULE org.netbeans.modules.utilities/1 (ide)
 MODULE org.netbeans.modules.utilities.project/1 (ide)
-MODULE org.netbeans.modules.vcs.advanced/1 (ide)
-MODULE org.netbeans.modules.vcs.profiles.cvsprofiles/1 (ide)
-MODULE org.netbeans.modules.vcs.profiles.pvcs/1 (ide)
-MODULE org.netbeans.modules.vcs.profiles.vss/1 (ide)
-MODULE org.netbeans.modules.vcscore/1 (ide)
-MODULE org.netbeans.modules.vcscore.javacorebridge/1 (ide)
+MODULE org.netbeans.modules.versioning/1 (ide)
+MODULE org.netbeans.modules.versioning.system.cvss/1 (ide)
 MODULE org.netbeans.modules.web.core/1 (j2ee)
 MODULE org.netbeans.modules.web.core.syntax/1 (j2ee)
 MODULE org.netbeans.modules.web.debug/1 (j2ee)
Index: ide/golden/public-packages.txt
===================================================================
RCS file: /cvs/ide/golden/public-packages.txt,v
retrieving revision 1.26
diff -u -r1.26 public-packages.txt
--- ide/golden/public-packages.txt	29 Jul 2005 08:34:10 -0000	1.26
+++ ide/golden/public-packages.txt	29 Jul 2005 13:10:37 -0000
@@ -96,8 +96,6 @@
 org.netbeans.api.project.libraries
 org.netbeans.api.project.ui
 org.netbeans.api.queries
-org.netbeans.api.vcs
-org.netbeans.api.vcs.commands
 org.netbeans.api.web.dd
 org.netbeans.api.web.dd.common
 org.netbeans.api.xmi
@@ -195,31 +193,16 @@
 org.netbeans.modules.javacore.jmiimpl.javamodel
 org.netbeans.modules.masterfs.providers
 org.netbeans.modules.properties
+org.netbeans.modules.proxy
 org.netbeans.modules.refactoring.api
 org.netbeans.modules.refactoring.api.ui
 org.netbeans.modules.refactoring.spi
 org.netbeans.modules.schema2beans
 org.netbeans.modules.search
-org.netbeans.modules.vcs.advanced
-org.netbeans.modules.vcs.advanced.globalcommands
-org.netbeans.modules.vcs.advanced.recognizer
-org.netbeans.modules.vcs.profiles.commands
-org.netbeans.modules.vcs.profiles.list
-org.netbeans.modules.vcscore
-org.netbeans.modules.vcscore.actions
-org.netbeans.modules.vcscore.caching
-org.netbeans.modules.vcscore.cmdline
-org.netbeans.modules.vcscore.cmdline.exec
-org.netbeans.modules.vcscore.commands
-org.netbeans.modules.vcscore.grouping
-org.netbeans.modules.vcscore.registry
-org.netbeans.modules.vcscore.turbo
-org.netbeans.modules.vcscore.turbo.local
-org.netbeans.modules.vcscore.ui
-org.netbeans.modules.vcscore.util
-org.netbeans.modules.vcscore.util.table
-org.netbeans.modules.vcscore.versioning
-org.netbeans.modules.vcscore.versioning.impl
+org.netbeans.modules.turbo
+org.netbeans.modules.versioning.spi
+org.netbeans.modules.versioning.system.cvss
+org.netbeans.modules.versioning.util
 org.netbeans.modules.web.api.webmodule
 org.netbeans.modules.web.core.syntax.spi
 org.netbeans.modules.web.jsps.parserapi
@@ -262,8 +245,6 @@
 org.netbeans.spi.project.ui.templates.support
 org.netbeans.spi.queries
 org.netbeans.spi.settings
-org.netbeans.spi.vcs
-org.netbeans.spi.vcs.commands
 org.netbeans.spi.viewmodel
 org.netbeans.spi.xml.cookies
 org.netbeans.swing.plaf
Index: nbbuild/build.properties
===================================================================
RCS file: /cvs/nbbuild/build.properties,v
retrieving revision 1.290
diff -u -r1.290 build.properties
--- nbbuild/build.properties	29 Jul 2005 08:34:09 -0000	1.290
+++ nbbuild/build.properties	29 Jul 2005 13:13:22 -0000
@@ -143,6 +143,7 @@
     java/javamodel,\
     java/srcmodel,\
     java/hints,\
+    javacvs/cvsmodule,\
     javacvs/libmodule,\
     javadoc,\
     junit,\
@@ -161,15 +162,12 @@
     usersguide/j2seexamples,\
     utilities,\
     utilities/project,\
-    vcscore,\
-    vcscore/javacorebridge,\
-    vcsgeneric,\
+    versioncontrol,\
     websvc/clientapi,\
     ${local.config.navigator},\
     ${local.config.stavbicka.extra},\
     ${local.config.stavbicka},\
     ${local.config.tasklist4barracuda},\
-    ${local.config.vcsprofiles},\
     ${local.config.xml}
 
 config.fixedmodules.stable=${config.fixedmodules.stable-without-webapps}
@@ -370,7 +368,6 @@
         ide/projectimport,\
         ide/projectimport/jbuilder,\
         java/hints,\
-        javacvs/cvsmodule,\
         javacvs/libmodule,\
         jellytools,\
         jemmy/idemodule,\
@@ -395,11 +392,14 @@
         tasklist/suggestions/ui,\
         tasklist/usertasks,\
         translatedfiles,\
+        vcscore,\
+        vcscore/javacorebridge,\
+        vcsgeneric,\
         vcsgeneric/profiles/teamware,\
-        versioncontrol,\
         xtest/examples,\
         xtest/module,\
-        xtest/nbjunit
+        xtest/nbjunit,\
+        ${local.config.vcsprofiles}
 
 # make javadoc for these packages
 # - the list will be shared for signature API tests!
@@ -455,7 +455,6 @@
         java/project,\
         lexer,\
         refactoring,\
-        vcscore,\
         xml/api,\
         web/ddapi,\
         j2ee/ddapi,\
Index: nbbuild/cluster.properties
===================================================================
RCS file: /cvs/nbbuild/cluster.properties,v
retrieving revision 1.100
diff -u -r1.100 cluster.properties
--- nbbuild/cluster.properties	29 Jul 2005 08:34:09 -0000	1.100
+++ nbbuild/cluster.properties	29 Jul 2005 13:13:22 -0000
@@ -87,6 +87,7 @@
         html/editor/lib,\
         java/editor,\
         java/editor/lib,\
+        javacvs/cvsmodule,\
         javacvs/libmodule,\
         libs/commons_logging,\
         libs/xerces,\
@@ -94,12 +95,7 @@
         projects/projectapi,\
         projects/projectui,\
         projects/projectuiapi,\
-        vcscore,\
-        vcscore/javacorebridge,\
-        vcsgeneric,\
-        vcsgeneric/profiles/cvsprofiles,\
-        vcsgeneric/profiles/pvcs,\
-        vcsgeneric/profiles/vss
+        versioncontrol
 
 nb.pkg.ideextensions=\
         html,\
Index: nbbuild/nbproject/project.xml
===================================================================
RCS file: /cvs/nbbuild/nbproject/project.xml,v
retrieving revision 1.9
diff -u -r1.9 project.xml
--- nbbuild/nbproject/project.xml	29 Jul 2005 08:34:09 -0000	1.9
+++ nbbuild/nbproject/project.xml	29 Jul 2005 13:13:23 -0000
@@ -246,6 +246,7 @@
                 <project>../java/platform</project>
                 <project>../java/project</project>
                 <project>../java/srcmodel</project>
+                <project>../javacvs/cvsmodule</project>
                 <project>../javacvs/libmodule</project>
                 <project>../javadoc</project>
                 <project>../junit</project>
@@ -305,12 +306,7 @@
                 <project>../usersguide/j2seexamples</project>
                 <project>../utilities</project>
                 <project>../utilities/project</project>
-                <project>../vcscore</project>
-                <project>../vcscore/javacorebridge</project>
-                <project>../vcsgeneric</project>
-                <project>../vcsgeneric/profiles/cvsprofiles</project>
-                <project>../vcsgeneric/profiles/pvcs</project>
-                <project>../vcsgeneric/profiles/vss</project>
+                <project>../versioning</project>
                 <project>../web/core</project>
                 <project>../web/ddapi</project>
                 <project>../web/examples</project>
Index: vcscore/manifest.mf
===================================================================
RCS file: /cvs/vcscore/manifest.mf,v
retrieving revision 1.57
diff -u -r1.57 manifest.mf
--- vcscore/manifest.mf	9 Apr 2005 16:09:04 -0000	1.57
+++ vcscore/manifest.mf	29 Jul 2005 13:15:15 -0000
@@ -3,6 +3,6 @@
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/vcscore/Bundle.properties
 OpenIDE-Module-Implementation-Version: 42
 OpenIDE-Module-Layer: org/netbeans/modules/vcscore/resources/mf-layer.xml
-OpenIDE-Module-Requires: org.openide.windows.IOProvider
+OpenIDE-Module-Requires: org.openide.windows.IOProvider,org.netbeans.modules.vcscore.javacorebridge
 OpenIDE-Module-Install: org/netbeans/modules/vcscore/VcsModule.class
 
Index: vcscore/javacorebridge/manifest.mf
===================================================================
RCS file: /cvs/vcscore/javacorebridge/manifest.mf,v
retrieving revision 1.2
diff -u -r1.2 manifest.mf
--- vcscore/javacorebridge/manifest.mf	6 Apr 2005 00:06:58 -0000	1.2
+++ vcscore/javacorebridge/manifest.mf	29 Jul 2005 13:15:15 -0000
@@ -3,3 +3,5 @@
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/vcscore/javacorebridge/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.1
 OpenIDE-Module-Install: org/netbeans/modules/vcscore/javacorebridge/FilesStructureModificationHandler.class
+OpenIDE-Module-Provides: org.netbeans.modules.vcscore.javacorebridge
+