Add preliminary support for localized error messages in AppBundler.

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

Author: gkbrown

appbundler/res/en.lproj/Localizable.strings

@@ -0,0 +1 @@
+"JRENotFound" = "A Java runtime environment could not be located."

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

@@ -26,18 +26,23 @@
 
 package com.oracle.appbundler;
 
+import java.io.BufferedOutputStream;
 import java.io.BufferedWriter;
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.io.Writer;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.LinkOption;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
 
 import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLStreamException;
@@ -87,6 +92,8 @@ public class AppBundlerTask extends Task {
     private static final String ARRAY_TAG = "array";
     private static final String STRING_TAG = "string";
 
+    private static final int BUFFER_SIZE = 2048;
+
     public void setOutputDirectory(File outputDirectory) {
         this.outputDirectory = outputDirectory;
     }
@@ -276,6 +283,9 @@ public void execute() throws BuildException {
 
             executableFile.setExecutable(true, false);
 
+            // Copy localized resources to Resources folder
+            copyResources(resourcesDirectory);
+
             // Copy runtime to PlugIns folder
             copyRuntime(plugInsDirectory);
 
@@ -292,6 +302,42 @@ public void execute() throws BuildException {
         }
     }
 
+    private void copyResources(File resourcesDirectory) throws IOException {
+        // Unzip res.zip into resources directory
+        InputStream inputStream = getClass().getResourceAsStream("res.zip");
+        ZipInputStream zipInputStream = new ZipInputStream(inputStream);
+
+        try {
+            ZipEntry zipEntry = zipInputStream.getNextEntry();
+            while (zipEntry != null) {
+                File file = new File(resourcesDirectory, zipEntry.getName());
+
+                if (zipEntry.isDirectory()) {
+                    file.mkdir();
+                } else {
+                    OutputStream outputStream = new BufferedOutputStream(new FileOutputStream(file), BUFFER_SIZE);
+
+                    try {
+                        int b = zipInputStream.read();
+                        while (b != -1) {
+                            outputStream.write(b);
+                            b = zipInputStream.read();
+                        }
+
+                        outputStream.flush();
+                    } finally {
+                        outputStream.close();
+                    }
+
+                }
+
+                zipEntry = zipInputStream.getNextEntry();
+            }
+        } finally {
+            zipInputStream.close();
+        }
+    }
+
     private void copyRuntime(File plugInsDirectory) throws IOException {
         if (runtime != null) {
             File runtimeHomeDirectory = runtime.getDir();

build.xml

@@ -31,6 +31,7 @@ questions.
     <property name="folder.src" value="src"/>
     <property name="folder.bin" value="bin"/>
     <property name="folder.classes" value="${folder.bin}/classes"/>
+    <property name="folder.res" value="res"/>
 
     <!-- Compile target -->
     <target name="compile">
@@ -87,6 +88,10 @@ questions.
 
     <!-- Package target -->
     <target name="package" depends="compile">
+        <zip destfile="${ant.project.name}/${folder.classes}/com/oracle/appbundler/res.zip">
+            <fileset dir="${ant.project.name}/${folder.res}"/>
+        </zip>
+
         <jar destfile="${ant.project.name}/${folder.bin}/${ant.project.name}-${version}.jar" index="true">
             <manifest>
                 <attribute name="Implementation-Vendor-Id" value="com.oracle"/>
@@ -97,6 +102,7 @@ questions.
             <fileset dir="${ant.project.name}/${folder.classes}"/>
             <fileset dir="${ant.project.name}/${folder.bin}">
                 <include name="JavaAppLauncher"/>
+                <include name="*.zip"/>
             </fileset>
         </jar>
     </target>
@@ -144,7 +150,7 @@ questions.
             <include name="**/*.html"/>
             <include name="**/*.java"/>
             <include name="**/*.m"/>
-            <include name="**/*.properties"/>
+            <include name="**/*.strings"/>
             <include name="**/*.xml"/>
         </fileset>
         <replaceregexp match="[\t]" replace="    " flags="gm" byline="true">