jruby · Oct 5, 2015 · Oct 5, 2015
diff --git a/.gitignore b/.gitignore
@@ -87,6 +87,7 @@ install/updates.xml
 
 # generated ITs
 maven/jruby/src/it/osgi_*
+maven/jruby/src/it/hellowarld_*
 maven/jruby/src/it/j2ee_wlp
 maven/jruby-complete/src/it/osgi*
 maven/jruby-complete/pom.xml

diff --git a/core/pom.rb b/core/pom.rb
@@ -208,7 +208,9 @@
                    'filesets' => [ { 'directory' =>  '${project.build.sourceDirectory}',
                                      'includes' => [ '${Constants.java}' ] },
                                    { 'directory' =>  '${project.basedir}/..',
-                                     'includes' => [ 'bin/jruby' ] } ],
+                                     'includes' => [ 'bin/jruby' ] },
+                                   { 'directory' =>  '${project.basedir}/..',
+                                     'includes' => [ 'lib/jni/**' ] } ],
                    'failOnError' =>  'false' )
   end
 
@@ -274,53 +276,68 @@
     end
   end
 
+  jruby_bin_config = [ 'run', { :id => 'copy',
+                                'tasks' => {
+                                  'exec' => {
+                                    '@executable' =>  '/bin/sh',
+                                    '@osfamily' =>  'unix',
+                                    'arg' => {
+                                      '@line' =>  '-c \'cp "${jruby.basedir}/bin/jruby.bash" "${jruby.basedir}/bin/jruby"\''
+                                    }
+                                  },
+                                  'chmod' => {
+                                    '@file' =>  '${jruby.basedir}/bin/jruby',
+                                    '@perm' =>  '755'
+                                  }
+                                } } ]
+
+  phase :clean do
+    plugin :antrun do
+      execute_goals( *jruby_bin_config )
+    end
+  end
+
   profile 'jruby.bash' do
 
     activation do
       file( :missing => '../bin/jruby' )
     end
 
-    plugin :antrun do
-      execute_goals( 'run',
-                     :id => 'copy',
-                     :phase => 'initialize',
-                     'tasks' => {
-                       'exec' => {
-                         '@executable' =>  '/bin/sh',
-                         '@osfamily' =>  'unix',
-                         'arg' => {
-                           '@line' =>  '-c \'cp "${jruby.basedir}/bin/jruby.bash" "${jruby.basedir}/bin/jruby"\''
-                         }
-                       },
-                       'chmod' => {
-                         '@file' =>  '${jruby.basedir}/bin/jruby',
-                         '@perm' =>  '755'
-                       }
-                     } )
+    phase :initialize do
+      plugin :antrun do
+        execute_goals( *jruby_bin_config )
+      end
     end
 
   end
 
+  jni_config = [ 'unpack', { :id => 'unzip native',
+                             'excludes' =>  'META-INF,META-INF/*',
+                             'artifactItems' => [ { 'groupId' =>  'com.github.jnr',
+                                                    'artifactId' =>  'jffi',
+                                                    'version' =>  '${jffi.version}',
+                                                    'type' =>  'jar',
+                                                    'classifier' =>  'native',
+                                                    'overWrite' =>  'false',
+                                                    'outputDirectory' =>  '${jruby.basedir}/lib' } ] } ]
+
+  phase :clean do
+    plugin :dependency do
+      execute_goals( *jni_config  )
+    end
+  end
+
   profile 'native' do
 
     activation do
       file( :missing => '../lib/jni' )
     end
 
-    plugin :dependency do
-      execute_goals( 'unpack',
-                     :id => 'unzip native',
-                     :phase => 'process-classes',
-                     'excludes' =>  'META-INF,META-INF/*',
-                     'artifactItems' => [ { 'groupId' =>  'com.github.jnr',
-                                            'artifactId' =>  'jffi',
-                                            'version' =>  '${jffi.version}',
-                                            'type' =>  'jar',
-                                            'classifier' =>  'native',
-                                            'overWrite' =>  'false',
-                                            'outputDirectory' =>  '${jruby.basedir}/lib' } ] )
+    phase 'process-classes' do
+      plugin :dependency do
+        execute_goals( *jni_config  )
+      end
     end
-
   end
 
   profile 'test' do

diff --git a/core/pom.xml b/core/pom.xml
@@ -545,6 +545,12 @@ DO NOT MODIFIY - GENERATED CODE
                     <include>bin/jruby</include>
                   </includes>
                 </fileset>
