sinicum-runner 0.5.0.pre4 → 0.5.0.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a05c2535dfe8ca1e64b49c453c294f09936e896e
-  data.tar.gz: 03d1ce4591bf7202bbff103b5fe6194317810f3d
+  metadata.gz: f026d7de68669850ee53380614ce5a4a39df97b7
+  data.tar.gz: ee6c8554b03221666a2428b5fe04285ced1909f4
 SHA512:
-  metadata.gz: 4164b3e4ffbae6705f86d3bba69a24a7d19c6ddf357285a6c1e13084ce3ed4741ecf7afbc95f42e69378ecd190ece75d7b8917ed835894ab5bf896d799dd15ea
-  data.tar.gz: db60d95b9cfb04404763d486248a69535cac7bdd31220ff271644e7a2771d363d81941c46f753043e897cd66d6c31de7b663cce910df7f9efbdaed43f3320fb8
+  metadata.gz: 49aec1cfa5c762a97cc812eed59be427cb37c1a525e35b674bdc3fc1d907dc3c179640cdb728758aae635c22f8399b5aa8eee5e6eefc80539c234c8887671e81
+  data.tar.gz: 5ea75f329d53b77b89f6d4b80f3023635eeb61c67e73b82010451951dd8f90a2a78491a80a4a21f6d1029de44734e917ac7dac8c6b950c3d6bb78b6256e68dc7

data/lib/sinicum-runner/runner_cli.rb

@@ -149,7 +149,8 @@ module Sinicum
 
     class Options
       DEFAULT_ENVIRONMENT = "development"
-      attr_reader :port, :ajp_port, :context, :skip_build, :only_build, :hostname, :environment
+      attr_reader :port, :ajp_port, :context, :skip_build, :only_build, :hostname,
+                  :environment, :scheme, :proxyport
 
       def initialize(args = [])
         options = OptionParser.new do |opts|
@@ -165,6 +166,12 @@ module Sinicum
           opts.on("-n", "--hostname [HOSTNAME]", "application host name") do |hostname|
             @hostname = hostname
           end
+          opts.on("-S", "--https-scheme", "use HTTPS as connector scheme and 443 as proxy port") do |scheme|
+            @scheme = scheme
+          end
+          opts.on("-P", "--proxyport [PROXYPORT]", "tomcat connector proxy port") do |proxyport|
+            @proxyport = proxyport
+          end
           @skip_build = false
           opts.on("-s", "--skip-build", "skips the build of the Maven project") do |skip|
             @skip_build = true
@@ -205,6 +212,8 @@ module Sinicum
         args.concat(["-a", ajp_port]) if ajp_port
         args.concat(["-c", context]) if context
         args.concat(["-n", hostname]) if hostname
+        args.concat(["-S", scheme]) if scheme
+        args.concat(["-P", proxyport]) if proxyport
         args
       end
     end

data/lib/sinicum-runner/version.rb

@@ -1,5 +1,5 @@
 module Sinicum
   module Runner
-    VERSION = "0.5.0.pre4"
+    VERSION = "0.5.0.pre5"
   end
 end

data/pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>com.dievision.sinicum</groupId>
   <artifactId>sinicum-runner</artifactId>
-  <version>0.5.0.pre4</version>
+  <version>0.5.0.pre5</version>
   <packaging>jar</packaging>
 
   <name>sinicum-runner</name>

data/src/main/java/com/dievision/sinicum/runner/Configuration.java

@@ -18,6 +18,12 @@ public class Configuration {
     @Parameter(names = {"-n", "--hostname"}, description = "Tomcat Hostname")
     private String hostname;
 
+    @Parameter(names = {"-S", "--https-scheme"}, description = "Tomcat Connector HTTPS Scheme")
+    private boolean scheme;
+
+    @Parameter(names = {"-P", "--proxyport"}, description = "Tomcat Connector Proxy port")
+    private Integer proxyPort = 443;
+
     @Parameter(names = "--basedir", description = "Tomcat Base directory", required = true)
     private String baseDir;
 
@@ -47,4 +53,12 @@ public class Configuration {
     public String getHostname() {
         return hostname;
     }
+
+    public boolean isHttpsScheme() {
+        return scheme;
+    }
+
+    public Integer getProxyPort() {
+        return proxyPort;
+    }
 }

data/src/main/java/com/dievision/sinicum/runner/Main.java

@@ -14,6 +14,13 @@ public class Main {
         Tomcat tomcat = new Tomcat();
         tomcat.setPort(config.getHttpPort());
         tomcat.getConnector().setURIEncoding("UTF-8");
+        if (config.isHttpsScheme()) {
+            tomcat.getConnector().setScheme("https");
+            tomcat.getConnector().setProxyPort(443);
+        }
+        if (config.getProxyPort() != null) {
+            tomcat.getConnector().setProxyPort(config.getProxyPort());
+        }
         if (config.getAjpPort() != null) {
             Connector connector = new Connector("AJP/1.3");
             connector.setPort(config.getAjpPort());

data/src/test/java/com/dievision/sinicum/runner/ConfigurationTest.java

@@ -52,6 +52,22 @@ public class ConfigurationTest {
         assertEquals("ahostname", config.getHostname());
     }
 
+    @Test
+    public void testHttpsScheme() {
+        addArgs(new String[]{ "-S" });
+        new JCommander(config, argv);
+        assertEquals(true, config.isHttpsScheme());
+        assertEquals(443, config.getProxyPort().intValue());
+    }
+
+    @Test
+    public void testHttpsSchemeWithProxyPort() {
+        addArgs(new String[]{ "-S", "-P", "4242" });
+        new JCommander(config, argv);
+        assertEquals(true, config.isHttpsScheme());
+        assertEquals(4242, config.getProxyPort().intValue());
+    }
+
     @Test
     public void testBaseDirAppBase() {
         argv = new String[]{ "--basedir", "/path/to/dir", "--appbase", "/path/to/appbase"};

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinicum-runner
 version: !ruby/object:Gem::Version
-  version: 0.5.0.pre4
+  version: 0.5.0.pre5
 platform: ruby
 authors:
 - Patrik Metzmacher
@@ -9,34 +9,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - '>'
       - !ruby/object:Gem::Version
         version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - '>'
       - !ruby/object:Gem::Version
         version: '10.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 description: A gem to easily run Magnolia CMS in a Tomcat instance
@@ -47,29 +47,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/sinicum-runner
-- lib/java/lib/ecj-P20140317-1600.jar
-- lib/java/lib/hamcrest-core-1.3.jar
-- lib/java/lib/jcommander-1.30.jar
-- lib/java/lib/tomcat-annotations-api-7.0.54.jar
-- lib/java/lib/tomcat-api-7.0.54.jar
-- lib/java/lib/tomcat-catalina-7.0.54.jar
-- lib/java/lib/tomcat-el-api-7.0.54.jar
-- lib/java/lib/tomcat-embed-core-7.0.54.jar
-- lib/java/lib/tomcat-jasper-7.0.54.jar
-- lib/java/lib/tomcat-jasper-el-7.0.54.jar
-- lib/java/lib/tomcat-jsp-api-7.0.54.jar
-- lib/java/lib/tomcat-juli-7.0.54.jar
-- lib/java/lib/tomcat-servlet-api-7.0.54.jar
-- lib/java/lib/tomcat-util-7.0.54.jar
-- lib/java/sinicum-runner-0.5.0.pre4.jar
 - lib/sinicum-runner.rb
 - lib/sinicum-runner/runner_cli.rb
 - lib/sinicum-runner/version.rb
@@ -90,17 +75,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Simple embedded Tomcat server