Add default runtime excludes.

git-svn-id: https://svn.java.net/svn/appbundler~svn@16 07572b26-92e5-4d45-f66a-c18421440a21

Author: gk_brown

appbundler/doc/appbundler.html

@@ -106,9 +106,22 @@ <h3>Parameters specified as nested elements</h3>
 <h4>runtime</h4>
 <p>A <a href="http://ant.apache.org/manual/Types/fileset.html">fileset</a> representing the Java
 runtime to embed in the application. Corresponds to the <code>JVMRuntime</code> key in the
-<tt>Info.plist</tt> file. If specified, the contents of this directory will be copied to the
-<tt>Contents/PlugIns/</tt> folder of the generated bundle. If unspecified, the target system must
-have a shared JRE installed in <tt>/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/</tt>.</p>
+<tt>Info.plist</tt> file.</p>
+
+<p>This element is optional. If specified, the runtime will be copied to the
+<tt>Contents/PlugIns/</tt> folder of the generated bundle. If omitted, the target system must
+have a shared JRE installed in <tt>/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/</tt>
+in order to run the application.</p>
+
+<p>By default, the following runtime content will be excluded from the generated bundle:<p>
+<ul>
+<li><tt>Contents/Home/bin/</tt></li>
+<li><tt>Contents/Home/jre/bin/</tt></li>
+<li><tt>Contents/Home/man/</tt></li>
+<li><tt>Contents/Home/src.zip</tt></li>
+</ul>
+
+<p>Additional content can be excluded using nested <code>&lt;excludes/&gt;</code> elements.</p>
 
 <h4>classpath</h4>
 <p>A <a href="http://ant.apache.org/manual/Types/fileset.html">fileset</a> representing the class
@@ -151,8 +164,10 @@ <h4>argument</h4>
 </table>
 
 <h3>Examples</h3>
-<p>Generate a launcher for the "Swing Set" demo, bundling the JRE defined by the
-<tt>JAVA_HOME</tt> environment variable with the resulting executable:</p>
+<p>Generate a launcher for the "Swing Set" demo, bundling the JRE defined by the <tt>JAVA_HOME</tt>
+environment variable with the resulting executable. In addition to the default excludes, the
+contents of the <tt>Contents/Home/db/</tt> and <tt>Contents/Home/lib/</tt> folders will also be
+excluded from the bundled runtime:</p>
 <pre>
 &lt;-- Import environment variables --&gt;
 &lt;property environment="env"/&gt;
@@ -169,6 +184,9 @@ <h3>Examples</h3>
         shortversion="1.0"
         mainclassname="SwingSet2"&gt;
         &lt;runtime dir="${env.JAVA_HOME}/../.."/&gt;
+            &lt;exclude name="Contents/Home/db/"/&gt;
+            &lt;exclude name="Contents/Home/lib/"/&gt;
+        &lt;/runtime&gt;
         &lt;classpath file="/Library/Java/Demos/JFC/SwingSet2/SwingSet2.jar"/&gt;
         &lt;option value="-Dapple.laf.useScreenMenuBar=true"/&gt;
     &lt;/bundleapp&gt;

appbundler/src/com/oracle/appbundler/AppBundlerTask.java

@@ -128,7 +128,14 @@ public void addConfiguredRuntime(FileSet runtime) throws BuildException {
 
         this.runtime = runtime;
 
-        // TODO Add default excludes
+        runtime.appendExcludes(new String[] {
+            "Contents/MacOS/",
+            "Contents/Info.plist",
+            "Contents/Home/bin/",
+            "Contents/Home/jre/bin/",
+            "Contents/Home/man/",
+            "Contents/Home/src.zip"
+        });
     }
 
     public void addConfiguredClassPath(FileSet classPath) {

build.xml

@@ -143,15 +143,8 @@ questions.
             shortversion="1.0"
             mainclassname="SwingSet2">
             <runtime dir="${env.JAVA_HOME}/../..">
-                <exclude name="Contents/MacOS/"/>
-                <exclude name="Contents/Info.plist"/>
-                <exclude name="Contents/Home/bin/"/>
                 <exclude name="Contents/Home/db/"/>
                 <exclude name="Contents/Home/lib/"/>
-                <exclude name="Contents/Home/jre/bin/"/>
-                <exclude name="Contents/Home/jre/lib/JObjC.jar"/>
-                <exclude name="Contents/Home/man/"/>
-                <exclude name="Contents/Home/src.zip"/>
             </runtime>
             <classpath file="/Library/Java/Demos/JFC/SwingSet2/SwingSet2.jar"/>
             <option value="-Dapple.laf.useScreenMenuBar=true"/>