--- a/rakelib/test.rake	Fri Jun 03 12:05:02 2016 +0100
+++ b/rakelib/test.rake	Tue Jun 07 10:33:32 2016 +0100
@@ -105,13 +105,11 @@
   task :'packages'
 end
 
-
-
 task BUILD_DIR / 'stx' / 'goodies' / 'builder' / 'reports'  => BUILD_DIR do
   if File.exist?(BUILD_DIR / 'stx' / 'goodies' / 'builder' / 'reports')
-    update(:'swing:hg', 'stx/goodies/builder', :branch => 'jv', :separator => '-')
+    update(:'bitbucket:janvrany', 'stx/goodies/builder', :branch => 'jv', :separator => '-')
   else
-    checkout(:'swing:hg', 'stx/goodies/builder', :branch => 'jv', :separator => '-')
+    checkout(:'bitbucket:janvrany', 'stx/goodies/builder', :branch => 'jv', :separator => '-')
   end
 end
 

--- a/specs/baseline.rbspec	Fri Jun 03 12:05:02 2016 +0100
+++ b/specs/baseline.rbspec	Tue Jun 07 10:33:32 2016 +0100
@@ -20,17 +20,6 @@
     end
   end
 
-  repository :'swing' do
-    type :svn
-    url "https://swing.fit.cvut.cz/svn"
-  end
-
-  repository :'swing:hg' do
-    type :hg
-    url "https://swing.fit.cvut.cz/hg"    
-    separator '-'
-  end
-
   repository :'swing:private:hg' do
     type :hg
     # Sigh, under Windows I don't know how to configure `plink` to

--- a/specs/stx-jv.rbspec	Fri Jun 03 12:05:02 2016 +0100
+++ b/specs/stx-jv.rbspec	Tue Jun 07 10:33:32 2016 +0100
@@ -47,21 +47,21 @@
 
   # FORKED libraries
   # ======================================================================
-  package "stx:libbasic", :repository => :'swing:hg', :branch => 'jv'
-  package "stx:libbasic2", :repository => :'swing:hg', :branch => 'jv'
-  package "stx:libbasic3", :repository => :'swing:hg', :branch => 'jv'
-  package "stx:libcomp", :repository => :'swing:hg', :branch => 'jv'
-  package "stx:libtool", :repository => :'swing:hg', :branch => 'jv'
+  package "stx:libbasic", :repository => :'bitbucket:janvrany', :branch => 'jv'
+  package "stx:libbasic2", :repository => :'bitbucket:janvrany', :branch => 'jv'
+  package "stx:libbasic3", :repository => :'bitbucket:janvrany', :branch => 'jv'
+  package "stx:libcomp", :repository => :'bitbucket:janvrany', :branch => 'jv'
+  package "stx:libtool", :repository => :'bitbucket:janvrany', :branch => 'jv'
  
-  package "stx:libview", :repository => :'swing:hg', :branch => 'jv'
-  package "stx:libview2", :repository => :'swing:hg', :branch => 'jv'
-  package "stx:libwidg", :repository => :'swing:hg', :branch => 'jv'
-  package "stx:libwidg2", :repository => :'swing:hg', :branch => 'jv'
+  package "stx:libview", :repository => :'bitbucket:janvrany', :branch => 'jv'
+  package "stx:libview2", :repository => :'bitbucket:janvrany', :branch => 'jv'
+  package "stx:libwidg", :repository => :'bitbucket:janvrany', :branch => 'jv'
+  package "stx:libwidg2", :repository => :'bitbucket:janvrany', :branch => 'jv'
 
-  package "stx:goodies/sunit", :repository => :'swing:hg'
-  package "stx:goodies/monticello", :repository => :'swing:hg', :branch => 'jv'
-  package "stx:goodies/refactoryBrowser", :repository => :'swing:hg', :branch => 'jv'
-  package "stx:libsvn", :repository => :'swing:hg', :branch => 'jv'
+  package "stx:goodies/sunit", :repository => :'bitbucket:janvrany'
+  package "stx:goodies/monticello", :repository => :'bitbucket:janvrany', :branch => 'jv'
+  package "stx:goodies/refactoryBrowser", :repository => :'bitbucket:janvrany', :branch => 'jv'
+  package "stx:libsvn", :repository => :'bitbucket:janvrany', :branch => 'jv'
 
   # Some more development tools to build and preload
   # ======================================================================
@@ -221,12 +221,18 @@
   #package "stx:libjava/examples" :link => false
 
   # Smalltalk/X IDE
-  application 'stx:projects/smalltalk', :repository => :'swing:hg', :branch => 'jv'
+  application 'stx:projects/smalltalk', :repository => :'bitbucket:janvrany', :branch => 'jv'
 
   if (ENV['USER'] == 'builder') || ( ENV['USER'] == 'vranyj1')  || (ENV['USERNAME'] == 'builder') || ( ENV['USERNAME'] == 'vranyj1') then
-     stx_libjava_checkouter =
+    repository :'mirror:swing' do
+      type :hg
+      url "https://swing.fit.cvut.cz/hg"    
+      separator '-'
+    end
+
+    stx_libjava_checkouter =
          Proc.new do | pkg, build_dir |
-             repo = :'swing:hg'
+             repo = :'mirror:swing'
              puts "Checking out #{pkg.name} from #{repo} (cache / staging repo)..."
              checkout repo, pkg.directory, :branch => pkg.branch, :package => pkg, :separator => '-'
              puts "Checking out #{pkg.name} from #{repo} (cache)...done"
@@ -244,9 +250,9 @@
 
      stx_libjava_updater =
          Proc.new do | pkg, build_dir |
-             repo = :'swing:hg'
+             repo = :'mirror:swing'
              puts "Updating #{pkg.name} from #{repo} (cache / staging repo)..."
-             update repo, pkg.directory, :branch => pkg.branch, :package => pkg, :separator => '.'
+             update repo, pkg.directory, :branch => pkg.branch, :package => pkg, :separator => '-'
              puts "Checking out #{pkg.name} from #{repo} (cache)...done"
 
              repo = pkg.repository
@@ -285,7 +291,7 @@
   package 'stx:goodies/cypress', :repository => :'bitbucket:janvrany'
   package "stx:goodies/xmlsuite", :repository => :'bitbucket:janvrany'  
   package "stx:goodies/loggia", :repository => :'exept:public'
-  package 'stx:goodies/smaCC',:repository => :'swing:hg'
+  package 'stx:goodies/smaCC',:repository => :'bitbucket:janvrany'
   
   #package "stx:goodies/builder/reports", :repository => :'exept:public', :link => false