Merge testsuite2 into testsuite and use new ROOT support in EnvironmentManager

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

25 files changed, 288 insertions, 1 deletions

diff --git a/tests/testsuite/VersionManagerEnv2.py b/tests/testsuite/VersionManagerEnv2.py
new file mode 100644
index 0000000..b32438e
--- /dev/null
+++ b/tests/testsuite/VersionManagerEnv2.py
@@ -0,0 +1,20 @@
+import os, unittest
+
+from java_config_2.VersionManager import VersionManager
+from java_config_2.EnvironmentManager import EnvironmentManager
+
+class TestVersionManagerEnv2(unittest.TestCase):
+
+    def setUp(self):
+        self.em = EnvironmentManager(os.path.join(os.path.dirname(__file__), 'test_env2'))
+        self.em.set_active_vm(self.em.find_vm('icedtea-bin-6'))
+        self.verman = VersionManager(self.em)
+
+    def test_get_vm(self):
+        vm = self.verman.get_vm("virtual/jdk:1.6 java-virtuals/jdk-with-com-sun dev-java/ant-contrib:0 app-arch/xz-utils >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4")
+        self.assertEqual(vm.name(), 'icedtea-bin-6')
+
+if __name__ == '__main__':
+    unittest.main()
+
+# vim:set expandtab tabstop=4 shiftwidth=4 softtabstop=4 nowrap:
diff --git a/tests/testsuite/__init__.py b/tests/testsuite/__init__.py
index 06c70e0..bd9e014 100644
--- a/tests/testsuite/__init__.py
+++ b/tests/testsuite/__init__.py
@@ -1,8 +1,9 @@
-__all__ = [ 'VM', 'Virtual', 'Package', 'VersionManager', 'EnvironmentManager' ]
+__all__ = [ 'VM', 'Virtual', 'Package', 'VersionManager', 'VersionManagerEnv2', 'EnvironmentManager' ]
 from . import VM
 from . import Virtual
 from . import Package
 from . import VersionManager
+from . import VersionManagerEnv2
 from . import EnvironmentManager
 
 # vim:set expandtab tabstop=4 shiftwidth=4 softtabstop=4 nowrap:
