openshifter 0.2 → 0.3

data/README.md

@@ -1,110 +1,10 @@
 ## OpenShifter
 
-Simple CLI tool to siplify the deployment of Rack-based applications using JRuby to OpenShift
+CLI tool to siplify the deployment of JRuby applications to OpenShift
 
 ## How to
 
-### Step 1
-
-Install openshifter
-
-	gem install openshifter
-
-### Step 2
-
-Create your application on OpenShift (JBoss) and clone your repository localy, then cd into the directory.
-
-### Step 3
-
-Now you setup your environment
-
-	openshifter-setup
-
-This step replaces .openshift folder contaning meta-data for your application.
-
-### Step 4
-
-Now you may modify configuration of your deployment. It is stored in .openshift/openshifter. It is ordinary YAML file. Possible options are
-
-    jruby: 1.6.6 # JRuby version you want to use
-    jrack: 1.1.3 # JRuby-Rack version used
-    install: vendor # Instalation method vendor/remote
-
-Vendor instalation method installs all libraries and gems in .openshift folder and are versioned with your application. Remote installation installed all libraries and gems on server in the time of deployment.
-
-If you decide to use remote installation method. You are done. For vendor installation method, please continue.
-
-### Step 5
-
-Downloads JRuby and JRuby-Rack to create runtime environment. Then Bundler is instaled locally for the application.
-
-    openshifter-download
-
-### Step 4
-
-At the setup time and whenever you add gems to your Gemfile, just run
-
-	openshifter-bundle
-
-gems will be venoder in .openshift folder and you have to add them to VCS.
-
-### Step 5
-
-Add, commit and push to openshift.
-
-## Upgrading
-
-### OpenShifter
-
-For remote install just run
-
-    openshifter-setup --upgrade
-
-for vendored install it's more complicated
-
-    openshifter-setup --upgrade
-    openshifter-download
-    openshifter-bundle
-
-**will be simplified in the future version**
-
-### JRuby
-
-For remote install, just modify .openshift/openshifter configuration.
-
-For vendor install modify .openshift/openshifter configuration and then run.
-
-    openshifter-download
-
-## Interface
-
-Setup the environment
-
-	openshifter-setup
-
-To upgrade openshifter
-
-    openshifter-setup --upgrade
-
-Download JRuby and environment libraries
-
-    openshifter-download
-
-Bundler wrapper
-
-	openshifter-bundle
-
-Gem wrapper
-
-	openshifter-gem
-
-JRuby wrapper
-
-	openshifter-ruby
-
-Clean up your environment
-
-	openshifter-clean
+[OpenShifter -> JRuby for OpenShift](http://blog.marekjelen.cz/article/openshifter-jruby-for-openshift)
 
 ## License
 

data/lib/openshifter/version.rb

@@ -1,3 +1,3 @@
 module OpenShifter
-	VERSION = '0.2' unless const_defined?(:VERSION)
+	VERSION = '0.3' unless const_defined?(:VERSION)
 end

data/templates/openshift/action_hooks/build

@@ -5,9 +5,18 @@ $stdout.sync = true
 require 'fileutils'
 require 'yaml'
 require 'digest'
+require 'erb'
+
+def start_cmd(cmd, prefix = '')
+  io = IO.popen(cmd)
+  io.each_line { |line| puts "#{prefix} #{line}"}
+  Process.wait(io.pid)
+end
 
 FileUtils.cd(ENV['OPENSHIFT_REPO_DIR'])
 
+# Common configuration
+
 data = YAML.load_file('.openshift/openshifter')
 data = {} unless data
 CONFIG = data
@@ -15,172 +24,210 @@ CONFIG = data
 CONFIG['jruby'] ||= '1.6.6'
 CONFIG['install'] ||= 'vendor'
 CONFIG['jrack'] ||= '1.1.3'
+CONFIG['torquebox'] ||= 614
+
+SYS = {}
+
+SYS[:root] = File.join(ENV['OPENSHIFT_REPO_DIR'], 'deployments')
+SYS[:target] = File.join(SYS[:root], 'application.war')
+SYS[:target_meta] = File.join(SYS[:target], 'META-INF')
+SYS[:target_web] = File.join(SYS[:target], 'WEB-INF')
+
+# Configuration per installation method
+
+def setup_remote
+  SYS[:gems] = File.join(ENV['OPENSHIFT_DATA_DIR'], 'jruby', 'gems')
+  SYS[:libs] = File.join(ENV['OPENSHIFT_DATA_DIR'], 'jruby', 'libs')
+  SYS[:jruby] = File.join(SYS[:libs], "jruby-#{CONFIG['jruby']}.jar")
+  SYS[:jrack] = File.join(SYS[:libs], "jruby-rack-#{CONFIG['jrack']}.jar")
+  SYS[:gemfile_hash] = File.join(ENV['OPENSHIFT_DATA_DIR'], 'jruby', 'Gemfile.hash')
+end
+
+def setup_vendor
+  SYS[:gems] = File.expand_path('.openshift/gems')
+end
 
-ROOT=File.join(ENV['OPENSHIFT_REPO_DIR'], 'deployments')
-TARGET = File.join(ROOT, 'application.war')
-TARGET_META = File.join(TARGET, 'META-INF')
-TARGET_WEB = File.join(TARGET, 'WEB-INF')
-
-libs = File.join(ENV['OPENSHIFT_DATA_DIR'], 'jruby', 'libs')
-gems = case CONFIG['install']
-  when 'vendor'
-    File.expand_path('.openshift/gems')
-  when 'remote'
-    File.join(ENV['OPENSHIFT_DATA_DIR'], 'jruby', 'gems')
+def setup_torquebox
+  SYS[:torquebox] = File.join(ENV['OPENSHIFT_DATA_DIR'], 'jruby', 'torquebox', "modules-#{CONFIG['torquebox']}")
+  SYS[:torquebox_jruby] = File.join(ENV['OPENSHIFT_DATA_DIR'], 'jruby', 'torquebox', "jruby-#{CONFIG['jruby']}")
+  SYS[:gems] = File.join(ENV['OPENSHIFT_DATA_DIR'], 'jruby', 'torquebox', "gems")
+  SYS[:gemfile_hash] = File.join(ENV['OPENSHIFT_DATA_DIR'], 'jruby', 'torquebox', 'Gemfile.hash')
+  SYS[:libs] = File.join(ENV['OPENSHIFT_DATA_DIR'], 'jruby', 'libs')
+  SYS[:jrack] = File.join(SYS[:libs], "jruby-rack-#{CONFIG['jrack']}.jar")
 end
-jruby = File.join(libs, "jruby-#{CONFIG['jruby']}.jar")
-jrack = File.join(libs, "jruby-rack-#{CONFIG['jrack']}.jar")
-gemfile_hash = File.join(ENV['OPENSHIFT_DATA_DIR'], 'jruby', 'Gemfile.hash')
-ENV['GEM_PATH'] = ENV['GEM_HOME'] = gems
+
+# Configure particular method
+
+send("setup_#{CONFIG['install']}".to_sym)
+
+# Start creating environment
+
+ENV['GEM_PATH'] = ENV['GEM_HOME'] = SYS[:gems]
 
 puts '-> Cleaning target'
-FileUtils.rm_rf(ROOT)
+FileUtils.rm_rf(SYS[:root])
 
 puts '-> Creating target'
-FileUtils.mkdir_p(TARGET)
+FileUtils.mkdir_p(SYS[:target])
 
 puts '-> Public files'
-FileUtils.cp_r(Dir.glob('public/*'), TARGET)
+FileUtils.cp_r(Dir.glob('public/*'), SYS[:target])
 
 puts '-> META-INF'
-FileUtils.mkdir_p(TARGET_META)
+FileUtils.mkdir_p(SYS[:target_meta])
 
 puts '--> Manifest'
-File.open(File.join(TARGET_META, 'MANIFEST.MF'), 'w') do |file|
-    data = <<EOF
-Manifest-Version: 1.0
-Created-By: OpenShifter
-EOF
-    file.print(data)
-end
+FileUtils.cp(File.expand_path('../templates/MANIFEST.MF', __FILE__), File.join(SYS[:target_meta], 'MANIFEST.MF'))
 
 puts '--> init.rb'
-File.open(File.join(TARGET_META, 'init.rb'), 'w') do |file|
-    data = <<EOF
-ENV['GEM_HOME'] ||= '#{gems}'
-ENV['BUNDLE_GEMFILE'] = 'Gemfile'
-ENV['RACK_ENV'] = 'production'
-require 'psych.rb' # Hack for Ruby 1.6.6
-EOF
-    file.print(data)
-end
+initrb = ERB.new(File.read(File.expand_path('../templates/init.rb', __FILE__))).result(binding)
+File.open(File.join(SYS[:target_meta], 'init.rb'), 'w') { |file| file.print(initrb) }
 
 puts '-> WEB-INF'
-FileUtils.mkdir_p(TARGET_WEB)
+FileUtils.mkdir_p(SYS[:target_web])
 
 puts '--> Application data'
 app = Dir.glob('*')
 app.delete('.openshift')
 app.delete('public')
 app.delete('deployments')
-FileUtils.cp_r(app, TARGET_WEB)
+FileUtils.cp_r(app, SYS[:target_web])
 
 puts '--> Lib'
-FileUtils.mkdir_p(File.join(TARGET_WEB, 'lib'))
-
-puts '--> Copy runtime'
-case CONFIG['install']
-  when 'vendor'
-    FileUtils.cp(Dir.glob('.openshift/lib/*.jar'), File.join(TARGET_WEB, 'lib'))
-  when 'remote'
-    FileUtils.mkdir_p(libs)
-    FileUtils.mkdir_p(gems)
-    unless File.exists?(jruby)
-      Dir.glob(File.join(libs, "jruby-*")) do |file|
-        FileUtils.rm(file)
-      end
-      puts "---> Downloading jRuby #{CONFIG['jruby']}"
-      puts `curl -o #{jruby} "http://jruby.org.s3.amazonaws.com/downloads/#{CONFIG['jruby']}/jruby-complete-#{CONFIG['jruby']}.jar"`
-    end
-    unless File.exists?(jrack)
-      Dir.glob(File.join(libs, "jruby-rack-*")) do |file|
-        FileUtils.rm(file)
-      end
-      puts "---> Downloading jRuby-Rack #{CONFIG['jrack']}"
-      puts `curl -o #{jrack} "http://repository.codehaus.org/org/jruby/rack/jruby-rack/#{CONFIG['jrack']}/jruby-rack-#{CONFIG['jrack']}.jar"`
-    end
-    puts '---> Copying libraries'
-    FileUtils.cp(Dir.glob(File.join(libs, '*.jar')), File.join(TARGET_WEB, 'lib'))
-  else
-    puts '---> Unsupported installation.'
+FileUtils.mkdir_p(File.join(SYS[:target_web], 'lib'))
+
+# Installation method specific tasks
+
+def create_remote
+  puts '--> Copy runtime'
+  FileUtils.mkdir_p(SYS[:libs])
+  FileUtils.mkdir_p(SYS[:gems])
+
+  # Download JRuby if not present
+  unless File.exists?(SYS[:jruby])
+    Dir.glob(File.join(SYS[:libs], "jruby-*")) { |file| FileUtils.rm(file) }
+    puts "---> Downloading jRuby #{CONFIG['jruby']}"
+    puts `curl -o #{SYS[:jruby]} "http://jruby.org.s3.amazonaws.com/downloads/#{CONFIG['jruby']}/jruby-complete-#{CONFIG['jruby']}.jar"`
+  end
+  
+  # Download JRuby-Rack if not present
+  unless File.exists?(SYS[:jrack])
+    Dir.glob(File.join(SYS[:libs], "jruby-rack-*")) { |file| FileUtils.rm(file) }
+    puts "---> Downloading jRuby-Rack #{CONFIG['jrack']}"
+    puts `curl -o #{SYS[:jrack]} "http://repository.codehaus.org/org/jruby/rack/jruby-rack/#{CONFIG['jrack']}/jruby-rack-#{CONFIG['jrack']}.jar"`
+  end
+  
+  puts '---> Copying libraries'
+  FileUtils.cp(Dir.glob(File.join(SYS[:libs], '*.jar')), File.join(SYS[:target_web], 'lib'))
+  
+  puts '--> Gems'
+  
+  gemfile = Digest::SHA256.file('Gemfile').hexdigest
+  oldhash = File.exists?(SYS[:gemfile_hash]) ? File.read(SYS[:gemfile_hash]) : ''
+  
+  # Gemfile was changes since last deploy
+  unless gemfile == oldhash
+    puts '---> Cleaning gems'
+    FileUtils.rm_rf(SYS[:gems])
+    
+    puts '---> Installing Bundler'
+    start_cmd("java -jar #{SYS[:jruby]} -S gem install bundler --no-ri --no-rdoc")
+
+    puts "---> Bundling gems"
+    start_cmd("java -Xmx512m -Xss2048k -XX:+UseCompressedOops -jar #{SYS[:jruby]} -S bundle install")
+      
+    File.open(SYS[:gemfile_hash], 'w') { |file| file.print(gemfile) }
+  end
 end
 
-puts '--> Gems'
-case CONFIG['install']
-  when 'vendor'
-    # No actions needed
-  when 'remote'
-    gemfile = Digest::SHA256.file('Gemfile').hexdigest
-    oldhash = File.exists?(gemfile_hash) ? File.read(gemfile_hash) : ''
-    unless gemfile == oldhash
-      puts '---> Cleaning gems'
-      FileUtils.rm_rf(gems)
-      puts '---> Installing Bundler'
-      io = IO.popen("java -jar #{jruby} -S gem install bundler --no-ri --no-rdoc")
-      io.each_line { |line| puts "----> #{line}"}
-      Process.wait(io.pid)
-      puts "---> Bundling gems"
-      io = IO.popen("java -Xmx384m -Xss512k -XX:+UseCompressedOops -jar #{jruby} -S bundle install")
-      io.each_line { |line| puts "----> #{line}"}
-      Process.wait(io.pid)
-      File.open(gemfile_hash, 'w') { |file| file.print(gemfile) }
-    end
+def create_vendor
+  puts '--> Copy runtime'
+  FileUtils.cp(Dir.glob('.openshift/lib/*.jar'), File.join(SYS[:target_web], 'lib'))
+end
+
+def create_torquebox
+  puts '--> Install JRuby'
+  unless File.exists?(SYS[:torquebox_jruby])
+    Dir.glob(File.join(ENV['OPENSHIFT_DATA_DIR'], 'jruby', 'torquebox', "jruby-*")) { |file| FileUtils.rm_rf(file) }
+    FileUtils.mkdir_p(SYS[:torquebox_jruby])
+    puts `curl -o jruby.tar.gz "http://jruby.org.s3.amazonaws.com/downloads/#{CONFIG['jruby']}/jruby-bin-#{CONFIG['jruby']}.tar.gz"`
+    start_cmd("tar -xzf jruby.tar.gz -C #{File.expand_path('..', SYS[:torquebox_jruby])}")
+    start_cmd("rm jruby.tar.gz")
+    start_cmd("rm -rf #{SYS[:torquebox_jruby]}/share/ri/1.8/system/*")
+    FileUtils.rm(SYS[:gemfile_hash])
+
+    puts '---> Installing Bundler'
+    start_cmd("#{SYS[:torquebox_jruby]}/bin/jruby -S gem install bundler --no-ri --no-rdoc")
+  end
+
+  unless File.exists?(SYS[:jrack])
+    Dir.glob(File.join(SYS[:libs], "jruby-rack-*")) { |file| FileUtils.rm(file) }
+    puts "---> Downloading jRuby-Rack #{CONFIG['jrack']}"
+    puts `curl -o #{SYS[:jrack]} "http://repository.codehaus.org/org/jruby/rack/jruby-rack/#{CONFIG['jrack']}/jruby-rack-#{CONFIG['jrack']}.jar"`
+  end
+
+  puts '--> Gems'
+  
+  gemfile = Digest::SHA256.file('Gemfile').hexdigest
+  oldhash = File.exists?(SYS[:gemfile_hash]) ? File.read(SYS[:gemfile_hash]) : ''
+  
+  # Gemfile was changes since last deploy
+  unless gemfile == oldhash
+    puts '---> Cleaning gems'
+    FileUtils.rm_rf(SYS[:gems])
+    
+    puts "---> Bundling gems"
+    start_cmd("#{SYS[:torquebox_jruby]}/bin/jruby -S bundle install")
+      
+    File.open(SYS[:gemfile_hash], 'w') { |file| file.print(gemfile) }
+  end
+  
+  puts '--> Install Torquebox'
+  unless File.exists?(SYS[:torquebox])
+    Dir.glob(File.join(ENV['OPENSHIFT_DATA_DIR'], 'jruby', 'torquebox', "modules-*")) { |file| FileUtils.rm_rf(file) }
+    FileUtils.mkdir_p(SYS[:torquebox])
+    puts `curl -o #{SYS[:torquebox]}/torquebox-dist-modules.zip "http://repository-torquebox.forge.cloudbees.com/incremental/torquebox/#{CONFIG['torquebox']}/torquebox-dist-modules.zip"`
+    puts `unzip -d #{SYS[:torquebox]} #{SYS[:torquebox]}/torquebox-dist-modules.zip`
+    FileUtils.rm("#{SYS[:torquebox]}/torquebox-dist-modules.zip")
+
+    puts '---> Installing Torquebox gems'
+    start_cmd("#{SYS[:torquebox_jruby]}/bin/jruby -S gem install torquebox --pre --source http://torquebox.org/2x/builds/#{CONFIG['torquebox']}/gem-repo/")
+  end
+  
+  script_path = "#{ENV['OPENSHIFT_APP_DIR']}#{ENV['OPENSHIFT_APP_TYPE']}/bin/standalone.conf"
+  script = File.read(script_path)
+  jruby_home = "JAVA_OPTS=\"$JAVA_OPTS -Djruby.home=#{SYS[:torquebox_jruby]}\""
+  if match = /JAVA_OPTS=".+jruby\-(\d\.\d\.\d)"/.match(script)
+    script.sub!(match[0], jruby_home)
   else
-    puts '---> Unsupported installation.'
+    script += "\n"
+    script += jruby_home
+  end
+  FileUtils.mv(script_path, "#{script_path}.old")
+  File.open(script_path, 'w') { |file| file.print(script) }
+
+  puts "--> Setup Torquebox modules"
+  FileUtils.mkdir_p(".openshift/config/modules/org")
+  # FileUtils.ln_s(File.join(path, 'modules', 'org', 'torquebox'), ".openshift/config/modules/org/torquebox") # For newer version of Torquebox
+  FileUtils.ln_s(File.join(SYS[:torquebox], 'torquebox'), ".openshift/config/modules/org/torquebox")
+  FileUtils.cp(File.expand_path('../templates/standalone.xml', __FILE__), '.openshift/config/standalone.xml')
+
+  puts '--> Copying libraries'
+  FileUtils.cp(Dir.glob(File.join(SYS[:libs], '*.jar')), File.join(SYS[:target_web], 'lib'))
+
 end
 
+# Run the tasks
+
+send("create_#{CONFIG['install']}".to_sym)
+
+# Common tasks for setting Java thingies
+
 puts '--> jboss-web.xml'
-File.open(File.join(TARGET_WEB, 'jboss-web.xml'), 'w') do |file|
-    data = <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<jboss-web>
-    <context-root />
-</jboss-web>
-EOF
-    file.print(data)
-end
+FileUtils.cp(File.expand_path('../templates/jboss-web.xml', __FILE__), File.join(SYS[:target_web], 'jboss-web.xml'))
 
 puts '--> web.xml'
-File.open(File.join(TARGET_WEB, 'web.xml'), 'w') do |file|
-    data = <<EOF
-<!DOCTYPE web-app PUBLIC
-  "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-  "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-
-  <context-param>
-    <param-name>public.root</param-name>
-    <param-value>/</param-value>
-  </context-param>
-
-  <context-param>
-      <param-name>jruby.compat.version</param-name>
-      <param-value>1.9</param-value>
-  </context-param>
-
-  <context-param>
-    <param-name>rack.env</param-name>
-    <param-value>production</param-value>
-  </context-param>
-
-  <filter>
-    <filter-name>RackFilter</filter-name>
-    <filter-class>org.jruby.rack.RackFilter</filter-class>
-  </filter>
-
-  <filter-mapping>
-    <filter-name>RackFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-
-  <listener>
-    <listener-class>org.jruby.rack.RackServletContextListener</listener-class>
-  </listener>
-
-</web-app>
-EOF
-    file.print(data)
-end
+FileUtils.cp(File.expand_path('../templates/web.xml', __FILE__), File.join(SYS[:target_web], 'web.xml'))
 
 puts '-> Deployment marker'
-FileUtils.touch("#{TARGET}.dodeploy")
+FileUtils.touch("#{SYS[:target]}.dodeploy")

data/templates/openshift/action_hooks/templates/MANIFEST.MF

@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+Created-By: OpenShifter

data/templates/openshift/action_hooks/templates/init.rb

@@ -0,0 +1,4 @@
+ENV['GEM_HOME'] ||= "<%= ENV['GEM_HOME'] %>"
+ENV['BUNDLE_GEMFILE'] = 'Gemfile'
+ENV['RACK_ENV'] = 'production'
+require 'psych.rb' # Hack for Ruby 1.6.6

data/templates/openshift/action_hooks/templates/jboss-web.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-web>
+    <context-root />
+</jboss-web>

data/templates/openshift/action_hooks/templates/standalone.xml

@@ -0,0 +1,232 @@
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2011, Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags. See the copyright.txt file in the
+  ~ distribution for a full listing of individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+
+<server xmlns="urn:jboss:domain:1.0">
+
+    <extensions>
+        <extension module="org.jboss.as.clustering.infinispan"/>
+        <extension module="org.jboss.as.connector"/>
+        <extension module="org.jboss.as.deployment-scanner"/>
+        <extension module="org.jboss.as.ee"/>
+        <extension module="org.jboss.as.ejb3"/>
+        <extension module="org.jboss.as.jaxrs"/>
+        <extension module="org.jboss.as.jmx"/>
+        <extension module="org.jboss.as.jpa"/>
+        <extension module="org.jboss.as.logging"/>
+        <extension module="org.jboss.as.naming"/>
+        <extension module="org.jboss.as.sar"/>
+        <extension module="org.jboss.as.security"/>
+        <extension module="org.jboss.as.threads"/>
+        <extension module="org.jboss.as.transactions"/>
+        <extension module="org.jboss.as.web" />
+        <extension module="org.jboss.as.weld" />
+        <extension module='org.torquebox.bootstrap' />
+        <extension module='org.torquebox.core' />
+        <extension module='org.torquebox.cdi' />
+        <extension module='org.torquebox.jobs' />
+        <extension module='org.torquebox.security' />
+        <extension module='org.torquebox.services' />
+        <extension module='org.torquebox.web' />
+
+    </extensions>
+
+    <profile>
+        <subsystem xmlns="urn:jboss:domain:logging:1.0">
+            <!--console-handler name="CONSOLE">
+                <level name="INFO"/>
+                <formatter>
+                    <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+                </formatter>
+            </console-handler-->
+
+            <periodic-rotating-file-handler name="FILE">
+                <level name="INFO"/>
+                <formatter>
+                    <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+                </formatter>
+                <file relative-to="jboss.server.log.dir" path="server.log"/>
+                <suffix value=".yyyy-MM-dd"/>
+            </periodic-rotating-file-handler>
+
+            <logger category="com.arjuna">
+                <level name="WARN"/>
+            </logger>
+            <logger category="org.apache.tomcat.util.modeler">
+                <level name="WARN"/>
+            </logger>
+            <logger category="sun.rmi">
+                <level name="WARN"/>
+            </logger>
+
+            <root-logger>
+                <level name="INFO"/>
+                <handlers>
+                    <!--handler name="CONSOLE"/-->
+                    <handler name="FILE"/>
+                </handlers>
+            </root-logger>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:datasources:1.0">
+            <datasources>
+                <datasource jndi-name="java:jboss/datasources/ExampleDS" enabled="true" use-java-context="true" pool-name="H2DS">
+                    <connection-url>jdbc:h2:${jboss.server.data.dir}/test;DB_CLOSE_DELAY=-1</connection-url>
+                    <driver>h2</driver>
+                    <pool></pool>
+                    <security>
+                        <user-name>sa</user-name>
+                        <password>sa</password>
+                    </security>
+                    <validation></validation>
+                    <timeout></timeout>
+                    <statement></statement>
+                </datasource>
+                <datasource jndi-name="java:jboss/datasources/MysqlDS" enabled="${mysql.enabled}" use-java-context="true" pool-name="MysqlDS">
+                    <connection-url>jdbc:mysql://${OPENSHIFT_DB_HOST}:${OPENSHIFT_DB_PORT}/${OPENSHIFT_APP_NAME}</connection-url>
+                    <driver>mysql</driver>
+                    <security>
+                        <user-name>${OPENSHIFT_DB_USERNAME}</user-name>
+                        <password>${OPENSHIFT_DB_PASSWORD}</password>
+                    </security>
+                </datasource>
+                <datasource jndi-name="java:jboss/datasources/PostgreSQLDS" enabled="${postgresql.enabled}" use-java-context="true" pool-name="PostgreSQLDS" use-ccm="true">
+                    <connection-url>jdbc:postgresql://${OPENSHIFT_DB_HOST}:${OPENSHIFT_DB_PORT}/${OPENSHIFT_APP_NAME}</connection-url>
+                    <driver>postgresql</driver>
+                    <security>
+                        <user-name>${OPENSHIFT_DB_USERNAME}</user-name>
+                        <password>${OPENSHIFT_DB_PASSWORD}</password>
+                    </security>
+                </datasource>
+                <drivers>
+                    <driver name="h2" module="com.h2database.h2">
+                        <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
+                    </driver>
+                    <driver name="mysql" module="com.mysql.jdbc">
+                        <xa-datasource-class>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</xa-datasource-class>
+                    </driver>
+                    <driver name="postgresql" module="org.postgresql.jdbc">
+                        <xa-datasource-class>org.postgresql.xa.PGXADataSource</xa-datasource-class>
+                    </driver>
+                </drivers>
+            </datasources>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:deployment-scanner:1.0">
+            <deployment-scanner scan-interval="5000" relative-to="jboss.server.base.dir" path="deployments" />
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:ee:1.0" />
+        <subsystem xmlns="urn:jboss:domain:ejb3:1.0" />
+        <subsystem xmlns="urn:jboss:domain:infinispan:1.0" default-cache-container="hibernate">
+            <cache-container name="hibernate" default-cache="local-query">
+                <local-cache name="entity">
+                    <eviction strategy="LRU" max-entries="10000"/>
+                    <expiration max-idle="100000"/>
+                </local-cache>
+                <local-cache name="local-query">
+                    <eviction strategy="LRU" max-entries="10000"/>
+                    <expiration max-idle="100000"/>
+                </local-cache>
+                <local-cache name="timestamps">
+                    <eviction strategy="NONE"/>
+                </local-cache>
+            </cache-container>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:jca:1.0">
+            <archive-validation enabled="false" />
+            <bean-validation enabled="false" />
+            <default-workmanager>
+                <short-running-threads blocking="true">
+                    <core-threads count="5" per-cpu="10"/>
+                    <queue-length count="5" per-cpu="10"/>
+                    <max-threads count="5" per-cpu="10"/>
+                    <keepalive-time time="10" unit="seconds"/>
+                </short-running-threads>
+                <long-running-threads blocking="true">
+                    <core-threads count="5" per-cpu="10"/>
+                    <queue-length count="5" per-cpu="10"/>
+                    <max-threads count="5" per-cpu="10"/>
+                    <keepalive-time time="10" unit="seconds"/>
+                </long-running-threads>
+            </default-workmanager>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:jpa:1.0">
+            <jpa default-datasource=""/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:naming:1.0" />
+        <subsystem xmlns="urn:jboss:domain:resource-adapters:1.0" />
+        <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:security:1.0">
+            <security-domains>
+                <security-domain name="other" cache-type="default">
+                    <authentication>
+                        <login-module code="UsersRoles" flag="required"/>
+                    </authentication>
+                </security-domain>
+            </security-domains>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:threads:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:transactions:1.0">
+            <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
+            <core-environment>
+                <process-id>
+                    <uuid />
+                </process-id>
+            </core-environment>
+            <coordinator-environment default-timeout="300"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:web:1.0" default-virtual-server="default-host">
+            <connector name="http" scheme="http" protocol="HTTP/1.1" socket-binding="http"/>
+            <virtual-server name="default-host" enable-welcome-root="false">
+                <alias name="localhost" />
+            </virtual-server>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:weld:1.0" />
+        <subsystem xmlns='urn:jboss:domain:torquebox-bootstrap:1.0' />
+        <subsystem xmlns='urn:jboss:domain:torquebox-core:1.0' />
+        <subsystem xmlns='urn:jboss:domain:torquebox-cdi:1.0' />
+        <subsystem xmlns='urn:jboss:domain:torquebox-jobs:1.0' />
+        <subsystem xmlns='urn:jboss:domain:torquebox-security:1.0' />
+        <subsystem xmlns='urn:jboss:domain:torquebox-services:1.0' />
+        <subsystem xmlns='urn:jboss:domain:torquebox-web:1.0' />
+    </profile>
+
+    <interfaces>
+        <interface name="management">
+            <loopback-address value="${OPENSHIFT_INTERNAL_IP}"/>
+        </interface>
+        <interface name="public">
+            <loopback-address value="${OPENSHIFT_INTERNAL_IP}"/>
+        </interface>
+    </interfaces>
+
+    <socket-binding-group name="standard-sockets" default-interface="public">
+        <socket-binding name="http" port="8080"/>
+        <socket-binding name="https" port="8443"/>
+        <socket-binding name="jmx-connector-registry" port="1090"/>
+        <socket-binding name="jmx-connector-server" port="1091"/>
+        <socket-binding name="jndi" port="1099"/>
+        <socket-binding name="osgi-http" port="8090"/>
+        <socket-binding name="remoting" port="4447"/>
+        <socket-binding name="txn-recovery-environment" port="4712"/>
+        <socket-binding name="txn-status-manager" port="4713"/>
+    </socket-binding-group>
+
+</server>

data/templates/openshift/action_hooks/templates/web.xml

@@ -0,0 +1,35 @@
+<!DOCTYPE web-app PUBLIC
+  "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+  "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+
+  <context-param>
+    <param-name>public.root</param-name>
+    <param-value>/</param-value>
+  </context-param>
+
+  <context-param>
+      <param-name>jruby.compat.version</param-name>
+      <param-value>1.9</param-value>
+  </context-param>
+
+  <context-param>
+    <param-name>rack.env</param-name>
+    <param-value>production</param-value>
+  </context-param>
+
+  <filter>
+    <filter-name>RackFilter</filter-name>
+    <filter-class>org.jruby.rack.RackFilter</filter-class>
+  </filter>
+
+  <filter-mapping>
+    <filter-name>RackFilter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+  <listener>
+    <listener-class>org.jruby.rack.RackServletContextListener</listener-class>
+  </listener>
+
+</web-app>

data/templates/openshift/config/standalone.xml

@@ -39,6 +39,7 @@
         <extension module="org.jboss.as.transactions"/>
         <extension module="org.jboss.as.web" />
         <extension module="org.jboss.as.weld" />
+        <!--Torquebox-extensions-->
     </extensions>
 
     <profile>
@@ -191,6 +192,7 @@
             </virtual-server>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:weld:1.0" />
+        <!--Torquebox-subsystems-->
     </profile>
 
     <interfaces>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openshifter
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
   prerelease: 
 platform: ruby
 authors:
@@ -9,9 +9,9 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-19 00:00:00.000000000 Z
+date: 2012-02-22 00:00:00.000000000 Z
 dependencies: []
-description: Simplify deployments of Sinatra applications using JRuby to OpenShift
+description: Simplify deployments of JRuby applications to OpenShift
 email:
 - marek@jelen.biz
 executables:
@@ -36,6 +36,11 @@ files:
 - templates/openshift/action_hooks/deploy
 - templates/openshift/action_hooks/post_deploy
 - templates/openshift/action_hooks/pre_build
+- templates/openshift/action_hooks/templates/init.rb
+- templates/openshift/action_hooks/templates/jboss-web.xml
+- templates/openshift/action_hooks/templates/MANIFEST.MF
+- templates/openshift/action_hooks/templates/standalone.xml
+- templates/openshift/action_hooks/templates/web.xml
 - templates/openshift/config/standalone.xml
 - templates/openshift/gems/README
 - templates/openshift/lib/README