Merge remote-tracking branch 'origin/3.6'

Conflicts:
	config/Make.common.rules
	cpp/Makefile
	cpp/config/Make.rules
	cpp/config/Make.rules.Linux
	cpp/src/Ice/InstrumentationI.cpp
	cpp/src/Ice/PropertyNames.cpp
	cpp/src/Ice/PropertyNames.h
	cpp/src/IceSSL/Makefile
	cpp/src/IceUtil/Makefile
	cpp/test/Glacier2/attack/Makefile
	cpp/test/Glacier2/attack/Makefile.mak
	cpp/test/Glacier2/router/Makefile
	cpp/test/Glacier2/sessionHelper/Makefile
	cpp/test/Glacier2/staticFiltering/Makefile
	cpp/test/Ice/objects/Makefile
	cpp/test/IceSSL/configuration/AllTests.cpp
	cpp/test/IceUtil/stacktrace/StackTrace.debug.Linux
	cpp/test/IceUtil/stacktrace/StackTrace.release.Linux
	csharp/src/Ice/PropertyNames.cs
	java/Makefile
	java/gradle.properties
	java/gradle/ice.gradle
	java/src/Ice/src/main/java/IceInternal/PropertyNames.java
	java/test/build.gradle
	js/src/Ice/PropertyNames.js
	man/man1/icegridadmin.1
	man/man1/transformdb.1
	php/BuildInstructionsWindows.md
	php/Makefile
	php/config/Make.rules.Darwin
	php/config/Make.rules.mak.php
	php/config/Make.rules.php
	php/src/IcePHP/Makefile
	php/src/Makefile
	php/src/Makefile.mak
	php/src/php5/.depend.mak
	php/src/php5/Communicator.cpp
	php/src/php5/Config.h
	php/src/php5/Connection.cpp
	php/src/php5/Endpoint.cpp
	php/src/php5/IcePHP.rc
	php/src/php5/Makefile
	php/src/php5/Makefile.mak
	php/src/php5/Operation.cpp
	php/src/php5/Types.cpp
	php/src/php5/Types.h
	php/src/php5/Util.cpp
	php/src/php7/Communicator.cpp
	php/src/php7/Communicator.h
	php/src/php7/Config.h
	php/src/php7/Connection.cpp
	php/src/php7/Endpoint.cpp
	php/src/php7/IcePHP.rc
	php/src/php7/Makefile
	php/src/php7/Operation.cpp
	php/src/php7/Types.cpp
	php/src/php7/Types.h
	php/src/php7/Util.cpp
	scripts/TestUtil.py

2 files changed, 95 insertions, 31 deletions

diff --git a/java/src/Ice/src/main/java/IceInternal/PropertyNames.java b/java/src/Ice/src/main/java/IceInternal/PropertyNames.java
index 1540abb7abd..3d34d0c10f5 100644
--- a/java/src/Ice/src/main/java/IceInternal/PropertyNames.java
+++ b/java/src/Ice/src/main/java/IceInternal/PropertyNames.java
@@ -6,7 +6,7 @@
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
-// Generated by makeprops.py from file ./config/PropertyNames.xml, Thu Apr  7 10:41:53 2016
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Fri Jul  1 19:50:59 2016
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -998,6 +998,7 @@ public final class PropertyNames
         new Property("IceSSL\\.ProtocolVersionMax", false, null),
         new Property("IceSSL\\.ProtocolVersionMin", false, null),
         new Property("IceSSL\\.Random", false, null),
+        new Property("IceSSL\\.SecurityLevel", false, null),
         new Property("IceSSL\\.Trace\\.Security", false, null),
         new Property("IceSSL\\.TrustOnly", false, null),
         new Property("IceSSL\\.TrustOnly\\.Client", false, null),
diff --git a/java/src/IceGridGUI/build.gradle b/java/src/IceGridGUI/build.gradle
index bc6e4ae87ac..fa6a55a150f 100644
--- a/java/src/IceGridGUI/build.gradle
+++ b/java/src/IceGridGUI/build.gradle
@@ -46,14 +46,16 @@ dependencies {
       compile project(':icestorm')
       compile project(':glacier2')
       compile project(':icegrid')
-      compile 'com.jgoodies:jgoodies-common:1.8.0'
-      compile 'com.jgoodies:jgoodies-looks:2.6.0'
-      compile 'com.jgoodies:jgoodies-forms:1.8.0'
+      compile "com.jgoodies:jgoodies-looks:${jgoodiesLooksVersion}"
+      compile "com.jgoodies:jgoodies-forms:${jgoodiesFormsVersion}"
       bundleapp 'com.oracle:appbundler:1.0'
 }
 
 def tmpJarName = "IceGridGUITEMP.jar"
 def jarName = "icegridgui.jar"