diff --git a/tests/testsuite/test_env2/etc/java-config-2/virtuals b/tests/testsuite/test_env2/etc/java-config-2/virtuals
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/testsuite/test_env2/etc/java-config-2/virtuals
diff --git a/tests/testsuite/test_env2/usr/share/ant-contrib/package.env b/tests/testsuite/test_env2/usr/share/ant-contrib/package.env
new file mode 100644
index 0000000..280d765
--- /dev/null
+++ b/tests/testsuite/test_env2/usr/share/ant-contrib/package.env
@@ -0,0 +1,12 @@
+DESCRIPTION="A collection of tasks (and at one point maybe types and other tools) for Apache Ant."
+GENERATION="2"
+SLOT="0"
+CATEGORY="dev-java"
+PVR="1.0_beta3"
+CLASSPATH="/usr/share/ant-contrib/lib/ant-contrib.jar"
+DEPEND="ant-core:ant-ivy:bcel:commons-httpclient-3:xerces-2"
+VM=">=virtual/jre-1.4"
+TARGET="1.4"
+SOURCE="1.4"
+MERGE_VM="icedtea6-bin"
+MERGE_COMPILER="javac"
diff --git a/tests/testsuite/test_env2/usr/share/ant-core/package.env b/tests/testsuite/test_env2/usr/share/ant-core/package.env
new file mode 100644
index 0000000..150b426
--- /dev/null
+++ b/tests/testsuite/test_env2/usr/share/ant-core/package.env
@@ -0,0 +1,10 @@
+DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files."
+GENERATION="2"
+SLOT="0"
+CATEGORY="dev-java"
+PVR="1.8.2"
+CLASSPATH="/usr/share/ant-core/lib/ant.jar:/usr/share/ant-core/lib/ant-bootstrap.jar:/usr/share/ant-core/lib/ant-launcher.jar"
+VM=">=virtual/jdk-1.4"
+TARGET="1.4"
+SOURCE="1.4"
+MERGE_VM="icedtea-bin-7"
diff --git a/tests/testsuite/test_env2/usr/share/ant-ivy/package.env b/tests/testsuite/test_env2/usr/share/ant-ivy/package.env
new file mode 100644
index 0000000..9b1c515
--- /dev/null
+++ b/tests/testsuite/test_env2/usr/share/ant-ivy/package.env
@@ -0,0 +1,12 @@
+DESCRIPTION="Ivy is a free java based dependency manager"
+GENERATION="2"
+SLOT="0"
+CATEGORY="dev-java"
+PVR="1.4.1"
+CLASSPATH="/usr/share/ant-ivy/lib/ivy.jar"
+DEPEND="ant-core:commons-cli-1:commons-httpclient-3:commons-vfs:jakarta-oro-2.0:jsch"
+VM=">=virtual/jre-1.4"
+TARGET="1.4"
+SOURCE="1.4"
+MERGE_VM="icedtea6-bin"
+MERGE_COMPILER="javac"
diff --git a/tests/testsuite/test_env2/usr/share/ant-nodeps/package.env b/tests/testsuite/test_env2/usr/share/ant-nodeps/package.env
new file mode 100644
index 0000000..1dcdd72
--- /dev/null
+++ b/tests/testsuite/test_env2/usr/share/ant-nodeps/package.env
@@ -0,0 +1,11 @@
+DESCRIPTION="Apache Ant's optional tasks requiring no external deps"
+GENERATION="2"
+SLOT="0"
+CATEGORY="dev-java"
+PVR="1.8.2"
+CLASSPATH="/usr/share/ant-nodeps/lib/ant-nodeps.jar"
+VM=">=virtual/jre-1.4"
+BUILD_DEPEND="ant.jar@ant.jar"
+TARGET="1.4"
+SOURCE="1.4"
+MERGE_VM="icedtea-bin-7"
diff --git a/tests/testsuite/test_env2/usr/share/bcel/package.env b/tests/testsuite/test_env2/usr/share/bcel/package.env
new file mode 100644
index 0000000..cfd64ce
--- /dev/null
+++ b/tests/testsuite/test_env2/usr/share/bcel/package.env
@@ -0,0 +1,11 @@
+DESCRIPTION="The Byte Code Engineering Library: analyze, create, manipulate Java class files"
+GENERATION="2"
+SLOT="0"
+CATEGORY="dev-java"
+PVR="5.2-r2"
+CLASSPATH="/usr/share/bcel/lib/bcel.jar"
+VM=">=virtual/jre-1.5"
+TARGET="1.5"
+SOURCE="1.5"
+MERGE_VM="icedtea6-bin"
+MERGE_COMPILER="javac"
diff --git a/tests/testsuite/test_env2/usr/share/commons-cli-1/package.env b/tests/testsuite/test_env2/usr/share/commons-cli-1/package.env
new file mode 100644
index 0000000..1bd8d5a
--- /dev/null
+++ b/tests/testsuite/test_env2/usr/share/commons-cli-1/package.env
@@ -0,0 +1,11 @@
+DESCRIPTION="A Java library for working with the command line arguments and options."
+GENERATION="2"
+SLOT="1"
+CATEGORY="dev-java"
+PVR="1.2"
+CLASSPATH="/usr/share/commons-cli-1/lib/commons-cli.jar"
+VM=">=virtual/jre-1.4"
+TARGET="1.4"
+SOURCE="1.4"
+MERGE_VM="icedtea6-bin"
+MERGE_COMPILER="javac"
diff --git a/tests/testsuite/test_env2/usr/share/commons-codec/package.env b/tests/testsuite/test_env2/usr/share/commons-codec/package.env
new file mode 100644
index 0000000..3e3064d
--- /dev/null
+++ b/tests/testsuite/test_env2/usr/share/commons-codec/package.env
@@ -0,0 +1,11 @@
+DESCRIPTION="Implementations of common encoders and decoders in Java."
+GENERATION="2"
+SLOT="0"
+CATEGORY="dev-java"
+PVR="1.4"
+CLASSPATH="/usr/share/commons-codec/lib/commons-codec.jar"
+VM=">=virtual/jre-1.4"
+TARGET="1.4"
+SOURCE="1.4"
+MERGE_VM="icedtea6-bin"
+MERGE_COMPILER="javac"
diff --git a/tests/testsuite/test_env2/usr/share/commons-collections/package.env b/tests/testsuite/test_env2/usr/share/commons-collections/package.env
new file mode 100644
index 0000000..67c835d
--- /dev/null
+++ b/tests/testsuite/test_env2/usr/share/commons-collections/package.env
@@ -0,0 +1,11 @@
+DESCRIPTION="Jakarta-Commons Collections Component"
+GENERATION="2"
+SLOT="0"
+CATEGORY="dev-java"
+PVR="3.2.1"
+CLASSPATH="/usr/share/commons-collections/lib/commons-collections.jar"
+VM=">=virtual/jre-1.4"
+TARGET="1.4"
+SOURCE="1.4"
+MERGE_VM="icedtea6-bin"
+MERGE_COMPILER="javac"
diff --git a/tests/testsuite/test_env2/usr/share/commons-httpclient-3/package.env b/tests/testsuite/test_env2/usr/share/commons-httpclient-3/package.env
new file mode 100644
index 0000000..c437e98
--- /dev/null
+++ b/tests/testsuite/test_env2/usr/share/commons-httpclient-3/package.env
@@ -0,0 +1,12 @@
+DESCRIPTION="The Jakarta Commons HttpClient library"
+GENERATION="2"
+SLOT="3"
+CATEGORY="dev-java"
+PVR="3.1"
+CLASSPATH="/usr/share/commons-httpclient-3/lib/commons-httpclient.jar"
+DEPEND="commons-codec.jar@commons-codec:commons-logging-adapters.jar@commons-logging:commons-logging-api.jar@commons-logging:commons-logging.jar@commons-logging"
+VM=">=virtual/jre-1.4"
+TARGET="1.4"
+SOURCE="1.4"
+MERGE_VM="icedtea6-bin"
+MERGE_COMPILER="javac"
diff --git a/tests/testsuite/test_env2/usr/share/commons-logging/package.env b/tests/testsuite/test_env2/usr/share/commons-logging/package.env
new file mode 100644
index 0000000..25115dd
--- /dev/null
+++ b/tests/testsuite/test_env2/usr/share/commons-logging/package.env
@@ -0,0 +1,11 @@
+DESCRIPTION="The Jakarta-Commons Logging package is an ultra-thin bridge between different logging libraries."
+GENERATION="2"
+SLOT="0"
+CATEGORY="dev-java"
+PVR="1.1.1"
+CLASSPATH="/usr/share/commons-logging/lib/commons-logging.jar:/usr/share/commons-logging/lib/commons-logging-api.jar:/usr/share/commons-logging/lib/commons-logging-adapters.jar"
+VM=">=virtual/jre-1.4"
+TARGET="1.4"
+SOURCE="1.4"
+MERGE_VM="icedtea6-bin"
+MERGE_COMPILER="javac"
diff --git a/tests/testsuite/test_env2/usr/share/commons-net/package.env b/tests/testsuite/test_env2/usr/share/commons-net/package.env
new file mode 100644
index 0000000..1388398
--- /dev/null
+++ b/tests/testsuite/test_env2/usr/share/commons-net/package.env
@@ -0,0 +1,12 @@
+DESCRIPTION="The purpose of the library is to provide fundamental protocol access, not higher-level abstractions."
+GENERATION="2"
+SLOT="0"
+CATEGORY="dev-java"
+PVR="1.4.1-r1"
+CLASSPATH="/usr/share/commons-net/lib/commons-net.jar"
+DEPEND="jakarta-oro.jar@jakarta-oro-2.0"
+VM=">=virtual/jre-1.3"
+TARGET="1.3"
+SOURCE="1.3"
+MERGE_VM="icedtea6-bin"
+MERGE_COMPILER="javac"
diff --git a/tests/testsuite/test_env2/usr/share/commons-vfs/package.env b/tests/testsuite/test_env2/usr/share/commons-vfs/package.env
new file mode 100644
index 0000000..26b2391
--- /dev/null
+++ b/tests/testsuite/test_env2/usr/share/commons-vfs/package.env
@@ -0,0 +1,12 @@
+DESCRIPTION="a single API for accessing various different file systems"
+GENERATION="2"
+SLOT="0"
+CATEGORY="dev-java"
+PVR="1.0"
+CLASSPATH="/usr/share/commons-vfs/lib/commons-vfs.jar"
+DEPEND="ant-core:commons-collections:commons-httpclient-3:commons-logging:commons-net:jsch"
+VM=">=virtual/jre-1.4"
+TARGET="1.4"
+SOURCE="1.4"
+MERGE_VM="icedtea6-bin"
+MERGE_COMPILER="javac"
diff --git a/tests/testsuite/test_env2/usr/share/jakarta-oro-2.0/package.env b/tests/testsuite/test_env2/usr/share/jakarta-oro-2.0/package.env
new file mode 100644
index 0000000..6806fbe
--- /dev/null
+++ b/tests/testsuite/test_env2/usr/share/jakarta-oro-2.0/package.env
@@ -0,0 +1,11 @@
+DESCRIPTION="A set of text-processing Java classes."
+GENERATION="2"
+SLOT="2.0"
+CATEGORY="dev-java"
+PVR="2.0.8-r3"
+CLASSPATH="/usr/share/jakarta-oro-2.0/lib/jakarta-oro.jar"
+VM=">=virtual/jre-1.3"
+TARGET="1.3"
+SOURCE="1.3"
+MERGE_VM="icedtea-bin-7"
+MERGE_COMPILER="javac"
diff --git a/tests/testsuite/test_env2/usr/share/java-config-2/virtuals/jdk-with-com-sun b/tests/testsuite/test_env2/usr/share/java-config-2/virtuals/jdk-with-com-sun
new file mode 100644
index 0000000..13fd0ef
--- /dev/null
+++ b/tests/testsuite/test_env2/usr/share/java-config-2/virtuals/jdk-with-com-sun
@@ -0,0 +1,2 @@
+VM="icedtea-bin-6 icedtea6-bin icedtea-6 icedtea6 icedtea-bin-6 icedtea-bin-7 icedtea-7 sun-jdk-1.6 sun-jdk-1.5 sun-jdk-1.4 oracle-jdk-bin-1.7 diablo-jdk-1.6 apple-jdk-bin-1.6 apple-jdk-bin-1.5 apple-jdk-bin-1.4"
+MULTI_PROVIDER="FALSE"
diff --git a/tests/testsuite/test_env2/usr/share/java-config-2/vm/icedtea-7 b/tests/testsuite/test_env2/usr/share/java-config-2/vm/icedtea-7
new file mode 100644
index 0000000..69223c4
--- /dev/null
+++ b/tests/testsuite/test_env2/usr/share/java-config-2/vm/icedtea-7
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/files/icedtea.env,v 1.3 2011/11/28 15:29:59 sera Exp $
+
+VERSION="IcedTea JDK 7.2.1"
+JAVA_HOME="/usr/lib64/icedtea7"
+JDK_HOME="/usr/lib64/icedtea7"
+JAVAC="${JAVA_HOME}/bin/javac"
+PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
+ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
+LDPATH="${JAVA_HOME}/jre/lib/amd64/:${JAVA_HOME}/jre/lib/amd64/native_threads/:${JAVA_HOME}/jre/lib/amd64/xawt/:${JAVA_HOME}/jre/lib/amd64/server/"
+MANPATH="/usr/lib64/icedtea7/man"
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="1.7"
+# Taken from sun.boot.class.path property
+BOOTCLASSPATH="${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
+VMHANDLE="icedtea-7"
+BUILD_ONLY="FALSE"
diff --git a/tests/testsuite/test_env2/usr/share/java-config-2/vm/icedtea-bin-6 b/tests/testsuite/test_env2/usr/share/java-config-2/vm/icedtea-bin-6
new file mode 100644
index 0000000..d0104c7
--- /dev/null
+++ b/tests/testsuite/test_env2/usr/share/java-config-2/vm/icedtea-bin-6
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/files/icedtea-bin-6.env,v 1.2 2011/11/28 14:01:54 sera Exp $
+
+VERSION="IcedTea JDK 6.1.11.1"
+JAVA_HOME="/opt/icedtea-bin-6.1.11.1"
+JDK_HOME="/opt/icedtea-bin-6.1.11.1"
+JAVAC="${JAVA_HOME}/bin/javac"
+PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
+ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
+LDPATH="${JAVA_HOME}/jre/lib/amd64/:${JAVA_HOME}/jre/lib/amd64/native_threads/:${JAVA_HOME}/jre/lib/amd64/xawt/:${JAVA_HOME}/jre/lib/amd64/server/"
+MANPATH="/opt/icedtea-bin-6.1.11.1/man"
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="1.6"
+# Taken from sun.boot.class.path property
+BOOTCLASSPATH="${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
+VMHANDLE="icedtea-bin-6"
+BUILD_ONLY="FALSE"
diff --git a/tests/testsuite/test_env2/usr/share/java-config-2/vm/icedtea-bin-7 b/tests/testsuite/test_env2/usr/share/java-config-2/vm/icedtea-bin-7
new file mode 100644
index 0000000..01e4027
--- /dev/null
+++ b/tests/testsuite/test_env2/usr/share/java-config-2/vm/icedtea-bin-7
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/files/icedtea-bin-7.env,v 1.2 2011/11/28 14:01:54 sera Exp $
+
+VERSION="IcedTea JDK 7.2.1"
+JAVA_HOME="/opt/icedtea-bin-7.2.1"
+JDK_HOME="/opt/icedtea-bin-7.2.1"
+JAVAC="${JAVA_HOME}/bin/javac"
+PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
+ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
+LDPATH="${JAVA_HOME}/jre/lib/amd64/:${JAVA_HOME}/jre/lib/amd64/native_threads/:${JAVA_HOME}/jre/lib/amd64/xawt/:${JAVA_HOME}/jre/lib/amd64/server/"
+MANPATH="/opt/icedtea-bin-7.2.1/man"
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="1.7"
+# Taken from sun.boot.class.path property
+BOOTCLASSPATH="${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
+VMHANDLE="icedtea-bin-7"
+BUILD_ONLY="FALSE"
diff --git a/tests/testsuite/test_env2/usr/share/jsch/package.env b/tests/testsuite/test_env2/usr/share/jsch/package.env
new file mode 100644
index 0000000..6cf0193
--- /dev/null
+++ b/tests/testsuite/test_env2/usr/share/jsch/package.env
@@ -0,0 +1,12 @@
+DESCRIPTION="JSch is a pure Java implementation of SSH2."
+GENERATION="2"
+SLOT="0"
+CATEGORY="dev-java"
+PVR="0.1.44"
+CLASSPATH="/usr/share/jsch/lib/jsch.jar"
+DEPEND="jzlib"
+VM=">=virtual/jdk-1.5"
+TARGET="1.5"
+SOURCE="1.5"
+MERGE_VM="icedtea6-bin"
+MERGE_COMPILER="javac"
diff --git a/tests/testsuite/test_env2/usr/share/jzlib/package.env b/tests/testsuite/test_env2/usr/share/jzlib/package.env
new file mode 100644
index 0000000..fb1d810
--- /dev/null
+++ b/tests/testsuite/test_env2/usr/share/jzlib/package.env
@@ -0,0 +1,11 @@
+DESCRIPTION="JZlib is a re-implementation of zlib in pure Java."
+GENERATION="2"
+SLOT="0"
+CATEGORY="dev-java"
+PVR="1.0.7-r1"
+CLASSPATH="/usr/share/jzlib/lib/jzlib.jar"
+VM=">=virtual/jre-1.4"
+TARGET="1.4"
+SOURCE="1.4"
+MERGE_VM="icedtea6-bin"
+MERGE_COMPILER="javac"
diff --git a/tests/testsuite/test_env2/usr/share/xerces-2/package.env b/tests/testsuite/test_env2/usr/share/xerces-2/package.env
new file mode 100644
index 0000000..06f637c
--- /dev/null
+++ b/tests/testsuite/test_env2/usr/share/xerces-2/package.env
@@ -0,0 +1,12 @@
+DESCRIPTION="The next generation of high performance, fully compliant XML parsers in the Apache Xerces family"
+GENERATION="2"
+SLOT="2"
+CATEGORY="dev-java"
+PVR="2.11.0"
+CLASSPATH="/usr/share/xerces-2/lib/xercesImpl.jar"
+DEPEND="xml-commons-external-1.4:xml-commons-resolver"
+VM=">=virtual/jre-1.4"
+TARGET="1.4"
+SOURCE="1.4"
+MERGE_VM="icedtea-bin-7"
+MERGE_COMPILER="javac"
diff --git a/tests/testsuite/test_env2/usr/share/xml-commons-external-1.4/package.env b/tests/testsuite/test_env2/usr/share/xml-commons-external-1.4/package.env
new file mode 100644
index 0000000..2b8d8e4
--- /dev/null
+++ b/tests/testsuite/test_env2/usr/share/xml-commons-external-1.4/package.env
@@ -0,0 +1,11 @@
+DESCRIPTION="An Apache-hosted set of externally-defined standards interfaces, namely DOM, SAX, and JAXP."
+GENERATION="2"
+SLOT="1.4"
+CATEGORY="dev-java"
+PVR="1.4.01"
+CLASSPATH="/usr/share/xml-commons-external-1.4/lib/xml-apis.jar:/usr/share/xml-commons-external-1.4/lib/xml-apis-ext.jar"
+VM=">=virtual/jre-1.3"
+TARGET="1.3"
+SOURCE="1.3"
+MERGE_VM="icedtea-bin-7"
+MERGE_COMPILER="javac"
diff --git a/tests/testsuite/test_env2/usr/share/xml-commons-resolver/package.env b/tests/testsuite/test_env2/usr/share/xml-commons-resolver/package.env
new file mode 100644
index 0000000..6caae64
--- /dev/null
+++ b/tests/testsuite/test_env2/usr/share/xml-commons-resolver/package.env
@@ -0,0 +1,11 @@
+DESCRIPTION="An XML Entity and URI Resolver"
+GENERATION="2"
+SLOT="0"
+CATEGORY="dev-java"
+PVR="1.2"
+CLASSPATH="/usr/share/xml-commons-resolver/lib/xml-commons-resolver.jar"
+VM=">=virtual/jre-1.3"
+TARGET="1.3"
+SOURCE="1.3"
+MERGE_VM="icedtea6-bin"
+MERGE_COMPILER="javac"