Moved include and exclude definition for DMG JRE

Author: gamma

src/com/inet/gradle/setup/dmg/AbstractOSXApplicationBuilder.java

@@ -191,7 +191,7 @@ protected void bundleJre() {
         Runtime runtime = new Runtime( jreDir );
         if ( task instanceof Dmg ) {
             List<String> include = ((Dmg)task).getJreIncludes();
-            List<String> exclude = ((Dmg)task).getJreExclude();
+            List<String> exclude = ((Dmg)task).getJreExcludes();
 
             runtime.appendIncludes( include.toArray( new String[include.size()] ) );
             runtime.appendExcludes( exclude.toArray( new String[exclude.size()] ) );

src/com/inet/gradle/setup/dmg/Dmg.java

@@ -49,9 +49,25 @@ public class Dmg extends AbstractUnixSetupTask {
 
     private List<PreferencesLink>          preferencesLink = new ArrayList<>();
 
-    private List<String>                   jreIncludes = Arrays.asList( "bin/java" );
-
-    private List<String>                   jreExclude = new ArrayList<>();
+    private List<String>                   jreIncludes = Arrays.asList( new String[] {
+        "lib/",
+        "COPYRIGHT",
+        "LICENSE",
+        "README",
+        "THIRDPARTYLICENSEREADME-JAVAFX.txt",
+        "THIRDPARTYLICENSEREADME.txt",
+        "Welcome.html"
+    });
+
+    private List<String>                   jreExcludes = Arrays.asList( new String[] {
+        "lib/deploy/",
+        "lib/deploy.jar",
+        "lib/javaws.jar",
+        "lib/libdeploy.dylib",
+        "lib/libnpjp2.dylib",
+        "lib/plugin.jar",
+        "lib/security/javaws.policy"
+    });
 
     /**
      * Create the task.
@@ -297,15 +313,15 @@ public void setJreIncludes( List<String> jreIncludes ) {
      * Get a list of string - defining files - that should be excluded from the bundled JRE
      * @return the jreExclude
      */
-    public List<String> getJreExclude() {
-        return jreExclude;
+    public List<String> getJreExcludes() {
+        return jreExcludes;
     }
 
     /**
      * Set a list of string - defining files - that should be excluded from the bundled JRE
      * @param jreExclude the jreExclude to set
      */
-    public void setJreExclude( List<String> jreExclude ) {
-        this.jreExclude = jreExclude;
+    public void setJreExcludes( List<String> jreExclude ) {
+        this.jreExcludes = jreExclude;
     }
 }

src/com/oracle/appbundler/Runtime.java

@@ -92,44 +92,13 @@ private void patchIncludeExcludes( String[] includExclude ) {
         }
     }
 
-    /**
-     * check the type of the runtime set.
-     * If it is a JDK we want to exclude certain predefined entries
-     */
-    private void detectType() {
-        boolean isJDK = new File(getDir(), "jre").isDirectory();
-
-        appendIncludes(new String[] {
-                        "lib/",
-                        "COPYRIGHT",
-                        "LICENSE",
-                        "README",
-                        "THIRDPARTYLICENSEREADME-JAVAFX.txt",
-                        "THIRDPARTYLICENSEREADME.txt",
-                        "Welcome.html"
-        });
-
-        if (isJDK) {
-            appendExcludes(new String[] {
-                    "jre/lib/deploy/",
-                    "jre/lib/deploy.jar",
-                    "jre/lib/javaws.jar",
-                    "jre/lib/libdeploy.dylib",
-                    "jre/lib/libnpjp2.dylib",
-                    "jre/lib/plugin.jar",
-                    "jre/lib/security/javaws.policy"
-            });
-        }
-    }
-
     /**
      * Finally copy the files of the jre
      * @param targetDir where to copy
      * @param project the project we're working on
      * @throws IOException in case of errors
      */
     void copyTo(File targetDir, Project project) throws IOException {
-        detectType();
 
         File runtimeHomeDirectory = getDir();
         File runtimeContentsDirectory = runtimeHomeDirectory.getParentFile();