- Revision
- 778
- Author
- mward
- Date
- 2008-08-20 22:48:25 -0500 (Wed, 20 Aug 2008)
Log Message
fixed jruby-example build
Modified Paths
- trunk/examples/jruby-example/pom.xml
- trunk/examples/jruby-example/src/main/java/org/codehaus/waffle/example/jruby/RubyScriptReloader.java
- trunk/examples/jruby-example/src/main/ruby/person.rb
- trunk/examples/jruby-example/waffle-jruby-example.iml
- trunk/waffle-core/waffle-core.iml
- trunk/waffle-mock/waffle-mock.iml
- trunk/waffle-resources/waffle-resources.iml
- trunk/waffle-ruby/src/main/ruby/org/codehaus/waffle/waffle.rb
- trunk/waffle-ruby/waffle-ruby.iml
- trunk/waffle-taglib/waffle-taglib.iml
- trunk/waffle-testing/waffle-testing.iml
Added Paths
- trunk/examples/jruby-example/src/test/specs/
Removed Paths
- trunk/examples/jruby-example/src/test/ruby/
Diff
Modified: trunk/examples/jruby-example/pom.xml (777 => 778)
--- trunk/examples/jruby-example/pom.xml 2008-08-20 22:04:32 UTC (rev 777) +++ trunk/examples/jruby-example/pom.xml 2008-08-21 03:48:25 UTC (rev 778) @@ -26,11 +26,39 @@ <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> + <artifactId>dependency-maven-plugin</artifactId> + <executions> + <execution> + <id>unpack-jruby-home</id> + <phase>process-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/jruby</outputDirectory> + <includes>META-INF/jruby.home/**</includes> + <overWriteSnapshots>true</overWriteSnapshots> + <artifactItems> + <artifactItem> + <groupId>org.jruby</groupId> + <artifactId>jruby-complete</artifactId> + <version>1.1.2</version> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> <artifactId>rspec-maven-plugin</artifactId> + <version>1.0-beta-3-SNAPSHOT</version> <configuration> - <jrubyHome>${env.JRUBY_HOME}</jrubyHome> - <sourceDirectory>${basedir}/src/test/ruby</sourceDirectory> + <jrubyHome>${project.build.directory}/jruby/META-INF/jruby.home</jrubyHome> + <sourceDirectory>${basedir}/src/test/specs</sourceDirectory> <outputDirectory>${basedir}/target</outputDirectory> + <reportFile>${basedir}/target/rspec-report.html</reportFile> + <ignoreFailure>false</ignoreFailure> </configuration> <executions> <execution>
Modified: trunk/examples/jruby-example/src/main/java/org/codehaus/waffle/example/jruby/RubyScriptReloader.java (777 => 778)
--- trunk/examples/jruby-example/src/main/java/org/codehaus/waffle/example/jruby/RubyScriptReloader.java 2008-08-20 22:04:32 UTC (rev 777) +++ trunk/examples/jruby-example/src/main/java/org/codehaus/waffle/example/jruby/RubyScriptReloader.java 2008-08-21 03:48:25 UTC (rev 778) @@ -16,7 +16,7 @@ } public void start() { - runtime.evalScriptlet("Waffle::ScriptLoader.load_from_file_system"); + runtime.evalScriptlet("::Waffle::ScriptLoader.load_from_file_system"); } public void stop() {
Modified: trunk/examples/jruby-example/src/main/ruby/person.rb (777 => 778)
--- trunk/examples/jruby-example/src/main/ruby/person.rb 2008-08-20 22:04:32 UTC (rev 777) +++ trunk/examples/jruby-example/src/main/ruby/person.rb 2008-08-21 03:48:25 UTC (rev 778) @@ -1,4 +1,4 @@ -include_class 'org.codehaus.waffle.example.jruby.model.Person' +import org.codehaus.waffle.example.jruby.model.Person class PersonController
Copied: trunk/examples/jruby-example/src/test/specs (from rev 774, trunk/examples/jruby-example/src/test/ruby) ( => )
Modified: trunk/examples/jruby-example/waffle-jruby-example.iml =================================================================== --- trunk/examples/jruby-example/waffle-jruby-example.iml 2008-08-20 22:04:32 UTC (rev 777) +++ trunk/examples/jruby-example/waffle-jruby-example.iml 2008-08-21 03:48:25 UTC (rev 778) @@ -364,9 +364,11 @@ <sourceFolder url="" isTestSource="false" /> <sourceFolder url="" isTestSource="false" /> <sourceFolder url="" isTestSource="true" /> - <sourceFolder url="" isTestSource="true" /> + <sourceFolder url="" isTestSource="true" /> <excludeFolder url="" /> <excludeFolder url="" /> + <excludeFolder url="" /> + <excludeFolder url="" /> <excludeFolder url="" /> <excludeFolder url="" /> <excludeFolder url="" />
Modified: trunk/waffle-core/waffle-core.iml (777 => 778)
--- trunk/waffle-core/waffle-core.iml 2008-08-20 22:04:32 UTC (rev 777) +++ trunk/waffle-core/waffle-core.iml 2008-08-21 03:48:25 UTC (rev 778) @@ -10,6 +10,7 @@ <sourceFolder url="" isTestSource="true" /> <sourceFolder url="" isTestSource="true" /> <excludeFolder url="" /> + <excludeFolder url="" /> <excludeFolder url="" /> <excludeFolder url="" /> </content>
Modified: trunk/waffle-mock/waffle-mock.iml (777 => 778)
--- trunk/waffle-mock/waffle-mock.iml 2008-08-20 22:04:32 UTC (rev 777) +++ trunk/waffle-mock/waffle-mock.iml 2008-08-21 03:48:25 UTC (rev 778) @@ -10,6 +10,8 @@ <sourceFolder url="" isTestSource="true" /> <sourceFolder url="" isTestSource="true" /> <excludeFolder url="" /> + <excludeFolder url="" /> + <excludeFolder url="" /> <excludeFolder url="" /> </content> <orderEntry type="inheritedJdk" />
Modified: trunk/waffle-resources/waffle-resources.iml (777 => 778)
--- trunk/waffle-resources/waffle-resources.iml 2008-08-20 22:04:32 UTC (rev 777) +++ trunk/waffle-resources/waffle-resources.iml 2008-08-21 03:48:25 UTC (rev 778) @@ -9,6 +9,8 @@ <sourceFolder url="" isTestSource="false" /> <sourceFolder url="" isTestSource="true" /> <excludeFolder url="" /> + <excludeFolder url="" /> + <excludeFolder url="" /> <excludeFolder url="" /> </content> <orderEntry type="inheritedJdk" />
Modified: trunk/waffle-ruby/src/main/ruby/org/codehaus/waffle/waffle.rb (777 => 778)
--- trunk/waffle-ruby/src/main/ruby/org/codehaus/waffle/waffle.rb 2008-08-20 22:04:32 UTC (rev 777) +++ trunk/waffle-ruby/src/main/ruby/org/codehaus/waffle/waffle.rb 2008-08-21 03:48:25 UTC (rev 778) @@ -1,8 +1,8 @@ require 'java' -include_class org.codehaus.waffle.view.View -include_class org.codehaus.waffle.view.RedirectView -include_class org.codehaus.waffle.action.ActionMethodInvocationException +import org.codehaus.waffle.view.View +import org.codehaus.waffle.view.RedirectView +import org.codehaus.waffle.action.ActionMethodInvocationException # TODO all of this code needs ruby tests! module Waffle
Modified: trunk/waffle-ruby/waffle-ruby.iml (777 => 778)
--- trunk/waffle-ruby/waffle-ruby.iml 2008-08-20 22:04:32 UTC (rev 777) +++ trunk/waffle-ruby/waffle-ruby.iml 2008-08-21 03:48:25 UTC (rev 778) @@ -21,6 +21,7 @@ <sourceFolder url="" isTestSource="true" /> <excludeFolder url="" /> <excludeFolder url="" /> + <excludeFolder url="" /> <excludeFolder url="" /> <excludeFolder url="" /> <excludeFolder url="" />
Modified: trunk/waffle-taglib/waffle-taglib.iml (777 => 778)
--- trunk/waffle-taglib/waffle-taglib.iml 2008-08-20 22:04:32 UTC (rev 777) +++ trunk/waffle-taglib/waffle-taglib.iml 2008-08-21 03:48:25 UTC (rev 778) @@ -10,6 +10,8 @@ <sourceFolder url="" isTestSource="true" /> <sourceFolder url="" isTestSource="true" /> <excludeFolder url="" /> + <excludeFolder url="" /> + <excludeFolder url="" /> <excludeFolder url="" /> </content> <orderEntry type="inheritedJdk" />
Modified: trunk/waffle-testing/waffle-testing.iml (777 => 778)
--- trunk/waffle-testing/waffle-testing.iml 2008-08-20 22:04:32 UTC (rev 777) +++ trunk/waffle-testing/waffle-testing.iml 2008-08-21 03:48:25 UTC (rev 778) @@ -10,6 +10,9 @@ <sourceFolder url="" isTestSource="true" /> <sourceFolder url="" isTestSource="true" /> <excludeFolder url="" /> + <excludeFolder url="" /> + <excludeFolder url="" /> + <excludeFolder url="" /> <excludeFolder url="" /> </content> <orderEntry type="inheritedJdk" />
To unsubscribe from this list please visit:
