7u79-3: Merge with jre7/jdk + use CPU (7u79) release

7u79-3:
- Merge changes with jre7/jdk
- Mention end of public updates: http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html
- Use proper versioning (7u79, instead of 7.80)
- Use CPU (7u79) release

8 files changed, 167 insertions, 158 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4eafda1b4dfc..9eb5feb9893f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
 pkgbase = jdk7
-	pkgdesc = Oracle Java 7 Development Kit
-	pkgver = 7.80
-	pkgrel = 2
-	url = http://www.oracle.com/technetwork/java/javase/downloads/index.html
-	install = jdk.install
+	pkgdesc = Oracle Java 7 Development Kit (public release - end of support)
+	pkgver = 7u79
+	pkgrel = 3
+	url = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html
+	install = jdk7.install
 	arch = i686
 	arch = x86_64
 	license = custom
+	makedepends = pacman>=4.2.0
 	depends = ca-certificates-java
 	depends = desktop-file-utils
 	depends = hicolor-icon-theme
@@ -19,13 +20,9 @@ pkgbase = jdk7
 	depends = shared-mime-info
 	depends = xdg-utils
 	optdepends = alsa-lib: for basic sound support
-	optdepends = derby: for Oracle Apache Derby Java database (AUR)
-	optdepends = eclipse: "Oracle Java Mission Control" plugins for Eclipse
+	optdepends = eclipse: to use "Oracle Java Mission Control" plugins in Eclipse
 	optdepends = gtk2: for Gtk+ look and feel (desktop)
 	optdepends = ttf-font: fonts
-	optdepends = visualvm: for lightweight profiling capabilities
-	optdepends = jdk7-docs: Oracle JDK 7 documentation
-	optdepends = java7-jce_ustrength: Unrestricted cryptographic libraries
 	provides = java-runtime=7
 	provides = java-runtime-headless=7
 	provides = java-web-start=7
@@ -34,37 +31,36 @@ pkgbase = jdk7
 	provides = java-runtime-headless-jre=7
 	provides = java-web-start-jre=7
 	provides = java-environment-jdk=7
+	options = !strip
 	backup = etc/java-jdk7/amd64/jvm.cfg
-	backup = etc/java-jdk7/amd64/server/Xusage.txt
 	backup = etc/java-jdk7/images/cursors/cursors.properties
 	backup = etc/java-jdk7/management/jmxremote.access
-	backup = etc/java-jdk7/management/jmxremote.password.template
 	backup = etc/java-jdk7/management/management.properties
-	backup = etc/java-jdk7/management/snmp.acl.template
 	backup = etc/java-jdk7/security/java.policy
 	backup = etc/java-jdk7/security/java.security
 	backup = etc/java-jdk7/security/javaws.policy
-	backup = etc/java-jdk7/calendars.properties
 	backup = etc/java-jdk7/content-types.properties
 	backup = etc/java-jdk7/flavormap.properties
 	backup = etc/java-jdk7/fontconfig.properties.src
-	backup = etc/java-jdk7/javafx.properties
-	backup = etc/java-jdk7/jvm.hprof.txt
 	backup = etc/java-jdk7/logging.properties
 	backup = etc/java-jdk7/net.properties
 	backup = etc/java-jdk7/psfont.properties.ja
 	backup = etc/java-jdk7/psfontj2d.properties
 	backup = etc/java-jdk7/sound.properties
-	source = http://download.oracle.com/otn-pub/java/jdk/7u80-b15/jdk-7u80-linux-x64.tar.gz
+	source = http://download.oracle.com/otn-pub/java/jce/7/UnlimitedJCEPolicyJDK7.zip
 	source = jconsole-jdk7.desktop
 	source = jmc-jdk7.desktop
 	source = jvisualvm-jdk7.desktop
 	source = policytool-jdk7.desktop
-	sha256sums = bad9a731639655118740bee119139c1ed019737ec802a630dd7ad7aab4309623
-	sha256sums = ab4a2e49825df4e6055e90283f9d0b432e28a6d66f0f7ed659985e7c53847751
-	sha256sums = 535d86adeb183340442c307e0ba579d0f7718b30fe6ed319bdc91bb2cee47763
-	sha256sums = cf20cdf39583e1a992a85ab366437b80217951aeb9dec6b2ee54b77b4d0af6be
-	sha256sums = af15efe8b471d0ab147f4a88215aed3fc50b1a605ce31100dfa7a404f29e85b1
+	md5sums = c47e997b90ddfd0d813a37ccc97fb933
+	md5sums = c72336327d7cefadf4ffd74c014c7c2e
+	md5sums = ac3f149795f62cdf5bdfdd6061fb8184
+	md5sums = 1b692eac219a0b34fd7ec13f09cea078
+	md5sums = daf7f23efea899b8c575145d1eb73aab
+	source_i686 = http://download.oracle.com/otn-pub/java/jdk/7u79-b15/jdk-7u79-linux-i586.tar.gz
+	md5sums_i686 = b0ed59147c77a6d3e63a7b340e4e1d28
+	source_x86_64 = http://download.oracle.com/otn-pub/java/jdk/7u79-b15/jdk-7u79-linux-x64.tar.gz
+	md5sums_x86_64 = 9222e097e624800fdd9bfb568169ccad
 
 pkgname = jdk7
 
diff --git a/PKGBUILD b/PKGBUILD
index d2ad6900e426..1ef64da38d4f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,142 +1,167 @@
-# Maintainer: Jochen Schalanda <jochen+aur@schalanda.name>
-# Contributor: Det
+# Maintainer: Det
+# Contributor: Jochen Schalanda <jochen+aur@schalanda.name>
 # Contributor: isiachi <isiachi@rhyeworld.it>
-# Based on jre: https://aur.archlinux.org/packages.php?ID=51908
 
 _pkgname=jdk
-pkgname=${_pkgname}7
+pkgname=jdk7
 _major=7
-_minor=80
+_minor=79
 _build=b15
-_pkg=${_major}u$_minor
-pkgver=$_major.$_minor
-pkgrel=2
-pkgdesc="Oracle Java $_major Development Kit"
+pkgver=${_major}u${_minor}
+pkgrel=3
+pkgdesc="Oracle Java $_major Development Kit (public release - end of support)"
 arch=('i686' 'x86_64')
-url=http://www.oracle.com/technetwork/java/javase/downloads/index.html
+url='http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html'
 license=('custom')
 depends=('ca-certificates-java' 'desktop-file-utils' 'hicolor-icon-theme' 'java-environment-common'
          'java-runtime-common' 'libx11' 'libxrender' 'libxslt' 'libxtst' 'shared-mime-info' 'xdg-utils')
 optdepends=('alsa-lib: for basic sound support'
-            'derby: for Oracle Apache Derby Java database (AUR)'
-            'eclipse: "Oracle Java Mission Control" plugins for Eclipse'
+            'eclipse: to use "Oracle Java Mission Control" plugins in Eclipse'
             'gtk2: for Gtk+ look and feel (desktop)'
-            'ttf-font: fonts'
-            'visualvm: for lightweight profiling capabilities'
-            'jdk7-docs: Oracle JDK 7 documentation'
-            'java7-jce_ustrength: Unrestricted cryptographic libraries')
+            'ttf-font: fonts')
+makedepends=('pacman>=4.2.0')
 provides=("java-runtime=$_major" "java-runtime-headless=$_major" "java-web-start=$_major" "java-environment=$_major"
           "java-runtime-jre=$_major" "java-runtime-headless-jre=$_major" "java-web-start-jre=$_major" "java-environment-jdk=$_major")
 
 # Variables
-_arch=x64
-_arch2=amd64
-if [[ $CARCH = i686 ]]; then
-  _arch=i586
-  _arch2=i386
-fi
-DLAGENTS=('http::/usr/bin/curl -LC - -b oraclelicense=a -O')
-_jname=jdk${_major}
-_jvmdir=/usr/lib/jvm/java-$_major-${_pkgname}
-backup=("etc/java-$_jname/$_arch2/jvm.cfg"
-        "etc/java-$_jname/$_arch2/server/Xusage.txt"
+DLAGENTS=('http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -b oraclelicense=a -o %o %u')
+_jname=${_pkgname}${_major}
+_jvmdir=/usr/lib/jvm/java-$_major-$_pkgname
+
+backup=("etc/java-$_jname/amd64/jvm.cfg"
         "etc/java-$_jname/images/cursors/cursors.properties"
         "etc/java-$_jname/management/jmxremote.access"
-        "etc/java-$_jname/management/jmxremote.password.template"
         "etc/java-$_jname/management/management.properties"
-        "etc/java-$_jname/management/snmp.acl.template"
         "etc/java-$_jname/security/java.policy"
         "etc/java-$_jname/security/java.security"
         "etc/java-$_jname/security/javaws.policy"
-        "etc/java-$_jname/calendars.properties"
         "etc/java-$_jname/content-types.properties"
         "etc/java-$_jname/flavormap.properties"
         "etc/java-$_jname/fontconfig.properties.src"
-        "etc/java-$_jname/javafx.properties"
-        "etc/java-$_jname/jvm.hprof.txt"
         "etc/java-$_jname/logging.properties"
         "etc/java-$_jname/net.properties"
         "etc/java-$_jname/psfont.properties.ja"
         "etc/java-$_jname/psfontj2d.properties"
         "etc/java-$_jname/sound.properties")
-install=jdk.install
-source=("http://download.oracle.com/otn-pub/java/${_pkgname}/$_pkg-$_build/${_pkgname}-$_pkg-linux-$_arch.tar.gz"
+[[ $CARCH = i686 ]] && backup[0]="etc/java-$_jname/i386/jvm.cfg"
+options=('!strip') # JDK debug-symbols
+install=$pkgname.install
+source=("http://download.oracle.com/otn-pub/java/jce/$_major/UnlimitedJCEPolicyJDK$_major.zip"
         "jconsole-$_jname.desktop"
         "jmc-$_jname.desktop"
         "jvisualvm-$_jname.desktop"
         "policytool-$_jname.desktop")
-sha256sums=('bad9a731639655118740bee119139c1ed019737ec802a630dd7ad7aab4309623'
-            'ab4a2e49825df4e6055e90283f9d0b432e28a6d66f0f7ed659985e7c53847751'
-            '535d86adeb183340442c307e0ba579d0f7718b30fe6ed319bdc91bb2cee47763'
-            'cf20cdf39583e1a992a85ab366437b80217951aeb9dec6b2ee54b77b4d0af6be'
-            'af15efe8b471d0ab147f4a88215aed3fc50b1a605ce31100dfa7a404f29e85b1')
-[ "$CARCH" = 'i686' ] && sha256sums[0]='9ded1318a7223cf6e09ac4b6ee4db1f4c5d1aef1d3d291f6db8491a32eaa57ba'
+source_i686=("http://download.oracle.com/otn-pub/java/jdk/$pkgver-$_build/$_pkgname-$pkgver-linux-i586.tar.gz")
+source_x86_64=("http://download.oracle.com/otn-pub/java/jdk/$pkgver-$_build/$_pkgname-$pkgver-linux-x64.tar.gz")
+md5sums=('c47e997b90ddfd0d813a37ccc97fb933'
+         'c72336327d7cefadf4ffd74c014c7c2e'
+         'ac3f149795f62cdf5bdfdd6061fb8184'
+         '1b692eac219a0b34fd7ec13f09cea078'
+         'daf7f23efea899b8c575145d1eb73aab')
+md5sums_i686=('b0ed59147c77a6d3e63a7b340e4e1d28')
+md5sums_x86_64=('9222e097e624800fdd9bfb568169ccad')
+## Alternative mirror, if your local one is throttled:
+#source_x86_64=("http://ftp.wsisiz.edu.pl/pub/pc/pozyteczne%20oprogramowanie/java/$_pkgname-$pkgver-linux-x64.gz")
 
 package() {
-  msg2 "Creating required dirs"
-  cd ${_pkgname}1.${_major}.0_${_minor}
-  install -d "$pkgdir"/{usr/{lib/{jvm/java-$_major-$_pkgname/bin,mozilla/plugins},share/licenses/java$_major-$_pkgname},etc/.java/.systemPrefs}
-
-  msg2 "Preparing"
-  # Link duplicate binaries from jre/
-  for i in $(ls jre/bin/); do
-    ln -sf $_jvmdir/jre/bin/$i bin/$i
-  done
-
-  # Link NPAPI plugin
-  ln -sf $_jvmdir/jre/lib/$_arch2/libnpjp2.so "$pkgdir"/usr/lib/mozilla/plugins/libnpjp2-$_jname.so
-
-  # Replace JKS keystore with 'ca-certificates-java'
-  ln -sf /etc/ssl/certs/java/cacerts jre/lib/security/cacerts
-
-  # Suffix .desktops, icons and MIME packages
-  for i in $(find jre/lib/desktop/ -type f); do
-    rename -- "." "-$_jname." $i
-  done
-
-  # Suffix man pages
-  rename -- ".1" "-$_jname.1" man/{,ja_JP.UTF-8/}man1/*
-
-  # Fix .desktop paths
-  sed -e "s,Exec=,&$_jvmdir/jre/bin/," \
-      -e "s/\.png/-$_jname/" \
-      -i jre/lib/desktop/applications/*
-
-  msg2 "Removing redundancies"
-  rm -r db/ jre/lib/fontconfig.*.{bfc,properties.src} jre/plugin/ jre/{COPYRIGHT,LICENSE,README,*.txt} lib/visualvm/ man/ja
-
-  msg2 "Moving stuff in place"
-  # .desktops + icons
-  mv jre/lib/desktop/* "$pkgdir"/usr/share/
-  install -m644 "$srcdir"/*.desktop "$pkgdir"/usr/share/applications/
-
-  # Move/link configs: /usr/lib/jvm/java-$_jname/jre/lib -> /etc
-  for new_etc in ${backup[@]}; do
-    old_usr=jre/lib/${new_etc#*$_jname/}
-    install -Dm644 $old_usr "$pkgdir"/$new_etc
-    ln -sf /$new_etc $old_usr
-  done
-
-  # Man pages
-  mv man/ja_JP.UTF-8/ man/ja/
-  mv man/ "$pkgdir"/usr/share/
-
-  # Licenses
-  mv COPYRIGHT LICENSE *.txt "$pkgdir"/usr/share/licenses/java$_major-$_pkgname/
-  ln -sf /usr/share/licenses/java$_major-$pkgname/ "$pkgdir"/usr/share/licenses/$pkgname
-
-  # Do the move
-  mv * "$pkgdir"/$_jvmdir
-
-  msg2 "Enabling copy+paste to unsigned applets"
-  # Copy/paste from system clipboard to unsigned Java applets has been disabled since 6u24:
-  # - https://blogs.oracle.com/kyle/entry/copy_and_paste_in_java
-  # - http://slightlyrandombrokenthoughts.blogspot.com/2011/03/oracle-java-applet-clipboard-injection.html
-  _line=$(awk '/permission/{a=NR}; END{print a}' "$pkgdir"/etc/java-$_jname/security/java.policy)
-  sed "$_line a\\\\n \
+    cd ${_pkgname}1.${_major}.0_${_minor}
+
+    msg2 "Creating directory structure..."
+    install -d "$pkgdir"/etc/.java/.systemPrefs
+    install -d "$pkgdir"/usr/lib/jvm/java-$_major-$_pkgname/bin
+    install -d "$pkgdir"/usr/lib/mozilla/plugins
+    install -d "$pkgdir"/usr/share/licenses/java$_major-$_pkgname
+
+    msg2 "Removing redundancies..."
+    rm    db/bin/*.bat
+    rm -r jre/lib/desktop/icons/HighContrast
+    rm -r jre/lib/desktop/icons/HighContrastInverse
+    rm -r jre/lib/desktop/icons/LowContrast
+    rm    jre/lib/fontconfig.*.bfc
+    rm    jre/lib/fontconfig.*.properties.src
+    rm -r jre/plugin/
+    rm    jre/*.txt
+    rm    jre/COPYRIGHT
+    rm    jre/LICENSE
+    rm    jre/README
+    rm    man/ja
+
+    msg2 "Moving contents..."
+    mv * "$pkgdir"/$_jvmdir
+
+    # Cd to the new playground
+    cd "$pkgdir"/$_jvmdir
+
+    msg2 "Fixing directory structure..."
+    # Replace duplicate binaries in bin/ with links to jre/bin/
+    for i in $(ls jre/bin/); do
+        ln -sf "$_jvmdir/jre/bin/$i" "bin/$i"
+    done
+
+    # Suffix .desktops + icons (sun-java.png -> sun-java-$_jname.png)
+    for i in $(find jre/lib/desktop/ -type f); do
+        rename -- "." "-$_jname." $i
+    done
+
+    # Fix .desktop paths
+    sed -e "s|Exec=|&$_jvmdir/jre/bin/|" \
+        -e "s|.png|-$_jname.png|" \
+    -i jre/lib/desktop/applications/*
+
+    # Move .desktops + icons to /usr/share
+    mv jre/lib/desktop/* "$pkgdir"/usr/share/
+    install -m644 "$srcdir"/*.desktop "$pkgdir"/usr/share/applications/
+
+    # Move confs to /etc and link back to /usr: /usr/lib/jvm/java-$_jname/jre/lib -> /etc
+    for new_etc_path in ${backup[@]}; do
+        # Old location
+        old_usr_path="jre/lib/${new_etc_path#*$_jname/}"
+
+        # Move
+        install -Dm644 "$old_usr_path" "$pkgdir/$new_etc_path"
+        ln -sf "/$new_etc_path" "$old_usr_path"
+    done
+
+    # Link NPAPI plugin
+    case "$CARCH" in
+        i686)   ln -sf $_jvmdir/jre/lib/i386/libnpjp2.so  "$pkgdir"/usr/lib/mozilla/plugins/libnpjp2-$_jname.so ;;
+        x86_64) ln -sf $_jvmdir/jre/lib/amd64/libnpjp2.so "$pkgdir"/usr/lib/mozilla/plugins/libnpjp2-$_jname.so ;;
+    esac
+
+    # Replace JKS keystore with 'ca-certificates-java'
+    ln -sf /etc/ssl/certs/java/cacerts jre/lib/security/cacerts
+
+    # Suffix man pages
+    for i in $(find man/ -type f); do
+        mv "$i" "${i/.1}-$_jname.1"
+    done
+
+    # Move man pages
+    mv man/ja_JP.UTF-8/ man/ja
+    mv man/ "$pkgdir"/usr/share
+
+    # Move/link licenses
+    mv COPYRIGHT LICENSE *.txt "$pkgdir"/usr/share/licenses/java$_major-$_pkgname/
+    ln -sf /usr/share/licenses/java$_major-$_pkgname/ "$pkgdir"/usr/share/licenses/$pkgname
+
+    msg2 "Installing Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files..."
+    # Replace default "strong", but limited, cryptography to get an "unlimited strength" one for
+    # things like 256-bit AES. Enabled by default in OpenJDK:
+    # - http://suhothayan.blogspot.com/2012/05/how-to-install-java-cryptography.html
+    # - http://www.eyrie.org/~eagle/notes/debian/jce-policy.html
+    install -m644 "$srcdir"/UnlimitedJCEPolicy/*.jar jre/lib/security/
+    install -Dm644 "$srcdir"/UnlimitedJCEPolicy/README.txt \
+                   "$pkgdir"/usr/share/doc/$pkgname/README_-_Java_JCE_Unlimited_Strength.txt
+
+    msg2 "Enabling copy+paste in unsigned applets..."
+    # Copy/paste from system clipboard to unsigned Java applets has been disabled since 6u24:
+    # - https://blogs.oracle.com/kyle/entry/copy_and_paste_in_java
+    # - http://slightlyrandombrokenthoughts.blogspot.com/2011/03/oracle-java-applet-clipboard-injection.html
+    _line=$(awk '/permission/{a=NR}; END{print a}' "$pkgdir"/etc/java-$_jname/security/java.policy)
+    sed "$_line a\\\\n \
         // (AUR) Allow unsigned applets to read system clipboard, see:\n \
         // - https://blogs.oracle.com/kyle/entry/copy_and_paste_in_java\n \
         // - http://slightlyrandombrokenthoughts.blogspot.com/2011/03/oracle-java-applet-clipboard-injection.html\n \
         permission java.awt.AWTPermission \"accessClipboard\";" \
-     -i "$pkgdir"/etc/java-$_jname/security/java.policy
+    -i "$pkgdir"/etc/java-$_jname/security/java.policy
 }
diff --git a/UnlimitedJCEPolicyJDK7.zip b/UnlimitedJCEPolicyJDK7.zip
new file mode 100644
index 000000000000..0a6890ccdfea
--- /dev/null
+++ b/UnlimitedJCEPolicyJDK7.zip
diff --git a/jconsole-jdk7.desktop b/jconsole-jdk7.desktop
index 7270f932375d..efa470b69fa0 100644
--- a/jconsole-jdk7.desktop
+++ b/jconsole-jdk7.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Exec=/usr/lib/jvm/java-7-jdk/bin/jconsole
 Icon=sun-java-jdk7
-Name=Java Monitoring and Management Console
+Name=Java 7 Monitoring and Management Console
 StartupNotify=true
 Terminal=false
 Type=Application
diff --git a/jdk.install b/jdk7.install
index f38e8dacb791..36738ef33571 100644
--- a/jdk.install
+++ b/jdk7.install
@@ -1,54 +1,42 @@
-THIS_JDK='java-7-jdk'
+THIS_JAVA='java-7-jdk'
 NAME='JDK'
 
-note() {
-    printf "${blue}::${yellow} archlinux-java:${bold} $1${all_off}\n"
-}
-
 all_off="$(tput sgr0)"
 bold="${all_off}$(tput bold)"
 blue="${bold}$(tput setaf 4)"
 yellow="${bold}$(tput setaf 3)"
 
+note() {
+    printf "${blue}::${yellow} archlinux-java:${bold} $1${all_off}\n"
+}
+
 update_desktop() {
     update-desktop-database -q
     update-mime-database /usr/share/mime >/dev/null
     xdg-icon-resource forceupdate &>/dev/null
-    xdg-icon-resource forceupdate --theme HighContrast &>/dev/null
-    xdg-icon-resource forceupdate --theme HighContrastInverse &>/dev/null
-    xdg-icon-resource forceupdate --theme LowContrast &>/dev/null
-}
-
-fix_default() {
-    if [[ -x /usr/bin/java ]]; then
-        archlinux-java get
-    else
-        archlinux-java unset
-    fi
 }
 
 post_install() {
-    default=$(fix_default)
+    default=$(archlinux-java get)
     case ${default} in
         "")
-            archlinux-java set ${THIS_JDK}
-            note "${NAME} ('${THIS_JDK}') set as default Java environment."
+            archlinux-java set ${THIS_JAVA}
+            note "${NAME} ('${THIS_JAVA}') set as default Java environment."
             ;;
-        ${THIS_JDK})
-            # Nothing
-            note "${NAME} ('${THIS_JDK}') set as default Java environment."
+        ${THIS_JAVA})
+            note "${NAME} ('${THIS_JAVA}') set as default Java environment."
             ;;
         *)
             note "Default Java environment already set to '${default}'.
-                   To use ${NAME} ('${THIS_JDK}'), run:
-                     # archlinux-java set ${THIS_JDK}
+                   To use ${NAME} ('${THIS_JAVA}'), run:
+                     # archlinux-java set ${THIS_JAVA}
                    For status, use:
                      $ archlinux-java status"
             ;;
     esac
 
     if [[ ! -f /etc/ssl/certs/java/cacerts ]]; then
-        init-jks-keystore
+        update-ca-trust
     fi
 
     update_desktop
@@ -59,19 +47,19 @@ post_upgrade() {
 }
 
 pre_remove() {
-    default=$(fix_default)
-    if [[ ${default} = ${THIS_JDK} ]]; then
+    default=$(archlinux-java get)
+    if [[ ${default} = ${THIS_JAVA} ]]; then
         archlinux-java unset
     fi
 }
 
 post_remove() {
-    default=$(fix_default) # reassign
+    default=$(archlinux-java get) # reassign
     if [[ ${default} ]]; then
         note "Default Java environment is '${default}'."
     else
         archlinux-java fix
-        default=$(fix_default) # re-reassign
+        default=$(archlinux-java get) # re-reassign
         if [[ ${default} ]]; then
             note "Default Java environment left as '${default}'."
         else
diff --git a/jmc-jdk7.desktop b/jmc-jdk7.desktop
index d7eccc7c4e1a..b45ca1938e23 100644
--- a/jmc-jdk7.desktop
+++ b/jmc-jdk7.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Exec=/usr/lib/jvm/java-7-jdk/bin/jmc
 Icon=sun-java-jdk7
-Name=Java Mission Control
+Name=Java 7 Mission Control
 StartupNotify=true
 Terminal=false
 Type=Application
diff --git a/jvisualvm-jdk7.desktop b/jvisualvm-jdk7.desktop
index a94c5a5034a2..1da6c833cda8 100644
--- a/jvisualvm-jdk7.desktop
+++ b/jvisualvm-jdk7.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Exec=/usr/lib/jvm/java-7-jdk/bin/jvisualvm
-GenericName=Java Monitoring and Performance Monitoring Tool
+GenericName=Java 7 Monitoring and Performance Monitoring Tool
 Icon=sun-java-jdk7
-Name=Java VisualVM
+Name=Java 7 VisualVM
 StartupNotify=true
 Terminal=false
 Type=Application
diff --git a/policytool-jdk7.desktop b/policytool-jdk7.desktop
index 0c223e8a55f7..f81526e54138 100644
--- a/policytool-jdk7.desktop
+++ b/policytool-jdk7.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Exec=/usr/lib/jvm/java-7-jdk/jre/bin/policytool
 Icon=sun-java-jdk7
-Name=Java Policy Settings
+Name=Java 7 Policy Settings
 StartupNotify=true
 Terminal=false
 Type=Application