rename scm-server-util to scm-server-api and added scm-server-jetty

pom.xml

@@ -12,7 +12,8 @@
   <modules>
     <module>scm-core</module>
     <module>scm-cli</module>
-    <module>scm-server-util</module>
+    <module>scm-server-api</module>
+    <module>scm-server-jetty</module>
     <module>plugins</module>
     <module>scm-agent</module>
     <module>scm-webapp</module>
@@ -32,7 +33,6 @@
       <url>http://guiceyfruit.googlecode.com/svn/repo/releases</url>
     </repository>
 
-
   </repositories>
 
   <dependencies>

scm-core/src/main/java/sonia/scm/util/ChecksumUtil.java

@@ -0,0 +1,136 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+
+
+package sonia.scm.util;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+public class ChecksumUtil
+{
+
+  /** Field description */
+  private static final String DIGEST_TYPE = "SHA-1";
+
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param in
+   *
+   * @return
+   *
+   * @throws IOException
+   */
+  public static String createChecksum(InputStream in) throws IOException
+  {
+    MessageDigest digest = null;
+
+    try
+    {
+      byte[] buffer = new byte[1024];
+
+      digest = getDigest();
+
+      int numRead = 0;
+
+      do
+      {
+        numRead = in.read(buffer);
+
+        if (numRead > 0)
+        {
+          digest.update(buffer, 0, numRead);
+        }
+      }
+      while (numRead != -1);
+    }
+    finally
+    {
+      if (in != null)
+      {
+        in.close();
+      }
+    }
+
+    byte[] b = digest.digest();
+
+    return toHexString(b);
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param file
+   *
+   * @return
+   *
+   * @throws IOException
+   */
+  public static String createChecksum(File file) throws IOException
+  {
+    return createChecksum(new FileInputStream(file));
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param byteArray
+   *
+   * @return
+   */
+  private static String toHexString(byte[] byteArray)
+  {
+    StringBuilder buffer = new StringBuilder();
+
+    for (byte b : byteArray)
+    {
+      buffer.append(Integer.toHexString(b));
+    }
+
+    return buffer.toString();
+  }
+
+  //~--- get methods ----------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  private static MessageDigest getDigest()
+  {
+    MessageDigest digest = null;
+
+    try
+    {
+      digest = MessageDigest.getInstance(DIGEST_TYPE);
+    }
+    catch (NoSuchAlgorithmException ex)
+    {
+      throw new RuntimeException("no such digest");
+    }
+
+    return digest;
+  }
+}

scm-core/src/main/java/sonia/scm/util/Util.java

@@ -12,6 +12,8 @@ package sonia.scm.util;
 import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 
 import java.util.Collection;
 import java.util.logging.Level;
@@ -50,6 +52,25 @@ public class Util
     }
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @param in
+   * @param out
+   *
+   * @throws IOException
+   */
+  public static void copy(InputStream in, OutputStream out) throws IOException
+  {
+    byte[] buffer = new byte[0xFFFF];
+
+    for (int len; (len = in.read(buffer)) != -1; )
+    {
+      out.write(buffer, 0, len);
+    }
+  }
+
   /**
    *   Method description
    *

scm-server-api/pom.xml

@@ -10,13 +10,19 @@
     <version>1.0-SNAPSHOT</version>
   </parent>
 
-  <groupId>sonia.scm.server</groupId>
-  <artifactId>scm-server-util</artifactId>
+  <groupId>sonia.scm</groupId>
+  <artifactId>scm-server-api</artifactId>
   <version>1.0-SNAPSHOT</version>
-  <name>scm-server-util</name>
+  <name>scm-server-api</name>
 
   <dependencies>
 
+    <dependency>
+      <groupId>sonia.scm</groupId>
+      <artifactId>scm-core</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+
     <dependency>
       <groupId>sonia.scm</groupId>
       <artifactId>scm-cli</artifactId>

scm-server-api/src/main/java/sonia/scm/server/ApplicationInformation.java

@@ -0,0 +1,100 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+
+
+package sonia.scm.server;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+@XmlRootElement(name = "app-info")
+public class ApplicationInformation
+{
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  public String getAppName()
+  {
+    return appName;
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  public String getName()
+  {
+    return name;
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  public String getVersion()
+  {
+    return version;
+  }
+
+  //~--- set methods ----------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param appName
+   */
+  public void setAppName(String appName)
+  {
+    this.appName = appName;
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param name
+   */
+  public void setName(String name)
+  {
+    this.name = name;
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param version
+   */
+  public void setVersion(String version)
+  {
+    this.version = version;
+  }
+
+  //~--- fields ---------------------------------------------------------------
+
+  /** Field description */
+  private String appName;
+
+  /** Field description */
+  private String name;
+
+  /** Field description */
+  private String version;
+}

scm-server-api/src/main/java/sonia/scm/server/Server.java

@@ -0,0 +1,69 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+
+
+package sonia.scm.server;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+public interface Server
+{
+
+  /**
+   * Method description
+   *
+   *
+   * @param listener
+   */
+  public void addListener(ServerListener listener);
+
+  /**
+   * Method description
+   *
+   *
+   * @param listener
+   */
+  public void removeListener(ServerListener listener);
+
+  /**
+   * Method description
+   *
+   *
+   * @param config
+   * @param webapp
+   *
+   * @throws IOException
+   * @throws ServerException
+   */
+  public void start(ServerConfig config, File webapp)
+          throws ServerException, IOException;
+
+  /**
+   * Method description
+   *
+   *
+   * @throws IOException
+   * @throws ServerException
+   */
+  public void stop() throws ServerException, IOException;
+
+  //~--- get methods ----------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  public boolean isRunning();
+}

scm-server-api/src/main/java/sonia/scm/server/ServerAllreadyRunningException.java

@@ -0,0 +1,19 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+
+
+package sonia.scm.server;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+public class ServerAllreadyRunningException extends ServerException
+{
+
+  /** Field description */
+  private static final long serialVersionUID = 3816513762034851638L;
+}

scm-server-api/src/main/java/sonia/scm/server/ServerApplication.java

@@ -0,0 +1,145 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+
+
+package sonia.scm.server;
+
+//~--- non-JDK imports --------------------------------------------------------
+
+import sonia.scm.cli.CliException;
+import sonia.scm.cli.CliParser;
+import sonia.scm.cli.DefaultCliHelpBuilder;
+import sonia.scm.util.ServiceUtil;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.xml.bind.JAXB;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+public class ServerApplication
+{
+
+  /** Field description */
+  public static final String APPINFO = "/app-info.xml";
+
+  /** Field description */
+  public static final int RETURNCODE_CLI_ERROR = 2;
+
+  /** Field description */
+  public static final int RETURNCODE_MISSING_APPINFO = 1;
+
+  /** Field description */
+  public static final int RETURNCODE_MISSING_SERVER_IMPLEMENTATION = 3;
+
+  /** Field description */
+  private static final Logger logger =
+    Logger.getLogger(ServerApplication.class.getName());
+
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param args
+   *
+   * @throws CliException
+   * @throws IOException
+   * @throws ServerException
+   */
+  public static void main(String[] args)
+          throws CliException, ServerException, IOException
+  {
+    InputStream input = ServerApplication.class.getResourceAsStream(APPINFO);
+
+    if (input == null)
+    {
+      System.err.println("could not find /app-info.xml in classpath");
+      System.exit(RETURNCODE_MISSING_APPINFO);
+    }
+
+    ApplicationInformation appInfo = JAXB.unmarshal(input,
+                                       ApplicationInformation.class);
+    ServerConfig config = new ServerConfig();
+    CliParser parser = new CliParser();
+
+    parser.parse(parser, args);
+
+    if (config.getShowHelp())
+    {
+      printHelp(appInfo, parser, config);
+    }
+    else
+    {
+      final Server server = ServiceUtil.getService(Server.class);
+
+      if (server == null)
+      {
+        System.err.println("could not find an server implementation");
+        System.exit(RETURNCODE_MISSING_SERVER_IMPLEMENTATION);
+      }
+
+      File webapp = new File("webapp", appInfo.getAppName());
+
+      server.start(config, webapp);
+      Runtime.getRuntime().addShutdownHook(new Thread(new Runnable()
+      {
+        @Override
+        public void run()
+        {
+          if (server.isRunning())
+          {
+            try
+            {
+              server.stop();
+            }
+            catch (ServerException ex)
+            {
+              logger.log(Level.SEVERE, null, ex);
+            }
+            catch (IOException ex)
+            {
+              logger.log(Level.SEVERE, null, ex);
+            }
+          }
+        }
+      }));
+    }
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param parser
+   * @param config
+   */
+  private static void printHelp(ApplicationInformation appInfo, CliParser parser, ServerConfig config)
+  {
+    String s = System.getProperty("line.separator");
+    StringBuilder prefix = new StringBuilder(appInfo.getName());
+    prefix.append(" ").append( appInfo.getVersion() );
+
+    prefix.append(s).append("usage: ");
+    prefix.append(s);
+
+    DefaultCliHelpBuilder helpBuilder =
+      new DefaultCliHelpBuilder(prefix.toString(), null);
+
+    System.err.println(parser.createHelp(helpBuilder, config));
+    System.exit(RETURNCODE_CLI_ERROR);
+  }
+}

scm-server-api/src/main/java/sonia/scm/server/ServerConfig.java

@@ -0,0 +1,152 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+
+
+package sonia.scm.server;
+
+//~--- non-JDK imports --------------------------------------------------------
+
+import sonia.scm.cli.Argument;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+public class ServerConfig
+{
+
+  /**
+   * Constructs ...
+   *
+   */
+  public ServerConfig() {}
+
+  //~--- get methods ----------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  public String getContextPath()
+  {
+    return contextPath;
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  public Integer getPort()
+  {
+    return port;
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  public String getResourcePath()
+  {
+    return resourcePath;
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  public Boolean getShowHelp()
+  {
+    return showHelp;
+  }
+
+  //~--- set methods ----------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param contextPath
+   */
+  public void setContextPath(String contextPath)
+  {
+    this.contextPath = contextPath;
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param port
+   */
+  public void setPort(Integer port)
+  {
+    this.port = port;
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param resourcePath
+   */
+  public void setResourcePath(String resourcePath)
+  {
+    this.resourcePath = resourcePath;
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param showHelp
+   */
+  public void setShowHelp(Boolean showHelp)
+  {
+    this.showHelp = showHelp;
+  }
+
+  //~--- fields ---------------------------------------------------------------
+
+  /** Field description */
+  @Argument(
+    value = "c",
+    longName = "context-path",
+    description = "The Context-Path of the Jab-WebApp"
+  )
+  private String contextPath = "/";
+
+  /** Field description */
+  @Argument(
+    value = "p",
+    longName = "port",
+    description = "The port for the listener"
+  )
+  private Integer port = Integer.valueOf(8080);
+
+  /** Field description */
+  @Argument(
+    value = "r",
+    longName = "resource-path",
+    description = "Path to the server resource directory"
+  )
+  private String resourcePath;
+
+  /** Field description */
+  @Argument(
+    value = "h",
+    longName = "help",
+    description = "Shows this help"
+  )
+  private Boolean showHelp = Boolean.FALSE;
+}

scm-server-api/src/main/java/sonia/scm/server/ServerException.java

@@ -0,0 +1,61 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+
+
+package sonia.scm.server;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+public class ServerException extends Exception
+{
+
+  /** Field description */
+  private static final long serialVersionUID = 2936673332739265774L;
+
+  //~--- constructors ---------------------------------------------------------
+
+  /**
+   * Constructs ...
+   *
+   */
+  public ServerException() {}
+
+  /**
+   * Constructs ...
+   *
+   *
+   * @param message
+   */
+  public ServerException(String message)
+  {
+    super(message);
+  }
+
+  /**
+   * Constructs ...
+   *
+   *
+   * @param cause
+   */
+  public ServerException(Throwable cause)
+  {
+    super(cause);
+  }
+
+  /**
+   * Constructs ...
+   *
+   *
+   * @param message
+   * @param cause
+   */
+  public ServerException(String message, Throwable cause)
+  {
+    super(message, cause);
+  }
+}

scm-server-api/src/main/java/sonia/scm/server/ServerListener.java

@@ -0,0 +1,36 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+
+
+package sonia.scm.server;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+public interface ServerListener
+{
+
+  /**
+   * Method description
+   *
+   *
+   * @param throwable
+   */
+  public void failed(Throwable throwable);
+
+  /**
+   * Method description
+   *
+   */
+  public void started();
+
+  /**
+   * Method description
+   *
+   */
+  public void stopped();
+}

scm-server-jetty/pom.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+  <modelVersion>4.0.0</modelVersion>
+  
+  <parent>
+    <artifactId>scm</artifactId>
+    <groupId>sonia.scm</groupId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <groupId>sonia.scm</groupId>
+  <artifactId>scm-server-jetty</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <name>scm-server-jetty</name>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>sonia.scm</groupId>
+      <artifactId>scm-server-api</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.eclipse.jetty.aggregate</groupId>
+      <artifactId>jetty-server</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.eclipse.jetty.aggregate</groupId>
+      <artifactId>jetty-webapp</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+
+  </dependencies>
+
+  <properties>
+    <jetty.version>7.1.6.v20100715</jetty.version>
+  </properties>
+
+</project>

scm-server-jetty/src/main/java/sonia/scm/server/jetty/JettyServer.java

@@ -0,0 +1,155 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+
+
+package sonia.scm.server.jetty;
+
+//~--- non-JDK imports --------------------------------------------------------
+
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.nio.SelectChannelConnector;
+import org.eclipse.jetty.webapp.WebAppContext;
+
+import sonia.scm.server.Server;
+import sonia.scm.server.ServerAllreadyRunningException;
+import sonia.scm.server.ServerConfig;
+import sonia.scm.server.ServerException;
+import sonia.scm.server.ServerListener;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import java.io.File;
+import java.io.IOException;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+public class JettyServer implements Server
+{
+
+  /**
+   * Method description
+   *
+   *
+   * @param listener
+   */
+  @Override
+  public void addListener(ServerListener listener)
+  {
+    listeners.add(listener);
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param listener
+   */
+  @Override
+  public void removeListener(ServerListener listener)
+  {
+    listeners.remove(listener);
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param config
+   * @param webapp
+   *
+   * @throws IOException
+   * @throws ServerException
+   */
+  @Override
+  public void start(ServerConfig config, File webapp)
+          throws ServerException, IOException
+  {
+    if (isRunning())
+    {
+      throw new ServerAllreadyRunningException();
+    }
+
+    server = new org.eclipse.jetty.server.Server();
+
+    Connector connector = new SelectChannelConnector();
+
+    for (ServerListener listener : listeners)
+    {
+      connector.addLifeCycleListener(new JettyServerListenerAdapter(listener));
+    }
+
+    connector.setPort(config.getPort());
+    server.addConnector(connector);
+
+    WebAppContext wac = new WebAppContext();
+
+    wac.setContextPath(config.getContextPath());
+    wac.setWar(webapp.getAbsolutePath());
+    wac.setExtractWAR(false);
+    server.setHandler(server);
+    server.setStopAtShutdown(true);
+
+    try
+    {
+      server.start();
+      server.join();
+    }
+    catch (Exception ex)
+    {
+      throw new ServerException(ex);
+    }
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @throws IOException
+   * @throws ServerException
+   */
+  @Override
+  public void stop() throws ServerException, IOException
+  {
+    if (isRunning())
+    {
+      try
+      {
+        server.stop();
+      }
+      catch (Exception ex)
+      {
+        throw new ServerException(ex);
+      }
+    }
+  }
+
+  //~--- get methods ----------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  @Override
+  public boolean isRunning()
+  {
+    return server != null;
+  }
+
+  //~--- fields ---------------------------------------------------------------
+
+  /** Field description */
+  private Set<ServerListener> listeners = new HashSet<ServerListener>();
+
+  /** Field description */
+  private org.eclipse.jetty.server.Server server;
+}

scm-server-jetty/src/main/java/sonia/scm/server/jetty/JettyServerListenerAdapter.java

@@ -0,0 +1,103 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+
+
+package sonia.scm.server.jetty;
+
+//~--- non-JDK imports --------------------------------------------------------
+
+import org.eclipse.jetty.util.component.LifeCycle;
+
+import sonia.scm.server.ServerListener;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+public class JettyServerListenerAdapter implements LifeCycle.Listener
+{
+
+  /**
+   * Constructs ...
+   *
+   *
+   * @param listener
+   */
+  public JettyServerListenerAdapter(ServerListener listener)
+  {
+    this.listener = listener;
+  }
+
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param lc
+   * @param throwable
+   */
+  @Override
+  public void lifeCycleFailure(LifeCycle lc, Throwable throwable)
+  {
+    listener.failed(throwable);
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param lc
+   */
+  @Override
+  public void lifeCycleStarted(LifeCycle lc)
+  {
+    listener.started();
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param lc
+   */
+  @Override
+  public void lifeCycleStarting(LifeCycle lc)
+  {
+
+    // do nothing
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param lc
+   */
+  @Override
+  public void lifeCycleStopped(LifeCycle lc)
+  {
+    listener.stopped();
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param lc
+   */
+  @Override
+  public void lifeCycleStopping(LifeCycle lc)
+  {
+
+    // do nothing
+  }
+
+  //~--- fields ---------------------------------------------------------------
+
+  /** Field description */
+  private ServerListener listener;
+}

scm-server-jetty/src/main/resources/META-INF/services/sonia.scm.server.Server

@@ -0,0 +1 @@
+sonia.scm.server.jetty.JettyServer