Support VIRTUAL_CLASSPATH variable in non-jvm virtual provider.

svn path=/projects/java-config-2/trunk/; revision=7072

2 files changed, 19 insertions, 6 deletions

diff --git a/src/java_config_2/Package.py b/src/java_config_2/Package.py
index f058c81..3491dd9 100644
--- a/src/java_config_2/Package.py
+++ b/src/java_config_2/Package.py
@@ -42,6 +42,15 @@ class Package:
         else:
             return None
 
+    def virtual_classpath(self):
+        """
+        Returns this package's virtual classpath
+        """
+        if self._config.has_key("VIRTUAL_CLASSPATH"):
+            return self._config["VIRTUAL_CLASSPATH"]
+        else:
+            return None
+
     def target(self):
         return self.query("TARGET")
     
diff --git a/src/java_config_2/Virtual.py b/src/java_config_2/Virtual.py
index 6c9d0bf..8b5edcd 100644
--- a/src/java_config_2/Virtual.py
+++ b/src/java_config_2/Virtual.py
@@ -117,15 +117,19 @@ class Virtual(Package):
         Returns this package's classpath
         """
         try:
-            classpath=self.get_provider().classpath()
+            classpath=self.get_provider().virtual_classpath()
             return classpath
         except:
-            active_vm = self._manager.get_active_vm()
-            if active_vm and self.get_available_vms().count(active_vm.name()):
+            try:
+            	classpath=self.get_provider().classpath()
+                return classpath
+            except:
+                active_vm = self._manager.get_active_vm()
+                if active_vm and self.get_available_vms().count(active_vm.name()):
                 if self._config.has_key("VM_CLASSPATH"):
-                    return self._manager.get_active_vm().query('JAVA_HOME') + self._config["VM_CLASSPATH"]
-            else:
-                raise ProviderUnavailableError( self._name, self.providing_vms, self.providing_packages )
+                        return self._manager.get_active_vm().query('JAVA_HOME') + self._config["VM_CLASSPATH"]
+                else:
+                    raise ProviderUnavailableError( self._name, self.providing_vms, self.providing_packages )
 
     def query(self, var):
         """