Made a number of changes needed for migration-overlay.

svn path=/java-config-ng/branches/axxo/; revision=1902

9 files changed, 34 insertions, 34 deletions

diff --git a/setup.py b/setup.py
index 6cd0cc8..fadfdcf 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ from os import listdir
 
 setup (
 	name = 'java-config',
-	version = '2.0.19',
+	version = '2.0.20',
 	description = 'java enviroment configuration tool',
 	long_description = \
 	"""
@@ -21,11 +21,12 @@ setup (
 	#package_dir = { 'java_config' : 'src/java_config' },
 	scripts = ['src/java-config','src/depend-java-query','src/run-java-tool', 'src/gjl'],
 	data_files = [
-		('share/java-config/pym/java_config/', ['src/java_config/'+file for file in listdir('src/java_config/')] ),
+		('share/java-config-2/pym/java_config/', ['src/java_config/'+file for file in listdir('src/java_config/')] ),
 		('share/man/man1', ['man/java-config.1']),
-		('share/java-config/launcher', ['src/launcher.bash']),
+		('share/java-config-2/launcher', ['src/launcher.bash']),
 		('share/eselect/modules', ['src/eselect/java.eselect']),
-		('/etc/java-config/', ['config/jdk.conf','config/symlink-tools','config/compilers.conf','config/virtuals']),
+		('/etc/java-config-2/', ['config/virtuals']),
+		('/etc/java-config-2/build/', ['config/jdk.conf','config/compilers.conf']),
 		('/etc/env.d/',['config/20java-config']),
 	]
 )
diff --git a/src/depend-java-query b/src/depend-java-query
index 60f5b7b..4a76dd0 100755
--- a/src/depend-java-query
+++ b/src/depend-java-query
@@ -6,7 +6,7 @@
 # $Header: $
 
 import sys
-sys.path = ['/usr/share/java-config/pym']+sys.path
+sys.path = ['/usr/share/java-config-2/pym']+sys.path
 
 from java_config import __version__
 from java_config.OutputFormatter import OutputFormatter
diff --git a/src/gjl b/src/gjl
index 500de7c..13f0d76 100755
--- a/src/gjl
+++ b/src/gjl
@@ -6,7 +6,7 @@
 # $Header: $
 
 import sys
-sys.path = ['/usr/share/java-config/pym']+sys.path
+sys.path = ['/usr/share/java-config-2/pym']+sys.path
 
 from java_config import __version__
 from java_config.OutputFormatter import *
diff --git a/src/java-config b/src/java-config
index e479b19..319fc1d 100755
--- a/src/java-config
+++ b/src/java-config
@@ -6,7 +6,7 @@
 # $Header: $
 
 import sys
-sys.path = ['/usr/share/java-config/pym']+sys.path
+sys.path = ['/usr/share/java-config-2/pym']+sys.path
 
 from java_config import __version__
 from java_config.OutputFormatter import OutputFormatter
diff --git a/src/java_config/EnvironmentManager.py b/src/java_config/EnvironmentManager.py
index 26debcc..68f1f83 100644
--- a/src/java_config/EnvironmentManager.py
+++ b/src/java_config/EnvironmentManager.py
@@ -22,7 +22,7 @@ class EnvironmentManager:
     active = None
 
     # Location of the vm ev files
-    vms_path = '/etc/env.d/java/'
+    vms_path = '/usr/share/java-config-2/vm'
     # Location of the package env files to load
     pkg_path = '/usr/share/*/package.env'
 
@@ -41,23 +41,22 @@ class EnvironmentManager:
             filelist = os.listdir(self.vms_path)
             filelist.sort()
             for file in filelist:
-                if file.startswith("20"):
-                    conf = os.path.join(self.vms_path,file)
-                    vm = None
+                conf = os.path.join(self.vms_path,file)
+                vm = None
 
-                    try:
-                        vm = VM(conf)
-                    except InvalidConfigError:
-                        continue
-                    except PermissionError:
-                        continue
-                    except InvalidVMError, ex:
-                        printer = OutputFormatter()
-                        printer._printAlert("Invalid vm configuration file found: %s\nJava-config 2 requires some new variables, please update all your jdk/jre:  file\n(%s)" % ( conf, ex ))
-                        continue
-
-                    self.virtual_machines[count] = vm
-                    count += 1
+                try:
+                    vm = VM(conf)
+                except InvalidConfigError:
+                    continue
+                except PermissionError:
+                    continue
+                except InvalidVMError, ex:
+                    printer = OutputFormatter()
+                    printer._printAlert("Invalid vm configuration file found: %s\nJava-config 2 requires some new variables, please update all your jdk/jre:  file\n(%s)" % ( conf, ex ))
+                    continue
+
+                self.virtual_machines[count] = vm
+                count += 1
          
     def load_packages(self):
         self.packages = {}
@@ -74,7 +73,7 @@ class EnvironmentManager:
 
         virtual_prefs = {}
         try:
-            vprefs = EnvFileParser("/etc/java-config/virtuals")
+            vprefs = EnvFileParser("/etc/java-config-2/virtuals")
             virtual_prefs = vprefs.get_config()
         except:
             pass
@@ -224,10 +223,10 @@ class EnvironmentManager:
         return [ self.user_vm_link(), self.system_vm_link() ]
 
     def user_vm_link(self):
-        return  os.path.join(os.environ.get('HOME'), '.gentoo/user-vm')
+        return  os.path.join(os.environ.get('HOME'), '.gentoo/java-config-2/current-user-vm')
 
     def system_vm_link(self):
-        return '/etc/java-config/system-vm'
+        return '/etc/java-config-2/current-system-vm'
 
     def clean_classpath(self, targets):
         for target in targets:
diff --git a/src/java_config/VM.py b/src/java_config/VM.py
index b779288..2cc29e2 100644
--- a/src/java_config/VM.py
+++ b/src/java_config/VM.py
@@ -44,7 +44,7 @@ class VM:
 
     def name(self):
         # TODO: MAKE THIS MODULAR!a (compnerd)
-        return self.file.split("/etc/env.d/java/20")[-1]
+        return self.file.split("/usr/share/java-config-2/vm/")[-1]
 
     def is_jre(self):
         return self.is_type("JRE")
diff --git a/src/java_config/VersionManager.py b/src/java_config/VersionManager.py
index 9626e59..2450b02 100644
--- a/src/java_config/VersionManager.py
+++ b/src/java_config/VersionManager.py
@@ -23,7 +23,7 @@ class VersionManager:
     """
     #atom_parser = re.compile(r"([~!<>=]*)virtual/(jre|jdk)-([0-9\.]+)")
     atom_parser = re.compile(r"([<>=]+)virtual/(jre|jdk)-([0-9\.*]+)")
-    pref_files = ['/etc/java-config/jdk.conf', '/usr/share/java-config/config/jdk-defaults.conf']
+    pref_files = ['/etc/java-config-2/build/jdk.conf', '/usr/share/java-config-2/config/jdk-defaults.conf']
     _prefs = None
 
     def __init__(self):
diff --git a/src/launcher.bash b/src/launcher.bash
index 6496b5e..2dd405d 100644
--- a/src/launcher.bash
+++ b/src/launcher.bash
@@ -8,8 +8,8 @@ abort() {
 
 # Source package env
 # ---------------------
-gjl_user_env="${HOME}/.gentoo/env.d/22${gjl_package}"
-gjl_system_env="/etc/env.d/java/22${gjl_package}"
+gjl_user_env="${HOME}/.gentoo/java-config-2/launcher.d/${gjl_package}"
+gjl_system_env="/etc/java-config-2/launcher.d/${gjl_package}"
 if [[ -f "${gjl_user_env}" ]]; then
 	source "${gjl_user_env}"
 elif [[ -f "${gjl_system_env}" ]]; then
diff --git a/src/run-java-tool b/src/run-java-tool
index c1aa9e5..c2aa04b 100644
--- a/src/run-java-tool
+++ b/src/run-java-tool
@@ -2,10 +2,10 @@
 
 if [[ -n ${GENTOO_VM} ]]; then
 	vmpath=/usr/lib/jvm/${GENTOO_VM}/
-elif [[ -h ${HOME}/.gentoo/user-vm ]]; then
-	vmpath=${HOME}/.gentoo/user-vm/
+elif [[ -h ${HOME}/.gentoo/java-config-2/current-user-vm ]]; then
+	vmpath=${HOME}/.gentoo/java-config-2/current-user-vm/
 else
-	vmpath=/etc/java-config/system-vm/
+	vmpath=/etc/java-config-2/current-system-vm/
 fi
 tool=$(basename $0)
 bin=${vmpath}/bin/${tool}