[COMMIT osv master] java: tweaked openjdk7 to add /usr/bin/java symlink

[Commit Bot]

From: Waldemar Kozaczuk <jwkoz...@gmail.com>
Committer: Waldemar Kozaczuk <jwkoz...@gmail.com>
Branch: master

java: tweaked openjdk7 to add /usr/bin/java symlink

Signed-off-by: Waldemar Kozaczuk <jwkoz...@gmail.com>

---
diff --git a/modules/openjdk7/module.py b/modules/openjdk7/module.py
--- a/modules/openjdk7/module.py
+++ b/modules/openjdk7/module.py
@@ -19,3 +19,4 @@
usr_files.link('/usr/lib/jvm/' + jdkdir).to('java')
usr_files.link('/usr/lib/jvm/jre').to('java/jre')

usr_files.link('/usr/lib/jvm/java/jre/lib/security/cacerts').to('/etc/pki/java/cacerts')
+usr_files.link('/usr/bin/java').to('/usr/lib/jvm/java/bin/java')
diff --git a/scripts/test.py b/scripts/test.py
--- a/scripts/test.py
+++ b/scripts/test.py
@@ -32,7 +32,7 @@
-Disolates.jar=/tests/java/isolates.jar org.junit.runner.JUnitCore
io.osv.AllTestsThatTestIsolatedApp'),
SingleCommandTest('java_non_isolated', '/java.so -cp
/tests/java/tests.jar:/tests/java/isolates.jar \
-Disolates.jar=/tests/java/isolates.jar org.junit.runner.JUnitCore
io.osv.AllTestsThatTestNonIsolatedApp'),
- SingleCommandTest('java_no_wrapper', '/usr/lib/jvm/java/bin/java -cp
/tests/java/tests.jar \
+ SingleCommandTest('java_no_wrapper', '/usr/bin/java -cp
/tests/java/tests.jar \
org.junit.runner.JUnitCore io.osv.BasicTests !'),
SingleCommandTest('java-perms', '/java_isolated.so -cp
/tests/java/tests.jar io.osv.TestDomainPermissions'),
])