From d82103b1c3c3dc94828467a63eea94e8c801a066 Mon Sep 17 00:00:00 2001
From: tkellner <tkellner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 7 Jan 2014 17:37:43 +0000
Subject: Remove -d32 vm arg for java 1.7+ on MacOS

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@1277 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUWebStart/src/main/jnlp/template-unstable.xml | 7 ++++---
 BKUWebStart/src/main/jnlp/template.xml          | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'BKUWebStart/src/main/jnlp')

diff --git a/BKUWebStart/src/main/jnlp/template-unstable.xml b/BKUWebStart/src/main/jnlp/template-unstable.xml
index 7241d6dc..0671f32e 100644
--- a/BKUWebStart/src/main/jnlp/template-unstable.xml
+++ b/BKUWebStart/src/main/jnlp/template-unstable.xml
@@ -34,9 +34,10 @@
   <update check="timeout" policy="prompt-update"/>
 
   <resources os="Mac OS X">
-    <java version="1.6+" java-vm-args="-d32"/>
+    <java version="1.7+" />
+    <java version="1.6" java-vm-args="-d32"/>
      $dependencies
-  </resources>
+  </resources-->
 
   <resources>
     <java version="1.6+"/>
@@ -44,4 +45,4 @@
   </resources>
 
   <application-desc main-class="$mainClass"/>
-</jnlp>
\ No newline at end of file
+</jnlp>
diff --git a/BKUWebStart/src/main/jnlp/template.xml b/BKUWebStart/src/main/jnlp/template.xml
index 93675fb7..dfbd80f6 100644
--- a/BKUWebStart/src/main/jnlp/template.xml
+++ b/BKUWebStart/src/main/jnlp/template.xml
@@ -34,7 +34,8 @@
   <update check="timeout" policy="prompt-update"/>
 
   <resources os="Mac OS X">
-    <java version="1.6+" java-vm-args="-d32"/>
+    <java version="1.7+" />
+    <java version="1.6" java-vm-args="-d32"/>
      $dependencies
   </resources>
 
@@ -44,4 +45,4 @@
   </resources>
 
   <application-desc main-class="$mainClass"/>
-</jnlp>
\ No newline at end of file
+</jnlp>
-- 
cgit v1.2.3