Satisfy new signer requirement, ext prps workaround

See http://forums.gradle.org/gradle/topics/project_description_vs_project_ext_description

Author: unsaved

build-dist.gradle

@@ -19,21 +19,21 @@
  * publish to a Maven repository.
  */
 
-assert cpFileTree.files.size() > 0:
+assert ext.cpFileTree.files.size() > 0:
     '''Due to boot-strapping issue, you must build the jar with 'build.gradle'
 before you can use build file 'build-dist.gradle'.
 '''
-assert cpFileTree.files.size() < 2:
+assert ext.cpFileTree.files.size() < 2:
     '''Due to boot-strapping issue, you must have just one project jar before
 you can use build file 'build-dist.gradle'.  Please run 'gradlew clean jar'.
 '''
 buildscript {
-    cpFileTree = fileTree(
+    ext.cpFileTree = fileTree(
             dir: 'build/libs',
             excludes: ['*-sources.jar', '*-javadoc.jar'],
             include: 'gradle-javaPropFile-plugin-*.jar'
     )
-    dependencies { classpath cpFileTree }
+    dependencies { classpath ext.cpFileTree }
 }
 
 apply plugin: 'maven'
@@ -85,7 +85,9 @@ uploadArchives {
 
     repositories.mavenDeployer {
         configuration = configurations.deployJars
-        beforeDeployment { MavenDeployment deployment -> signPom(deployment) }
+        beforeDeployment {
+            MavenDeployment deployment -> signing.signPom(deployment)
+        }
         if (project.hasProperty('mavenRepository.dest.url'))
             repository(url: project.property('mavenRepository.dest.url')) {
                 authentication(authMap)

src/main/groovy/com/admc/gradle/JavaPropFile.groovy

@@ -944,9 +944,14 @@ Failed to resolve DomainExtensionObject ref though succeeded earlier:
      */
     private static void setPossiblyNestedValue(Boolean dotDeref,
             Object topObject, String propertyPath, Object newValue) {
+        /* For the two tests beginning with 'topObject.hasProperty' and
+         * 'object.hasProperty', see
+         * http://forums.gradle.org/gradle/topics/project_description_vs_project_ext_description
+         */
         if (!dotDeref) {
             if (topObject.hasProperty('ext') && ExtraPropertiesExtension.
-              isAssignableFrom(topObject.ext.getClass()))
+              isAssignableFrom(topObject.ext.getClass()) &&
+              !topObject.hasProperty(propertyPath))
                 topObject.ext[propertyPath] = newValue
             else
                 topObject[propertyPath] = newValue
@@ -960,7 +965,8 @@ Failed to resolve DomainExtensionObject ref though succeeded earlier:
             object = object[it.replace('\u001F', '.')]
         }
         if (object.hasProperty('ext') &&
-          ExtraPropertiesExtension.isAssignableFrom(object.ext.getClass()))
+          ExtraPropertiesExtension.isAssignableFrom(object.ext.getClass()) &&
+          !object.hasProperty(propertyName))
             object.ext[propertyName.replace('\u001F', '.')] = newValue
         else
             object[propertyName.replace('\u001F', '.')] = newValue