jubilee 2.1.0.rc1-java → 3.0.0.beta2-java

data/examples/client/vertxbus.js

@@ -1,17 +1,17 @@
 /*
- * Copyright 2011-2012 the original author or authors.
+ *   Copyright (c) 2011-2015 The original author or authors
+ *   ------------------------------------------------------
+ *   All rights reserved. This program and the accompanying materials
+ *   are made available under the terms of the Eclipse Public License v1.0
+ *   and Apache License v2.0 which accompanies this distribution.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *       The Eclipse Public License is available at
+ *       http://www.eclipse.org/legal/epl-v10.html
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *       The Apache License v2.0 is available at
+ *       http://www.opensource.org/licenses/apache2.0.php
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *   You may elect to redistribute this code under either of these licenses.
  */
 
 var vertx = vertx || {};
@@ -35,31 +35,26 @@ var vertx = vertx || {};
     var handlerMap = {};
     var replyHandlers = {};
     var state = vertx.EventBus.CONNECTING;
-    var sessionID = null;
     var pingTimerID = null;
+    var pingInterval = null;
+    if (options) {
+      pingInterval = options['vertxbus_ping_interval'];
+    }
+    if (!pingInterval) {
+      pingInterval = 5000;
+    }
   
     that.onopen = null;
     that.onclose = null;
+    that.onerror = null;
 
-    that.login = function(username, password, replyHandler) {
-      sendOrPub("send", 'vertx.basicauthmanager.login', {username: username, password: password}, function(reply) {
-        if (reply.status === 'ok') {
-          that.sessionID = reply.sessionID;
-        }
-        if (replyHandler) {
-          delete reply.sessionID;
-          replyHandler(reply)
-        }
-      });
-    }
-  
-    that.send = function(address, message, replyHandler) {
-      sendOrPub("send", address, message, replyHandler)
-    }
+    that.send = function(address, message, replyHandler, failureHandler) {
+      sendOrPub("send", address, message, replyHandler, failureHandler)
+    };
   
-    that.publish = function(address, message, replyHandler) {
-      sendOrPub("publish", address, message, replyHandler)
-    }
+    that.publish = function(address, message) {
+      sendOrPub("publish", address, message, null)
+    };
   
     that.registerHandler = function(address, handler) {
       checkSpecified("address", 'string', address);
@@ -76,7 +71,7 @@ var vertx = vertx || {};
       } else {
         handlers[handlers.length] = handler;
       }
-    }
+    };
   
     that.unregisterHandler = function(address, handler) {
       checkSpecified("address", 'string', address);
@@ -95,23 +90,22 @@ var vertx = vertx || {};
           delete handlerMap[address];
         }
       }
-    }
+    };
   
     that.close = function() {
       checkOpen();
-      if (pingTimerID) clearInterval(pingTimerID);
       state = vertx.EventBus.CLOSING;
       sockJSConn.close();
-    }
+    };
   
     that.readyState = function() {
       return state;
-    }
+    };
   
     sockJSConn.onopen = function() {
-      // Send the first ping then send a ping every 5 seconds
+      // Send the first ping then send a ping every pingInterval milliseconds
       sendPing();
-      pingTimerID = setInterval(sendPing, 5000);
+      pingTimerID = setInterval(sendPing, pingInterval);
       state = vertx.EventBus.OPEN;
       if (that.onopen) {
         that.onopen();
@@ -120,6 +114,7 @@ var vertx = vertx || {};
   
     sockJSConn.onclose = function() {
       state = vertx.EventBus.CLOSED;
+      if (pingTimerID) clearInterval(pingTimerID);
       if (that.onclose) {
         that.onclose();
       }
@@ -128,6 +123,15 @@ var vertx = vertx || {};
     sockJSConn.onmessage = function(e) {
       var msg = e.data;
       var json = JSON.parse(msg);
+      var type = json.type;
+      if (type === 'err') {
+        if (that.onerror) {
+          that.onerror(json.body);
+        } else {
+          console.error("Error received on connection: " + json.body);
+        }
+        return;
+      }
       var body = json.body;
       var replyAddress = json.replyAddress;
       var address = json.address;
@@ -148,35 +152,43 @@ var vertx = vertx || {};
         }
       } else {
         // Might be a reply message
-        var handler = replyHandlers[address];
-        if (handler) {
+        handlers = replyHandlers[address];
+        if (handlers) {
           delete replyHandlers[address];
-          handler(body, replyHandler);
+          var handler = handlers.replyHandler;
+          if (body) {
+            handler(body, replyHandler);
+          } else if (typeof json.failureCode != 'undefined') {
+            // Check for failure
+            var failure = { failureCode: json.failureCode, failureType: json.failureType, message: json.message };
+            var failureHandler = handlers.failureHandler;
+            if (failureHandler) {
+              failureHandler(failure)
+            }
+          }
         }
       }
-    }
+    };
 
     function sendPing() {
       var msg = {
         type: "ping"
-      }
+      };
       sockJSConn.send(JSON.stringify(msg));
     }
   