+                <fileset>
+                  <directory>${project.basedir}/..</directory>
+                  <includes>
+                    <include>lib/jni/**</include>
+                  </includes>
+                </fileset>
               </filesets>
               <failOnError>false</failOnError>
             </configuration>
@@ -597,6 +603,52 @@ DO NOT MODIFIY - GENERATED CODE
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy</id>
+            <phase>clean</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <exec executable="/bin/sh" osfamily="unix">
+                  <arg line="-c 'cp &quot;${jruby.basedir}/bin/jruby.bash&quot; &quot;${jruby.basedir}/bin/jruby&quot;'" />
+                </exec>
+                <chmod file="${jruby.basedir}/bin/jruby" perm="755" />
+              </tasks>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>unzip native</id>
+            <phase>clean</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <excludes>META-INF,META-INF/*</excludes>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>com.github.jnr</groupId>
+                  <artifactId>jffi</artifactId>
+                  <version>${jffi.version}</version>
+                  <type>jar</type>
+                  <classifier>native</classifier>
+                  <overWrite>false</overWrite>
+                  <outputDirectory>${jruby.basedir}/lib</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
   <profiles>
@@ -877,7 +929,6 @@ DO NOT MODIFIY - GENERATED CODE
             <artifactId>maven-antrun-plugin</artifactId>
             <executions>
               <execution>
-                <id>copy</id>
                 <phase>initialize</phase>
                 <goals>
                   <goal>run</goal>
@@ -909,7 +960,6 @@ DO NOT MODIFIY - GENERATED CODE
             <artifactId>maven-dependency-plugin</artifactId>
             <executions>
               <execution>
-                <id>unzip native</id>
                 <phase>process-classes</phase>
                 <goals>
                   <goal>unpack</goal>

diff --git a/maven/jruby/README.md b/maven/jruby/README.md
@@ -0,0 +1,109 @@
+# running tests #
+
+important for the rails4 warfile tests to increase the PermGen Space
+for jdk7
+
+```
+export MAVEN_OPTS='-XX:MaxPermSize=192m'
+```
+
+
+all tests
+```
+mvn verify -Papps
+```
+
+to pick a single tests
+```
+mvn verify -Papps -Dinvoker.test=hellowarld_jetty_unpacked_warfile_cuba
+```
+
+see the directory listing of ```./src/it/hellowarld_*``` - each directory is a single test.
+
+you also can use wildcards to pick test runs
+```
+mvn verify -Papps -Dinvoker.test=hellowarld_*_cuba
+mvn verify -Papps -Dinvoker.test=hellowarld_jetty_*
+mvn verify -Papps -Dinvoker.test=hellowarld_jetty_*rails4
+mvn verify -Papps -Dinvoker.test=hellowarld*warfile*sinatra
+```
+
+## the application is implemented with different web-framework
+
+it is a simple application demonstrating the PATCH http verb and adds various monitoring rack plugins which uses quite some numbers of jar dependencies.
+
+### cuba
+
+does not use bundler and almost a pure rack application as cuba has tiny codebase.
+
+### sinatra
+
+uses bundler (even it could just do the same as the cuba app). bundler adds another workaround here in there inside the packed applications.
+
+### rails4
+
+rails is heavily bound to its filesystem layout which can cause problems with packing it in jar/war and run it from there (without unpacking it).
+
+## webservers no servlets
+
+### webrick
+
+default from ruby
+
+### puma
+
+something which is working with jruby
+
+### torquebox
+
+it comes with its own tools to pack jars and wars which is NOT used. but it executes a config.ru like the other to webservers
+
+## webservers - servlets engine
+
+### jetty
+
+### tomcat
+
+### wildfly
+
+it can run war-files packed or deploy them which includes an unpacking on disk. both cases are tested
+
+## package format
+
+### filesystem
+
+using one of the webserver (not servlets)
+
+### runnable
+
+pack the whole application into a jar file and execute the webserver from within the jar and run the whole application from within the jar
+
+### warfile
+
+needs a servlet container to run
+
+# problems
+
+* nokogiri (from rails) does not work with jdk8 with servlets since it
+  usese com.sun.* classes which do not exist anymore. not sure why it
+  works outside a servelt engine - at least with wildfly
+
+* with jdk7 rails on servlet needs more perm space
+
+# PENDING
+
+* websphere which just needs more copy paste from another template here
+
+* rails5
+
+* glassfish, resin would be nice to have as well
+
+* ear files with jruby part of the ear-container and then war-container inherits this classpath
+
+* web-archive-bundle, i.e. OSGi bundle with a web-application packed. here jruby could be external dependency and its own OSGi bundle
+
+* actually trigger the PATCH request and test its outcome
+
+* run jetty and tomcat both packed and unpacked. probably needs just some custom context.xml
+
+* get the jruby9 extensions into the ruby DSL and clean up the runy DSL a bit (jars_lock to pick the jar dependencies from there, etc).
diff --git a/maven/jruby/pom.rb b/maven/jruby/pom.rb
@@ -9,10 +9,6 @@
   # keep it a jar even without sources - easier to add to a project
   packaging 'jar'
 
-  properties( 'tesla.dump.pom' => 'pom.xml',
-              'tesla.dump.readonly' => true,
-              'main.basedir' => '${project.parent.parent.basedir}' )
-
   jar 'org.jruby:jruby-core:${project.version}'
   jar 'org.jruby:jruby-stdlib:${project.version}'
 
@@ -23,16 +19,68 @@
   # this plugin is configured to attach empty jars for sources and javadocs
   plugin( 'org.codehaus.mojo:build-helper-maven-plugin' )
 
-  plugin( :invoker )
+  plugin( :invoker, :properties => { 'localRepository' => '${settings.localRepository}' } )
+
+  profile :apps do
+    activation do
+      property :name => 'invoker.test'
+    end
+
+    properties 'invoker.skip' => false, 'invoker.test' => 'hellowarld_*'
+
+    execute 'setup web applications', :phase => 'pre-integration-test' do |ctx|
+      def setup(ctx, framework, package, type, server)
+        puts [framework, package, server].join "\t"
+
+        source = File.join( ctx.basedir.to_pathname, 'src', 'templates', 'hellowarld' )
+        target = File.join( ctx.basedir.to_pathname, "src/it/hellowarld_#{server}_#{package}_#{framework}" )
+
+        FileUtils.rm_rf( target )
+        FileUtils.cp_r( source, target )
+        FileUtils.mv( "#{target}/config-#{framework}.ru", "#{target}/config.ru" )
+        FileUtils.mv( "#{target}/app-#{framework}", "#{target}/app" )
+        file = "#{target}/Gemfile-#{framework}"
+        FileUtils.mv( file, "#{target}/Gemfile" ) if File.exists?( file )
+        file = "#{target}/Gemfile-#{framework}.lock"
+        FileUtils.mv( file, "#{target}/Gemfile.lock" ) if File.exists?( file )
+        file = File.join( target, 'Mavenfile')
+        File.write(file, File.read(file).sub(/pom/, type))
+        File.open( File.join( target, 'invoker.properties' ), 'w' ) do |f|
+          f.puts "invoker.profiles = #{package},#{server},#{framework}"
+        end
+      end
+
+      [ 'cuba', 'sinatra', 'rails4' ].each do |framework|
+        [ ['filesystem', 'pom'], ['runnable','jrubyJar'] ].each do |package|
+          [ 'webrick', 'puma', 'torquebox' ].each do |server|
+            setup(ctx, framework, *package, server)
+          end
+        end
+        [ ['warfile', 'jrubyWar'] ].each do  |package|
+          [ 'jetty', 'tomcat', 'wildfly_unpacked', 'wildfly_packed' ].each do |server|
+            #', 'websphere' ].each do |server|
+            # rails4 on wildfly complains about missing com.sun.org.apache.xpath.internal.VariableStack which are actually xalan classes used by nokogiri
+            setup(ctx, framework, *package, server) unless framework == 'rails4' and server =~ /wildfly/
+          end
+        end
+      end
+    end
+  end
+
+  profile :osgi do
+    activation do
+      property :name => 'invoker.test'
+    end
 
-  execute 'setup other osgi frameworks', :phase => 'pre-integration-test' do |ctx|
-    source = File.join( ctx.basedir.to_pathname, 'src', 'templates', 'osgi_all_inclusive' )
-     [ 'knoplerfish', 'equinox-3.6', 'equinox-3.7', 'felix-3.2', 'felix-4.4'].each do |m|
-      target = File.join( ctx.basedir.to_pathname, 'src', 'it', 'osgi_all_inclusive_' + m )
-      FileUtils.rm_rf( target )
-      FileUtils.cp_r( source, target )
-      File.open( File.join( target, 'invoker.properties' ), 'w' ) do |f|
-        f.puts 'invoker.profiles = ' + m
+    execute 'setup osgi integration tests', :phase => 'pre-integration-test' do |ctx|
+      source = File.join( ctx.basedir.to_pathname, 'src', 'templates', 'osgi_all_inclusive' )
+      [ 'knoplerfish', 'equinox-3.6', 'equinox-3.7', 'felix-3.2', 'felix-4.4'].each do |m|
+        target = File.join( ctx.basedir.to_pathname, 'src', 'it', 'osgi_all_inclusive_' + m )
+        FileUtils.rm_rf( target )
+        FileUtils.cp_r( source, target )
+        File.open( File.join( target, 'invoker.properties' ), 'w' ) do |f|
+          f.puts 'invoker.profiles = ' + m
+        end
       end
     end
   end