warbler 2.0.0.pre3 → 2.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d31d6ea8e9517b3bec30f6ecc1d57e07abca5cc
-  data.tar.gz: b169c88d2f189e344e4b97202527425ef8c224a1
+  metadata.gz: b2801a442163c3d1ada84111848c7d9871e9939e
+  data.tar.gz: ae5fbcb30cb8086e3d730bddeed52bad02ea8c56
 SHA512:
-  metadata.gz: f078ebde72c8dfd391f5febca7a148380c4ec96e264a7b29a1d816684e4f393bf843fa19d7faf1c3e11d88713eb90e63867796cc7ab377861d7c86707f47e332
-  data.tar.gz: cf5cb23cca94d825f33d4f0760e61a8e6a4a4ace8c2ad667f2738a50989c081301e38521c34d69e5961fb3ed085f4168630545eeaa0cc9b6dc36372cb80c5188
+  metadata.gz: 676d710d120a35a2464cc2a506a6dfa5c53c2fd90e9439064ea0f19753497ae0161a4b12a986376404e10c9c63511d71d67f535846219ffdc3d92ba52327f8a7
+  data.tar.gz: c47699f10bcb5de09b4f09625f20697449f6677704852c249fbc715a2b2d11d9c7deae708e49521f1ed74432e9846bb238b4896309564254417bd716e99dce5c

data/ext/WarMain.java

@@ -39,17 +39,21 @@ import java.util.Set;
  * creates a URL classloader holding the jar, and loads and invokes the
  * <tt>main</tt> method of the main class mentioned in the properties.
  *
- * An example webserver.properties follows for Winstone. The <tt>args</tt>
+ * An example webserver.properties follows for Jetty. The <tt>args</tt>
  * property indicates the names and ordering of other properties to be used
  * as command-line arguments. The special tokens <tt>{{warfile}}</tt> and
  * <tt>{{webroot}}</tt> are substituted with the location of the .war file
  * being run and the temporary work directory, respectively.
  * <pre>
- * mainclass = winstone.Launcher
- * args = args0,args1,args2
- * args0 = --warfile={{warfile}}
- * args1 = --webroot={{webroot}}
- * args2 = --directoryListings=false
+ * mainclass = org.eclipse.jetty.runner.Runner
+ * args = args0,args1,args2,args3,args4
+ * props = jetty.home
+ * args0 = --port
+ * args1 = {{port}}
+ * args2 = --config
+ * args3 = {{config}}
+ * args4 = {{warfile}}
+ * jetty.home = {{webroot}}
  * </pre>
  *
  * System properties can also be set via webserver.properties. For example,
