# HG changeset patch
# User Vojtech Kral <vojtech.kral@oracle.com>
# Date 1472736063 25200
# Node ID d33b450816a46c93b32c87ae069db2ea870c721e
# Parent  ea93ede4968ec4480f9056363f98919419a1427e
23142223 /usr/bin/vp fails on Solaris 11.3 when default java set to 7 rather than 8

diff -r ea93ede4968e -r d33b450816a4 components/visual-panels/core/src/java/vpanels/vp.in
--- a/components/visual-panels/core/src/java/vpanels/vp.in	Wed Jul 27 11:32:28 2016 -0700
+++ b/components/visual-panels/core/src/java/vpanels/vp.in	Thu Sep 01 06:21:03 2016 -0700
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 {
@@ -52,5 +52,6 @@
 
 export CLASSPATH
 
-exec java -Djava.security.policy='<JAVA_POLICY>' \
+exec /usr/jdk/instances/jdk1.8.0/jre/bin/java \
+    -Djava.security.policy='<JAVA_POLICY>' \
     com.oracle.solaris.vp.client.swing.App "$@"
diff -r ea93ede4968e -r d33b450816a4 components/visual-panels/core/system-management-visual-panels-core.p5m
--- a/components/visual-panels/core/system-management-visual-panels-core.p5m	Wed Jul 27 11:32:28 2016 -0700
+++ b/components/visual-panels/core/system-management-visual-panels-core.p5m	Thu Sep 01 06:21:03 2016 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
@@ -47,9 +47,7 @@
 depend type=require fmri=__TBD pkg.debug.depend.file=gfind \
     pkg.debug.depend.path=usr/bin pkg.debug.depend.reason=usr/bin/vp \
     pkg.debug.depend.type=script
-depend type=require fmri=__TBD pkg.debug.depend.file=java \
-    pkg.debug.depend.path=usr/bin pkg.debug.depend.reason=usr/bin/vp \
-    pkg.debug.depend.type=script
+depend type=require fmri=pkg:/runtime/java/jre-8
 depend type=require fmri=__TBD pkg.debug.depend.file=jhall.jar \
     pkg.debug.depend.path=usr/jdk/packages/lib/ext \
     pkg.debug.depend.reason=usr/share/vpanels/app/vpanels-panels-browser.jar \