# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1369770578 -7200
# Node ID 06e7a74c72cf49614e6538f078718aff778cc6a6
# Parent  a55680f825fc608980eb9ea6db887ac32690d3d7
Make sure the launchers run on JDK6

diff -r a55680f825fc -r 06e7a74c72cf launcher/fx/pom.xml
--- a/launcher/fx/pom.xml	Tue May 28 21:49:11 2013 +0200
+++ b/launcher/fx/pom.xml	Tue May 28 21:49:38 2013 +0200
@@ -18,8 +18,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.3.2</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.6</source>
+                    <target>1.6</target>
                 </configuration>
             </plugin>
             <plugin>
diff -r a55680f825fc -r 06e7a74c72cf launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/BaseHTTPLauncher.java
--- a/launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/BaseHTTPLauncher.java	Tue May 28 21:49:11 2013 +0200
+++ b/launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/BaseHTTPLauncher.java	Tue May 28 21:49:38 2013 +0200
@@ -61,8 +61,8 @@
 abstract class BaseHTTPLauncher extends Launcher implements Closeable, Callable<HttpServer> {
     static final Logger LOG = Logger.getLogger(BaseHTTPLauncher.class.getName());
     private static final InvocationContext END = new InvocationContext(null, null, null);
-    private final Set<ClassLoader> loaders = new LinkedHashSet<>();
-    private final BlockingQueue<InvocationContext> methods = new LinkedBlockingQueue<>();
+    private final Set<ClassLoader> loaders = new LinkedHashSet<ClassLoader>();
+    private final BlockingQueue<InvocationContext> methods = new LinkedBlockingQueue<InvocationContext>();
     private long timeOut;
     private final Res resources = new Res();
     private final String cmd;
@@ -112,7 +112,7 @@
         server = s;
         try {
             launchServerAndBrwsr(s, simpleName);
-        } catch (URISyntaxException | InterruptedException ex) {
+        } catch (Exception ex) {
             throw new IOException(ex);
         }
     }
@@ -124,7 +124,7 @@
         HttpServer s = initServer(dir.getPath(), false);
         try {
             launchServerAndBrwsr(s, startpage);
-        } catch (URISyntaxException | InterruptedException ex) {
+        } catch (Exception ex) {
             throw new IOException(ex);
         }
     }
@@ -237,7 +237,7 @@
         
         conf.addHttpHandler(new HttpHandler() {
             int cnt;
-            List<InvocationContext> cases = new ArrayList<>();
+            List<InvocationContext> cases = new ArrayList<InvocationContext>();
             DynamicResourceHandler prev;
             @Override
             public void service(Request request, Response response) throws Exception {
@@ -547,7 +547,8 @@
                 replace = args;
             }
             OutputStream os = response.getOutputStream();
-            try (InputStream is = res.get(r)) {
+            try { 
+                InputStream is = res.get(r);
                 copyStream(is, os, request.getRequestURL().toString(), replace);
             } catch (IOException ex) {
                 response.setDetailMessage(ex.getLocalizedMessage());
@@ -603,7 +604,9 @@
             if (res.startsWith("/")) {
                 res = res.substring(1);
             }
-            try (InputStream is = loader.get(res)) {
+            InputStream is = null;
+            try {
+                is = loader.get(res);
                 response.setContentType("text/javascript");
                 Writer w = response.getWriter();
                 w.append("[");
@@ -628,6 +631,10 @@
                 response.setStatus(HttpStatus.NOT_FOUND_404);
                 response.setError();
                 response.setDetailMessage(ex.getMessage());
+            } finally {
+                if (is != null) {
+                    is.close();
+                }
             }
         }
     }
diff -r a55680f825fc -r 06e7a74c72cf launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/FXBrwsrLauncher.java
--- a/launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/FXBrwsrLauncher.java	Tue May 28 21:49:11 2013 +0200
+++ b/launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/FXBrwsrLauncher.java	Tue May 28 21:49:38 2013 +0200
@@ -129,8 +129,12 @@
         while (en.hasMoreElements()) {
             URL url = en.nextElement();
             Manifest mf;
-            try (InputStream is = url.openStream()) {
+            InputStream is = null;
+            try {
+                is = url.openStream();
                 mf = new Manifest(is);
+            } finally {
+                if (is != null) is.close();
             }
             String sp = mf.getMainAttributes().getValue("StartPage");
             if (sp != null) {
diff -r a55680f825fc -r 06e7a74c72cf launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/fximpl/Console.java
--- a/launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/fximpl/Console.java	Tue May 28 21:49:11 2013 +0200
+++ b/launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/fximpl/Console.java	Tue May 28 21:49:38 2013 +0200
@@ -232,7 +232,9 @@
         if (u == null) {
             throw new IOException("Can't find " + name);
         }
-        try (InputStream is = u.openStream()) {
+        InputStream is = null;
+        try {
+            is = u.openStream();
             byte[] arr;
             arr = new byte[is.available()];
             int offset = 0;
@@ -244,6 +246,8 @@
                 offset += len;
             }
             return arr;
+        } finally {
+            if (is != null) is.close();
         }
     }