+def env = System.getenv()
+def keystore = env['JARSIGNER_KEYSTORE']
+def keystore_password = env['JARSIGNER_KEYSTORE_PASSWORD']
 
 jar {
     archiveName = tmpJarName
@@ -65,14 +67,17 @@ jar {
 }
 
 buildscript {
-    repositories {
-        maven {
-            url "https://${iceMavenRepo}/nexus/content/repositories/thirdparty"
+        repositories {
+            mavenCentral()
+            maven {
+                url "https://${iceMavenRepo}/nexus/content/repositories/thirdparty"
+            }
+        }
+        dependencies {
+            if(icegridguiProguard.toBoolean()) {
+                classpath group: 'net.sourceforge', name: 'proguard', version: '5.0'
+            }
         }
-    }
-    dependencies {
-        classpath group: 'net.sourceforge', name: 'proguard', version: '5.0'
-    }
 }
 
 def libJars = []
@@ -88,28 +93,86 @@ if (hasJavaFx) {
     libJars << javafxJar
 }
 
-task proguardJar(type: proguard.gradle.ProGuardTask, dependsOn: jar) {
-    injars configurations.compile.resolve(), filter: '!META-INF/**'
-    injars "${projectDir}/build/libs/${tmpJarName}"
-    outjars "${libDir}/${jarName}"
-    libraryjars libJars
-    configuration 'icegridgui.pro'
-}
-task updateManifest(dependsOn: proguardJar) << {
-    if (hasJavaFx) {
+if(icegridguiProguard.toBoolean()) {
+
+    task proguardJar(type: proguard.gradle.ProGuardTask, dependsOn: jar) {
+        injars configurations.compile.resolve(), filter: "!META-INF/**"
+        injars "${projectDir}/build/libs/${tmpJarName}"
+        outjars "${libDir}/${jarName}"
+        libraryjars libJars
+        configuration 'icegridgui.pro'
+    }
+
+    task updateManifest(dependsOn: proguardJar) << {
+        if (hasJavaFx) {
+            ant.jar(update: true, destfile: "${libDir}/${jarName}") {
+                delegate.manifest {
+                    attribute(name: 'Main-Class', value: 'IceGridGUI.MainProxy')
+                    attribute(name: 'Built-By', value: 'Zeroc, Inc.')
+                }
+            }
+        }
+    }
+    
+    task copyJars(type: Copy, dependsOn: updateManifest) {
+        from new File("${libDir}/${jarName}")
+        into "${DESTDIR}${jarDir}"
+    }
+
+} else {
+
+    task copyTmpJars(type: Copy, dependsOn: jar) {
+        from new File("${projectDir}/build/libs/${tmpJarName}")
+        into "${libDir}"
+        rename("${tmpJarName}", "${jarName}")
+
+    }
+    
+    task updateManifest(dependsOn: copyTmpJars) << {
         ant.jar(update: true, destfile: "${libDir}/${jarName}") {
             delegate.manifest {
-                attribute(name: 'Main-Class', value: 'IceGridGUI.MainProxy')
-                attribute(name: 'Built-By', value: 'Zeroc, Inc.')
-                attribute(name: 'Class-Path', value: '../resources/')
+                attribute(name: "Main-Class", value: "IceGridGUI.Main")
+                attribute(name: "Built-By", value: "ZeroC, Inc.")
+                attribute(name: "Class-Path", value: configurations.runtime.resolve().collect { "file://${it.absolutePath}" }.join(' '))
             }
         }
     }
-}
 
-def env = System.getenv()
-def keystore = env['JARSIGNER_KEYSTORE']
-def keystore_password = env['JARSIGNER_KEYSTORE_PASSWORD']
+    //
+    // Copy JARs to the install location
+    //
+    task copyJars(type: Copy, dependsOn: jar) {
+        from new File("${projectDir}/build/libs/${tmpJarName}")
+        into "${DESTDIR}${jarDir}"
+        rename("${tmpJarName}", "${jarName}")
+    }
+    
+    //
+    // We need to update the manifest of the installed IceGridGUI jar and fix the
+    // Class-Path to point to the installed JAR files.
+    //
+    task updateInstallManifest(dependsOn: copyJars) << {
+        ant.jar(update: true, destfile: "${DESTDIR}${jarDir}/${jarName}") {
+            delegate.manifest {
+                attribute(name: "Main-Class", value: "IceGridGUI.Main")
+                attribute(name: "Built-By", value: "ZeroC, Inc.")
+                attribute(name: "Class-Path", value: configurations.runtime.resolve().collect { "file://${it.absolutePath}" }.join(' ').replaceAll("${libDir}", "${jarDir}"))
+            }
+        }
+    }
+    
+    //
+    // We need to sign the install JARs after updating the manifest.
+    //
+    task signInstalJar(dependsOn: updateInstallManifest) << { 
+        if(keystore != null && keystore.length() > 0) {
+            ant.signjar(jar: "${DESTDIR}${jarDir}/${jarName}",
+                        alias: "zeroc.com",
+                        keystore: "${keystore}",
+                        storepass:"${storepass}")
+        }
+    }
+}
 
 task signjar(dependsOn: updateManifest) << {
     if(keystore != null && keystore.length() > 0) {
@@ -165,12 +228,12 @@ clean {
     delete("${libDir}/IceGrid Admin.app")
 }
 
-task copyJars(type: Copy, dependsOn: updateManifest) {
-    from new File("${libDir}/${jarName}")
-    into "${DESTDIR}${jarDir}"
+if(icegridguiProguard.toBoolean()) {
+    task install(dependsOn: copyJars)
+}else{
+    task install(dependsOn: signInstalJar)
 }
 
-task install(dependsOn: copyJars)
 if(macosx) {
     install.dependsOn(copyBundle)
 }