-    function sendOrPub(sendOrPub, address, message, replyHandler) {
+    function sendOrPub(sendOrPub, address, message, replyHandler, failureHandler) {
       checkSpecified("address", 'string', address);
       checkSpecified("replyHandler", 'function', replyHandler, true);
+      checkSpecified("failureHandler", 'function', failureHandler, true);
       checkOpen();
       var envelope = { type : sendOrPub,
                        address: address,
                        body: message };
-      if (that.sessionID) {
-        envelope.sessionID = that.sessionID;
-      }
-      if (replyHandler) {
+      if (replyHandler || failureHandler) {
         var replyAddress = makeUUID();
         envelope.replyAddress = replyAddress;
-        replyHandlers[replyAddress] = replyHandler;
+        replyHandlers[replyAddress] = { replyHandler: replyHandler, failureHandler: failureHandler };
       }
       var str = JSON.stringify(envelope);
       sockJSConn.send(str);
@@ -204,7 +216,7 @@ var vertx = vertx || {};
     function makeUUID(){return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx"
         .replace(/[xy]/g,function(a,b){return b=Math.random()*16,(a=="y"?b&3|8:b|0).toString(16)})}
   
-  }
+  };
   
   vertx.EventBus.CONNECTING = 0;
   vertx.EventBus.OPEN = 1;

data/jubilee.gemspec

@@ -2,16 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: jubilee 2.1.0.beta java lib
+# stub: jubilee 3.0.0.beta2 java lib
 
 Gem::Specification.new do |s|
   s.name = "jubilee"
-  s.version = "2.1.0.beta"
+  s.version = "3.0.0.beta2"
   s.platform = "java"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Isaiah Peng"]
-  s.date = "2014-07-24"
+  s.date = "2016-04-02"
   s.description = "Jubilee is a rack server for JRuby built upon the high performance Vertx platform. It provides the best features of Vertx such as EventBus, SharedData, and clustering."
   s.email = "issaria@gmail.com"
   s.executables = ["jubilee", "jubilee_d"]
@@ -47,53 +48,34 @@ Gem::Specification.new do |s|
     "examples/client/vertxbus.js",
     "examples/jubilee.conf.rb",
     "examples/keystore.jks",
-    "jars/hazelcast-3.2.3.jar",
-    "jars/jackson-annotations-2.2.2.jar",
-    "jars/jackson-core-2.2.2.jar",
-    "jars/jackson-databind-2.2.2.jar",
-    "jars/netty-all-4.0.20.Final.jar",
-    "jars/vertx-core-2.1.1.jar",
-    "jars/vertx-hazelcast-2.1.1.jar",
-    "jars/vertx-platform-2.1.1.jar",
-    "java/resources/META-INF/services/org.vertx.java.core.spi.cluster.ClusterManagerFactory",
-    "java/resources/default-cluster.xml",
-    "java/src/jubilee/JubileeService.java",
-    "java/src/org/jruby/jubilee/Const.java",
-    "java/src/org/jruby/jubilee/JubileeVerticle.java",
-    "java/src/org/jruby/jubilee/RackApplication.java",
-    "java/src/org/jruby/jubilee/RackEnvironment.java",
-    "java/src/org/jruby/jubilee/RackEnvironmentHash.java",
-    "java/src/org/jruby/jubilee/RackInput.java",
-    "java/src/org/jruby/jubilee/RackResponse.java",
-    "java/src/org/jruby/jubilee/RubyCallable.java",
-    "java/src/org/jruby/jubilee/RubyChannel.java",
-    "java/src/org/jruby/jubilee/RubyHttpServerResponse.java",
-    "java/src/org/jruby/jubilee/RubyNetSocket.java",
-    "java/src/org/jruby/jubilee/RubyPlatformManager.java",
-    "java/src/org/jruby/jubilee/impl/RubyIORackInput.java",
-    "java/src/org/jruby/jubilee/impl/RubyNullIO.java",
-    "java/src/org/jruby/jubilee/utils/RubyHelper.java",
-    "java/src/org/jruby/jubilee/vertx/JubileeVertx.java",
+    "examples/shims_example/log/development.log",
+    "jars/hazelcast-3.5.2.jar",
+    "jars/jackson-annotations-2.6.0.jar",
+    "jars/jackson-core-2.6.1.jar",
+    "jars/jackson-databind-2.6.1.jar",
+    "jars/netty-buffer-4.0.33.Final.jar",
+    "jars/netty-codec-4.0.33.Final.jar",
+    "jars/netty-codec-http-4.0.33.Final.jar",
+    "jars/netty-common-4.0.33.Final.jar",
+    "jars/netty-handler-4.0.33.Final.jar",
+    "jars/netty-transport-4.0.33.Final.jar",
+    "jars/vertx-auth-common-3.2.1.jar",
+    "jars/vertx-core-3.2.1.jar",
+    "jars/vertx-hazelcast-3.2.1.jar",
+    "jars/vertx-lang-ruby-3.2.1.jar",
+    "jars/vertx-web-3.2.1.jar",
     "jubilee.gemspec",
     "lib/jubilee.rb",
     "lib/jubilee/application.rb",
     "lib/jubilee/cli.rb",
     "lib/jubilee/configuration.rb",
     "lib/jubilee/const.rb",
+    "lib/jubilee/jubilee.jar",
     "lib/jubilee/response.rb",
     "lib/jubilee/server.rb",
     "lib/jubilee/version.rb",
     "lib/rack/handler/jubilee.rb",
-    "lib/vertx.rb",
-    "lib/vertx/README.md",
-    "lib/vertx/buffer.rb",
-    "lib/vertx/event_bus.rb",
-    "lib/vertx/http.rb",
-    "lib/vertx/shared_data.rb",
-    "lib/vertx/ssl_support.rb",
-    "lib/vertx/streams.rb",
-    "lib/vertx/tcp_support.rb",
-    "lib/vertx/wrapped_handler.rb",
+    "pom.xml",
     "spec/apps/rack/basic/config.ru",
     "spec/apps/rails4/basic/.gitignore",
     "spec/apps/rails4/basic/Gemfile",
@@ -168,6 +150,23 @@ Gem::Specification.new do |s|
     "spec/integration/basic_rails4_spec.rb",
     "spec/integration/basic_sinatra_spec.rb",
     "spec/spec_helper.rb",
+    "src/main/java/jubilee/JubileeService.java",
+    "src/main/java/org/jruby/jubilee/Const.java",
+    "src/main/java/org/jruby/jubilee/JubileeVerticle.java",
+    "src/main/java/org/jruby/jubilee/RackApplication.java",
+    "src/main/java/org/jruby/jubilee/RackEnvironment.java",
+    "src/main/java/org/jruby/jubilee/RackEnvironmentHash.java",
+    "src/main/java/org/jruby/jubilee/RackInput.java",
+    "src/main/java/org/jruby/jubilee/RackResponse.java",
+    "src/main/java/org/jruby/jubilee/RubyHttpServerResponse.java",
+    "src/main/java/org/jruby/jubilee/RubyNetSocket.java",
+    "src/main/java/org/jruby/jubilee/RubyPlatformManager.java",
+    "src/main/java/org/jruby/jubilee/impl/RubyIORackInput.java",
+    "src/main/java/org/jruby/jubilee/impl/RubyNullIO.java",
+    "src/main/java/org/jruby/jubilee/utils/RubyHelper.java",
+    "src/main/java/org/jruby/jubilee/vertx/JubileeVertx.java",
+    "src/main/resources/META-INF/services/org.vertx.java.core.spi.cluster.ClusterManagerFactory",
+    "src/main/resources/default-cluster.xml",
     "test/.ruby-version",
     "test/apps/app.rb",
     "test/apps/checker.ru",
@@ -199,8 +198,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://isaiah.github.io/jubilee"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.1.9"
+  s.rubygems_version = "2.4.8"
   s.summary = "More than a server for rack applications."
 
   if s.respond_to? :specification_version then

data/lib/jubilee.rb

@@ -1,5 +1,6 @@
-# this is only used when it's running as a rubygem
-Dir[File.expand_path("../../jars/*.jar", __FILE__)].each{|jar| require jar}
+Dir.glob(File.expand_path("../../jars/*.jar", __FILE__)) do |jar|
+  require jar
+end
 
 require 'jubilee/jubilee.jar'
 require 'rack'
@@ -10,6 +11,10 @@ require 'jubilee/application'
 require 'jubilee/configuration'
 require 'jubilee/response'
 require 'rack/handler/jubilee'
+require 'vertx/vertx'
 
 module Jubilee
+  def self.vertx
+    @vertx ||= Vertx::Vertx.new(org.jruby.jubilee.vertx.JubileeVertx.vertx)
+  end
 end

data/lib/jubilee/cli.rb

@@ -14,8 +14,8 @@ module Jubilee
     end
 
     def test_java_version!(version)
-      if version[0..2] < "1.7"
-        puts("Error: Jubilee requires JDK 1.7.0 or later. You can use the official Oracle distribution or the OpenJDK version.")
+      if version[0..2] < "1.8"
+        puts("Error: Jubilee requires JDK 1.8.0 or later. You can use the official Oracle distribution or the OpenJDK version.")
         exit 1
       end
     end
@@ -45,8 +45,8 @@ module Jubilee
         end
         thread = Thread.current
         Signal.trap("INT") do
-          server.stop
           puts "Jubilee is shutting down gracefully..."
+          server.stop
           thread.wakeup
         end
         puts "Jubilee is initializing..."
@@ -129,7 +129,7 @@ module Jubilee
         end
 
         o.on "-v", "--version", "Print the version information" do
-          puts "jubilee version #{Jubilee::Version::STRING} on Vert.x 2.1.2"
+          puts "jubilee version #{Jubilee::Version::STRING} on Vert.x 3.0.0-SNAPSHOT"
           exit 0
         end
       end

data/lib/jubilee/response.rb

@@ -11,7 +11,7 @@ module Jubilee
       @chunked                 = false
       @hijack                  = nil
       if @body.kind_of? Array and @body.size == 1
-        @content_length = @body[0].bytesize
+        @content_length = @body[0].nil? ? 0 : @body[0].bytesize
       end
     end
 

data/lib/jubilee/version.rb

@@ -1,9 +1,9 @@
 module Jubilee
   module Version
-    MAJOR = 2
-    MINOR = 1
+    MAJOR = 3
+    MINOR = 0
     PATCH = 0
-    BUILD = "rc1"
+    BUILD = "beta2"
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
   end

data/pom.xml

@@ -6,7 +6,7 @@
   <groupId>org.jruby.jubilee</groupId>
   <artifactId>mod-rack</artifactId>
   <packaging>jar</packaging>
-  <version>0.1.3-SNAPSHOT</version>
+  <version>3.0.0-SNAPSHOT</version>
   <name>Project - mod-rack</name>
   <url>http://maven.apache.org</url>
 
@@ -36,10 +36,9 @@
     <mods.directory>target/mods</mods.directory>
 
     <!--Dependency versions-->
-    <vertx.version>2.1.2</vertx.version>
-    <lang-jruby.version>2.1.0-final</lang-jruby.version>
+    <vertx.version>3.2.1</vertx.version>
     <vertx.testtools.version>2.0.3-final</vertx.testtools.version>
-    <junit.version>4.11</junit.version>
+    <junit.version>4.12</junit.version>
 
     <!--Plugin versions-->
     <maven.compiler.plugin.version>3.0</maven.compiler.plugin.version>
@@ -65,13 +64,6 @@
       <url>https://oss.sonatype.org/content/repositories/snapshots</url>
     </repository>
   </repositories>
-  <distributionManagement>
-    <repository>
-      <id>bintray-isaiah-maven-mod-rack</id>
-      <name>isaiah-maven-mod-rack</name>
-      <url>https://api.bintray.com/maven/isaiah/maven/mod-rack</url>
-    </repository>
-  </distributionManagement>
   <dependencies>
     <!--Vertx provided dependencies-->
     <dependency>
@@ -80,12 +72,6 @@
       <version>${vertx.version}</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>io.vertx</groupId>
-      <artifactId>vertx-platform</artifactId>
-      <version>${vertx.version}</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>io.vertx</groupId>
       <artifactId>vertx-hazelcast</artifactId>
@@ -94,16 +80,14 @@
     </dependency>
     <dependency>
       <groupId>io.vertx</groupId>
-      <artifactId>lang-jruby</artifactId>
-      <version>${lang-jruby.version}</version>
+      <artifactId>vertx-lang-ruby</artifactId>
+      <version>${vertx.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>io.vertx</groupId>
-      <artifactId>lang-jruby</artifactId>
-      <version>${lang-jruby.version}</version>
-      <type>zip</type>
-      <classifier>mod</classifier>
+      <artifactId>vertx-web</artifactId>
+      <version>${vertx.version}</version>
       <scope>compile</scope>
     </dependency>
     <!--Test dependencies-->
@@ -122,7 +106,7 @@
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby-complete</artifactId>
-      <version>1.7.13</version>
+      <version>9.0.5.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -140,57 +124,14 @@
 
   <build>
     <plugins>
-
-      <!-- The vert.x Maven plugin -->
-      <plugin>
-        <groupId>io.vertx</groupId>
-        <artifactId>vertx-maven-plugin</artifactId>
-        <version>${maven.vertx.plugin.version}</version>
-        <!--
-        You can specify extra config to the plugin as required here
-        <configuration>
-           <configFile>/path/to/MyVerticle.conf</configFile>
-           <instances>1</instances>
-           <classpath>src/main/resources/:src/test/resources/:target/classes/:target/test-classes/</classpath>
-        </configuration>
-        -->
-        <!-- Make sure that the plugin uses the vert.x versions from this pom.xml not from its own pom.xml -->
-        <dependencies>
-          <dependency>
-            <groupId>io.vertx</groupId>
-            <artifactId>vertx-platform</artifactId>
-            <version>${vertx.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>io.vertx</groupId>
-            <artifactId>vertx-core</artifactId>
-            <version>${vertx.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>io.vertx</groupId>
-            <artifactId>vertx-hazelcast</artifactId>
-            <version>${vertx.version}</version>
-          </dependency>
-        </dependencies>
-        <executions>
-          <execution>
-            <id>PullInDeps</id>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>pullInDeps</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
       <!-- Other plugins required by the build -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <version>${maven.compiler.plugin.version}</version>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>1.8</source>
+          <target>1.8</target>
         </configuration>
       </plugin>
       <plugin>
@@ -312,23 +253,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/mod.xml</descriptor>
-          </descriptors>
-        </configuration>
-        <executions>
-          <execution>
-            <id>assemble</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
   <reporting>
@@ -338,14 +262,6 @@
         <artifactId>maven-surefire-report-plugin</artifactId>
         <version>${maven.surefire.report.plugin.version}</version>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>${maven.javadoc.plugin.version}</version>
-        <configuration>
-          <aggregate>true</aggregate>
-        </configuration>
-      </plugin>
     </plugins>
   </reporting>
 </project>