From eea29a05abbd9a89a181455ac858173fc3640f93 Mon Sep 17 00:00:00 2001 From: Trygve Laugstøl Date: Sun, 7 Oct 2012 18:50:48 +0200 Subject: o Initial import of Java utils for app.sh. --- .gitignore | 5 + booter-jetty8/pom.xml | 34 +++++++ .../appsh/booter/jetty8/JettyWebServer.java | 108 +++++++++++++++++++++ .../java/io/trygvis/appsh/booter/jetty8/Main.java | 95 ++++++++++++++++++ examples/app-a-bundle/pom.xml | 77 +++++++++++++++ .../src/main/unix/files/root/etc/booter.properties | 2 + .../src/main/unix/files/scripts/postinstall | 6 ++ examples/app-a-web/pom.xml | 11 +++ examples/app-a-web/src/main/webapp/WEB-INF/web.xml | 4 + examples/app-a-web/src/main/webapp/index.jspx | 10 ++ pom.xml | 36 +++++++ 11 files changed, 388 insertions(+) create mode 100644 .gitignore create mode 100644 booter-jetty8/pom.xml create mode 100644 booter-jetty8/src/main/java/io/trygvis/appsh/booter/jetty8/JettyWebServer.java create mode 100644 booter-jetty8/src/main/java/io/trygvis/appsh/booter/jetty8/Main.java create mode 100644 examples/app-a-bundle/pom.xml create mode 100644 examples/app-a-bundle/src/main/unix/files/root/etc/booter.properties create mode 100644 examples/app-a-bundle/src/main/unix/files/scripts/postinstall create mode 100644 examples/app-a-web/pom.xml create mode 100644 examples/app-a-web/src/main/webapp/WEB-INF/web.xml create mode 100644 examples/app-a-web/src/main/webapp/index.jspx create mode 100644 pom.xml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a750dc8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +target +*.iml +.idea +.project +.classpath diff --git a/booter-jetty8/pom.xml b/booter-jetty8/pom.xml new file mode 100644 index 0000000..78987d6 --- /dev/null +++ b/booter-jetty8/pom.xml @@ -0,0 +1,34 @@ + + + 4.0.0 + + io.trygvis.appsh + appsh-parent + 1.0-SNAPSHOT + + booter-jetty8 + + + org.eclipse.jetty + jetty-server + ${versions.jetty8} + + + org.eclipse.jetty + jetty-webapp + ${versions.jetty8} + + + org.eclipse.jetty.orbit + org.apache.jasper.glassfish + 2.2.2.v201112011158 + + + org.eclipse.jetty.orbit + javax.el + 2.2.0.v201108011116 + + + diff --git a/booter-jetty8/src/main/java/io/trygvis/appsh/booter/jetty8/JettyWebServer.java b/booter-jetty8/src/main/java/io/trygvis/appsh/booter/jetty8/JettyWebServer.java new file mode 100644 index 0000000..b0a3fef --- /dev/null +++ b/booter-jetty8/src/main/java/io/trygvis/appsh/booter/jetty8/JettyWebServer.java @@ -0,0 +1,108 @@ +package io.trygvis.appsh.booter.jetty8; + +import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.handler.ContextHandler; +import org.eclipse.jetty.server.handler.ContextHandlerCollection; +import org.eclipse.jetty.server.nio.SelectChannelConnector; +import org.eclipse.jetty.util.log.StdErrLog; +import org.eclipse.jetty.webapp.WebAppContext; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +public class JettyWebServer { + private File basedir = new File("").getAbsoluteFile(); + private File tmp, extraClasspath; + private int httpPort = 8080; + + List contexts = new ArrayList(); + + public void setBasedir(File basedir) { + this.basedir = basedir; + } + + public void setHttpPort(int port) { + this.httpPort = port; + } + + public Context addContext(String contextPath, File webapp) throws Exception { + Context context = new Context(); + context.setContextPath(contextPath); + context.setWebapp(webapp); + contexts.add(context); + return context; + } + + public void run() throws Exception { + tmp = new File(basedir, "tmp"); + + if (!tmp.isDirectory() && !tmp.mkdirs()) { + throw new IOException("Could not create temp directory: " + tmp); + } + + extraClasspath = new File(basedir, "etc"); + + if (!extraClasspath.isDirectory()) { + extraClasspath = null; + } + + System.setProperty("org.mortbay.log.class", StdErrLog.class.getName()); + + Server server = new Server(); + if (httpPort != 0) { + Connector connector = new SelectChannelConnector(); + connector.setPort(httpPort); + server.addConnector(connector); + } + + ContextHandlerCollection handler = new ContextHandlerCollection(); + server.setHandler(handler); + for (Context context : contexts) { + handler.addHandler(context.toJetty()); + } + + server.start(); + server.join(); + } + + public class Context { + private File webapp; + private String contextPath; + + public void setWebapp(File webapp) throws IOException { + if (!webapp.exists()) { + throw new IOException("File has to exist: " + webapp); + } + this.webapp = webapp; + } + + public void setContextPath(String contextPath) { + if (!contextPath.startsWith("/")) { + throw new RuntimeException("The context path has to start with '/'."); + } + + this.contextPath = contextPath; + } + + public ContextHandler toJetty() { + WebAppContext context = new WebAppContext(); + context.setContextPath(this.contextPath); + context.setWar(webapp.getAbsolutePath()); + if (extraClasspath != null) { + context.setExtraClasspath(extraClasspath.getAbsolutePath()); + } + + context.setExtractWAR(true); + // TODO: Should the temp directory be cleaned out before starting? + String dir = contextPath.substring(1); + if (dir.length() == 0) { + dir = "ROOT"; + } + context.setTempDirectory(new File(tmp, dir)); + return context; + } + } +} diff --git a/booter-jetty8/src/main/java/io/trygvis/appsh/booter/jetty8/Main.java b/booter-jetty8/src/main/java/io/trygvis/appsh/booter/jetty8/Main.java new file mode 100644 index 0000000..b69ff1d --- /dev/null +++ b/booter-jetty8/src/main/java/io/trygvis/appsh/booter/jetty8/Main.java @@ -0,0 +1,95 @@ +package io.trygvis.appsh.booter.jetty8; + +import org.eclipse.jetty.util.IO; + +import java.io.*; +import java.util.Map; +import java.util.Properties; + +import static java.lang.Integer.parseInt; + +public class Main { + + /** + * The file that this booter will read it's configuration from. + */ + public static final String PROPERTIES_FILE = "etc/booter.properties"; + + public static void main(String[] args) throws Exception { + File basedir = new File(System.getProperty("basedir", new File("").getAbsolutePath())); + + File booterPropertiesFile = new File(basedir, PROPERTIES_FILE); + + Properties properties = new Properties(); + InputStream is = null; + try { + is = new FileInputStream(booterPropertiesFile); + properties.load(new InputStreamReader(is, "utf-8")); + } catch (FileNotFoundException e) { + System.err.println("Can't read: " + booterPropertiesFile); + System.exit(1); + } catch (IOException e) { + System.err.println("Error reading: " + booterPropertiesFile); + System.exit(1); + } finally { + IO.close(is); + } + + setStreams(basedir, properties); + + JettyWebServer server; + try { + server = new JettyWebServer(); + server.setBasedir(basedir); + + for (Map.Entry entry : properties.entrySet()) { + String key = entry.getKey().toString(); + String value = entry.getValue().toString(); + + if (key.startsWith("context.")) { + server.addContext(key.substring(8), new File(basedir, value)); + } + } + + String httpPort = properties.getProperty("http.port"); + if (httpPort != null) { + server.setHttpPort(parseInt(httpPort)); + } + } catch (Exception e) { + System.err.println("Error while configuring Jetty."); + e.printStackTrace(); + System.exit(1); + return; + } + + try { + server.run(); + } catch (Exception e) { + System.err.println("Error while starting Jetty."); + e.printStackTrace(); + System.exit(1); + } + } + + private static void setStreams(File basedir, Properties properties) throws IOException { + String logS = properties.getProperty("log"); + + if(logS == null) { + return; + } + + File log = new File(basedir, logS); + + if(!log.getParentFile().isDirectory()) { + if(!log.getParentFile().mkdirs()) { + System.err.println("Unable to create directory: " + log.getAbsolutePath()); + System.exit(1); + } + } + + PrintStream writer = new PrintStream(new FileOutputStream(log)); + + System.setOut(writer); + System.setErr(writer); + } +} diff --git a/examples/app-a-bundle/pom.xml b/examples/app-a-bundle/pom.xml new file mode 100644 index 0000000..63b4c5a --- /dev/null +++ b/examples/app-a-bundle/pom.xml @@ -0,0 +1,77 @@ + + 4.0.0 + + io.trygvis.appsh + appsh-parent + 1.0-SNAPSHOT + + io.trygvis.appsh.examples + app-a-bundle + unix-zip + + + trygvis.io-snapshots + http://repo.trygvis.io/snapshots + + + + + io.trygvis.appsh + booter-jetty8 + 1.0-SNAPSHOT + + + io.trygvis.appsh.examples + app-a-web + ${project.version} + war + + + + + + org.codehaus.mojo + appassembler-maven-plugin + 1.1 + + + generate-resources + + assemble + + + + + + + app-a + io.trygvis.appsh.booter.jetty8.Main + + + + + + no.arktekk.unix + unix-maven-plugin + 1.0-alpha-6 + true + + Trygve Laugstol + + + target/appassembler + root + + **/*.bat + + + + io.trygvis.appsh.examples:app-a-web:war + root/wars/app-a-web.war + + + + + + + diff --git a/examples/app-a-bundle/src/main/unix/files/root/etc/booter.properties b/examples/app-a-bundle/src/main/unix/files/root/etc/booter.properties new file mode 100644 index 0000000..8c36e9c --- /dev/null +++ b/examples/app-a-bundle/src/main/unix/files/root/etc/booter.properties @@ -0,0 +1,2 @@ +http.port=3001 +context./=wars/app-a-web.war diff --git a/examples/app-a-bundle/src/main/unix/files/scripts/postinstall b/examples/app-a-bundle/src/main/unix/files/scripts/postinstall new file mode 100644 index 0000000..381dff7 --- /dev/null +++ b/examples/app-a-bundle/src/main/unix/files/scripts/postinstall @@ -0,0 +1,6 @@ +#!/bin/bash + +echo "pwd: " +pwd +echo "env:" +env diff --git a/examples/app-a-web/pom.xml b/examples/app-a-web/pom.xml new file mode 100644 index 0000000..4258644 --- /dev/null +++ b/examples/app-a-web/pom.xml @@ -0,0 +1,11 @@ + + 4.0.0 + + io.trygvis.appsh + appsh-parent + 1.0-SNAPSHOT + + io.trygvis.appsh.examples + app-a-web + war + diff --git a/examples/app-a-web/src/main/webapp/WEB-INF/web.xml b/examples/app-a-web/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000..50e8c1e --- /dev/null +++ b/examples/app-a-web/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,4 @@ + + + diff --git a/examples/app-a-web/src/main/webapp/index.jspx b/examples/app-a-web/src/main/webapp/index.jspx new file mode 100644 index 0000000..166ef4b --- /dev/null +++ b/examples/app-a-web/src/main/webapp/index.jspx @@ -0,0 +1,10 @@ + + + + + Hello World! + + +

Hello World!

+ + diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..fc0bb40 --- /dev/null +++ b/pom.xml @@ -0,0 +1,36 @@ + + 4.0.0 + io.trygvis.appsh + appsh-parent + 1.0-SNAPSHOT + pom + + 3.0.0 + + + 8.1.4.v20120524 + 1.6 + 1.6 + UTF-8 + + + + trygvis.io-snapshots + dav:http://repo.trygvis.io/snapshots + + + + + + org.apache.maven.wagon + wagon-webdav-jackrabbit + 2.2 + + + + + booter-jetty8 + examples/app-a-bundle + examples/app-a-web + + -- cgit v1.2.3