@@ -143,6 +147,7 @@ public class WarMain extends JarMain {
 
         String port = getSystemProperty("warbler.port", getENV("PORT"));
         port = port == null ? "8080" : port;
+        String host = getSystemProperty("warbler.host", "0.0.0.0");
         String webserverConfig = getSystemProperty("warbler.webserver_config", getENV("WARBLER_WEBSERVER_CONFIG"));
         String embeddedWebserverConfig = new URI("jar", entryPath(WEBSERVER_CONFIG), null).toURL().toString();
         webserverConfig = webserverConfig == null ? embeddedWebserverConfig : webserverConfig;
@@ -150,6 +155,7 @@ public class WarMain extends JarMain {
             String val = (String) entry.getValue();
             val = val.replace("{{warfile}}", archive).
                       replace("{{port}}", port).
+                      replace("{{host}}", host).
                       replace("{{config}}", webserverConfig).
                       replace("{{webroot}}", webroot.getAbsolutePath());
             entry.setValue(val);
@@ -180,17 +186,6 @@ public class WarMain extends JarMain {
         String[] newArgs = launchWebServerArguments(props);
         debug("invoking webserver with: " + Arrays.deepToString(newArgs));
         main.invoke(null, new Object[] { newArgs });
-
-        // the following code is specific to winstone. but a whole winstone module like the jetty module seemed
-        // excessive. if running under jetty (or anything other than wintstone) this will effectively do nothing.
-        Set<Thread> threads = Thread.getAllStackTraces().keySet();
-        for (Thread thread : threads) {
-            String name = thread.getName();
-            if (name.startsWith("LauncherControlThread")) {
-                debug("joining thread: " + name);
-                thread.join();
-            }
-        }
     }
 
     private String[] launchWebServerArguments(Properties props) {

data/lib/warbler/config.rb

@@ -167,8 +167,6 @@ module Warbler
     attr_accessor :webxml
 
     # Embedded webserver to use. Currently supported webservers are:
-    # * <tt>winstone</tt> (default) - Winstone 0.9.10 from sourceforge
-    # * <tt>jenkins-ci.winstone</tt> - Improved Winstone from Jenkins CI
     # * <tt>jetty</tt> - Embedded Jetty from Eclipse
     attr_accessor :webserver
 

data/lib/warbler/version.rb

@@ -6,5 +6,5 @@
 #++
 
 module Warbler
-  VERSION = "2.0.0.pre3"
+  VERSION = "2.0.0.rc1"
 end

data/lib/warbler/web_server.rb

@@ -86,33 +86,6 @@ module Warbler
     end
   end
 
-  class WinstoneServer < WebServer
-    def initialize
-      @artifact = Artifact.new(ENV["MAVEN_REPO"] || "http://repo2.maven.org/maven2",
-                               "net.sourceforge.winstone", "winstone-lite",
-                               ENV["WEBSERVER_VERSION"] || "0.9.10")
-    end
-
-    def add(jar)
-      super
-      jar.files["WEB-INF/webserver.properties"] = StringIO.new(<<-PROPS)
-mainclass = winstone.Launcher
-args = args0,args1,args2
-args0 = --warfile={{warfile}}
-args1 = --webroot={{webroot}}
-args2 = --directoryListings=false
-PROPS
-    end
-  end
-
-  class JenkinsWinstoneServer < WinstoneServer
-    def initialize
-      @artifact = Artifact.new("http://repo.jenkins-ci.org/public",
-                               "org.jenkins-ci", "winstone",
-                               ENV["WEBSERVER_VERSION"] || "0.9.10-jenkins-43")
-    end
-  end
-
   class JettyServer < WebServer
     def initialize
       @artifact = Artifact.new(ENV["MAVEN_REPO"] || "http://repo2.maven.org/maven2",
@@ -132,21 +105,21 @@ CONFIG
 
       jar.files["WEB-INF/webserver.properties"] = StringIO.new(<<-PROPS)
 mainclass = org.eclipse.jetty.runner.Runner
-args = args0,args1,args2,args3,args4
+args = args0,args1,args2,args3,args4,args5,args6
 props = jetty.home
-args0 = --port
-args1 = {{port}}
-args2 = --config
-args3 = {{config}}
-args4 = {{warfile}}
+args0 = --host
+args1 = {{host}}
+args2 = --port
+args3 = {{port}}
+args4 = --config
+args5 = {{config}}
+args6 = {{warfile}}
 jetty.home = {{webroot}}
 PROPS
     end
   end
 
   WEB_SERVERS = Hash.new { |hash,_| hash['jetty'] }
-  WEB_SERVERS['winstone'] = WinstoneServer.new
-  WEB_SERVERS['jenkins-ci.winstone'] = JenkinsWinstoneServer.new
   WEB_SERVERS['jetty'] = JettyServer.new
 
 end

data/spec/warbler/web_server_spec.rb

@@ -21,8 +21,8 @@ describe Warbler::WebServer::Artifact do
   end
 
   let(:sample_artifact) do
-    Warbler::WebServer::Artifact.new("http://repo.jenkins-ci.org/public",
-      "org.jenkins-ci", "winstone", "0.9.10-jenkins-43"
+    Warbler::WebServer::Artifact.new(
+      "http://repo2.maven.org/maven2", "org.eclipse.jetty", "jetty-runner", "9.2.9.v20150224"
     )
   end
 

data/warble.rb

@@ -143,8 +143,6 @@ Warbler::Config.new do |config|
 
   # Embedded webserver to use with the 'executable' feature. Currently supported
   # webservers are:
-  # * <tt>winstone</tt> (default) - Winstone 0.9.10 from sourceforge
-  # * <tt>jenkins-ci.winstone</tt> - Improved Winstone from Jenkins CI
   # * <tt>jetty</tt> - Embedded Jetty from Eclipse
   # config.webserver = 'jetty'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: warbler
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre3
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - Nick Sieger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-31 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement