1.1 --- a/mojo/src/main/java/org/apidesign/bck2brwsr/mojo/BrswrMojo.java	Sun Dec 23 23:30:06 2012 +0100
     1.2 +++ b/mojo/src/main/java/org/apidesign/bck2brwsr/mojo/BrswrMojo.java	Tue Dec 25 15:08:39 2012 +0100
     1.3 @@ -17,26 +17,24 @@
     1.4   */
     1.5  package org.apidesign.bck2brwsr.mojo;
     1.6  
     1.7 +import java.io.Closeable;
     1.8  import org.apache.maven.plugin.AbstractMojo;
     1.9  
    1.10  import java.io.File;
    1.11  import java.io.IOException;
    1.12  import java.net.MalformedURLException;
    1.13 -import java.net.URISyntaxException;
    1.14  import java.net.URL;
    1.15  import java.net.URLClassLoader;
    1.16  import java.util.ArrayList;
    1.17  import java.util.Collection;
    1.18  import java.util.List;
    1.19 -import java.util.logging.Level;
    1.20 -import java.util.logging.Logger;
    1.21  import org.apache.maven.artifact.Artifact;
    1.22  import org.apache.maven.plugin.MojoExecutionException;
    1.23  import org.apache.maven.plugins.annotations.LifecyclePhase;
    1.24  import org.apache.maven.plugins.annotations.Mojo;
    1.25  import org.apache.maven.plugins.annotations.Parameter;
    1.26  import org.apache.maven.project.MavenProject;
    1.27 -import org.apidesign.bck2brwsr.launcher.Bck2BrwsrLauncher;
    1.28 +import org.apidesign.bck2brwsr.launcher.Launcher;
    1.29  
    1.30  /** Executes given HTML page in a browser. */
    1.31  @Mojo(name="brwsr", defaultPhase=LifecyclePhase.DEPLOY)
    1.32 @@ -63,15 +61,14 @@
    1.33          try {
    1.34              URLClassLoader url = buildClassLoader(classes, prj.getDependencyArtifacts());
    1.35              
    1.36 -            Bck2BrwsrLauncher httpServer = new Bck2BrwsrLauncher();
    1.37 -            httpServer.addClassLoader(url);
    1.38 +            Closeable httpServer;
    1.39              try {
    1.40 -                httpServer.showURL(startpage);
    1.41 +                httpServer = Launcher.showURL(url, startpage);
    1.42              } catch (Exception ex) {
    1.43                  throw new MojoExecutionException("Can't open " + startpage, ex);
    1.44              }
    1.45 -            
    1.46              System.in.read();
    1.47 +            httpServer.close();
    1.48          } catch (IOException ex) {
    1.49              throw new MojoExecutionException("Can't show the browser", ex);
    1.50          }