- Revision
- 303
- Author
- mward
- Date
- 2007-08-07 11:20:46 -0500 (Tue, 07 Aug 2007)
Log Message
fixed call to refection call RubyController.execute, method no longer has any arguments
Modified Paths
- trunk/core/src/main/java/org/codehaus/waffle/controller/RubyControllerDefinitionFactory.java
- trunk/examples/jruby-example/jruby-example.iml
- trunk/examples/jruby-example/src/main/ruby/foo_bar.rb
- trunk/examples/paranamer-example/paranamer-example.iml
- trunk/examples/paranamer-example/resources/automobile.jspx
- trunk/examples/simple-example/simple-example.iml
Diff
Modified: trunk/core/src/main/java/org/codehaus/waffle/controller/RubyControllerDefinitionFactory.java (302 => 303)
--- trunk/core/src/main/java/org/codehaus/waffle/controller/RubyControllerDefinitionFactory.java 2007-08-07 16:02:12 UTC (rev 302) +++ trunk/core/src/main/java/org/codehaus/waffle/controller/RubyControllerDefinitionFactory.java 2007-08-07 16:20:46 UTC (rev 303) @@ -29,6 +29,7 @@ this.methodNameResolver = methodNameResolver; } + @Override protected Object findController(String name, HttpServletRequest request) { Object controller = super.findController(name, request); @@ -39,6 +40,7 @@ return controller; } + @Override protected MethodDefinition findMethodDefinition(Object controller, HttpServletRequest request, HttpServletResponse response) { if (controller instanceof RubyController) { RubyController rubyController = (RubyController) controller; @@ -49,10 +51,7 @@ } rubyController.setMethodName(methodName); - MethodDefinition methodDefinition = new MethodDefinition(executeMethod); - methodDefinition.addMethodArgument(request); - methodDefinition.addMethodArgument(response); - return methodDefinition; + return new MethodDefinition(executeMethod); } return super.findMethodDefinition(controller, request, response); }
Modified: trunk/examples/jruby-example/jruby-example.iml (302 => 303)
--- trunk/examples/jruby-example/jruby-example.iml 2007-08-07 16:02:12 UTC (rev 302) +++ trunk/examples/jruby-example/jruby-example.iml 2007-08-07 16:20:46 UTC (rev 303) @@ -14,6 +14,10 @@ <attribute name="method" value="5" /> <attribute name="URI" value="/WEB-INF/lib/core.jar" /> </containerElement> + <containerElement type="module" name="jruby-example"> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/classes" /> + </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="0" /> <attribute name="URI" value="<N/A>" /> @@ -35,6 +39,11 @@ <url>jar://$M2_REPOSITORY$/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar!/</url> </containerElement> <containerElement type="library" level="module"> + <attribute name="method" value="0" /> + <attribute name="URI" value="/WEB-INF/lib/commons-logging-1.1.jar" /> + <url>jar://$M2_REPOSITORY$/commons-logging/commons-logging/1.1/commons-logging-1.1.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> <attribute name="method" value="1" /> <attribute name="URI" value="/WEB-INF/lib/jstl-1.1.2.jar" /> <url>jar://$M2_REPOSITORY$/javax/servlet/jstl/1.1.2/jstl-1.1.2.jar!/</url> @@ -114,10 +123,6 @@ <attribute name="method" value="0" /> <attribute name="URI" value="<N/A>" /> </containerElement> - <containerElement type="module" name="jruby-example"> - <attribute name="method" value="1" /> - <attribute name="URI" value="/WEB-INF/classes" /> - </containerElement> <building> <setting name="EXPLODED_URL" value="file://$MODULE_DIR$/exploded" /> <setting name="EXPLODED_ENABLED" value="true" /> @@ -133,6 +138,10 @@ <attribute name="method" value="5" /> <attribute name="URI" value="/WEB-INF/lib/core.jar" /> </containerElement> + <containerElement type="module" name="jruby-example"> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/classes" /> + </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="0" /> <attribute name="URI" value="<N/A>" /> @@ -154,6 +163,11 @@ <url>jar://$M2_REPOSITORY$/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar!/</url> </containerElement> <containerElement type="library" level="module"> + <attribute name="method" value="0" /> + <attribute name="URI" value="/WEB-INF/lib/commons-logging-1.1.jar" /> + <url>jar://$M2_REPOSITORY$/commons-logging/commons-logging/1.1/commons-logging-1.1.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> <attribute name="method" value="1" /> <attribute name="URI" value="/WEB-INF/lib/jstl-1.1.2.jar" /> <url>jar://$M2_REPOSITORY$/javax/servlet/jstl/1.1.2/jstl-1.1.2.jar!/</url> @@ -233,10 +247,6 @@ <attribute name="method" value="0" /> <attribute name="URI" value="<N/A>" /> </containerElement> - <containerElement type="module" name="jruby-example"> - <attribute name="method" value="1" /> - <attribute name="URI" value="/WEB-INF/classes" /> - </containerElement> </packaging> </configuration> </facet>
Modified: trunk/examples/jruby-example/src/main/ruby/foo_bar.rb (302 => 303)
--- trunk/examples/jruby-example/src/main/ruby/foo_bar.rb 2007-08-07 16:02:12 UTC (rev 302) +++ trunk/examples/jruby-example/src/main/ruby/foo_bar.rb 2007-08-07 16:20:46 UTC (rev 303) @@ -1,7 +1,7 @@ class FooBar def index - @var1 = "is cool and fast, right? #{foobar}" + @var1 = "is cool and fast, right?" render("foobar.jspx") end
Modified: trunk/examples/paranamer-example/paranamer-example.iml (302 => 303)
--- trunk/examples/paranamer-example/paranamer-example.iml 2007-08-07 16:02:12 UTC (rev 302) +++ trunk/examples/paranamer-example/paranamer-example.iml 2007-08-07 16:20:46 UTC (rev 303) @@ -14,22 +14,55 @@ <attribute name="method" value="5" /> <attribute name="URI" value="/WEB-INF/lib/core.jar" /> </containerElement> + <containerElement type="module" name="paranamer-example"> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/classes" /> + </containerElement> + <containerElement type="module" name="taglib"> + <attribute name="method" value="0" /> + <attribute name="URI" value="/WEB-INF/classes" /> + </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="0" /> + <attribute name="URI" value="/WEB-INF/lib/asm-3.0.jar" /> + <url>jar://$M2_REPOSITORY$/asm/asm/3.0/asm-3.0.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> + <attribute name="method" value="0" /> <attribute name="URI" value="/WEB-INF/lib/paranamer-1.0.jar" /> <url>jar://$M2_REPOSITORY$/com/thoughtworks/paranamer/paranamer/1.0/paranamer-1.0.jar!/</url> </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="0" /> + <attribute name="URI" value="/WEB-INF/lib/xstream-1.2.2.jar" /> + <url>jar://$M2_REPOSITORY$/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> + <attribute name="method" value="0" /> + <attribute name="URI" value="/WEB-INF/lib/commons-logging-1.1.jar" /> + <url>jar://$M2_REPOSITORY$/commons-logging/commons-logging/1.1/commons-logging-1.1.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> + <attribute name="method" value="0" /> <attribute name="URI" value="/WEB-INF/lib/groovy-all-1.0-jsr-06.jar" /> <url>jar://$M2_REPOSITORY$/groovy/groovy-all-1.0-jsr/06/groovy-all-1.0-jsr-06.jar!/</url> </containerElement> <containerElement type="library" level="module"> + <attribute name="method" value="0" /> + <attribute name="URI" value="<N/A>" /> + <url>jar://$M2_REPOSITORY$/javax/servlet/jsp-api/2.0/jsp-api-2.0.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> <attribute name="method" value="1" /> <attribute name="URI" value="/WEB-INF/lib/jstl-1.1.2.jar" /> <url>jar://$M2_REPOSITORY$/javax/servlet/jstl/1.1.2/jstl-1.1.2.jar!/</url> </containerElement> <containerElement type="library" level="module"> + <attribute name="method" value="0" /> + <attribute name="URI" value="<N/A>" /> + <url>jar://$M2_REPOSITORY$/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> <attribute name="method" value="1" /> <attribute name="URI" value="/WEB-INF/lib/jmock-1.1.0.jar" /> <url>jar://$M2_REPOSITORY$/jmock/jmock/1.1.0/jmock-1.1.0.jar!/</url> @@ -71,6 +104,11 @@ </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="0" /> + <attribute name="URI" value="/WEB-INF/lib/jruby-complete-1.0.jar" /> + <url>jar://$M2_REPOSITORY$/org/jruby/jruby-complete/1.0/jruby-complete-1.0.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> + <attribute name="method" value="0" /> <attribute name="URI" value="/WEB-INF/lib/jetty-util-6.0.1.jar" /> <url>jar://$M2_REPOSITORY$/org/mortbay/jetty/jetty-util/6.0.1/jetty-util-6.0.1.jar!/</url> </containerElement> @@ -104,10 +142,6 @@ <attribute name="method" value="0" /> <attribute name="URI" value="<N/A>" /> </containerElement> - <containerElement type="module" name="paranamer-example"> - <attribute name="method" value="1" /> - <attribute name="URI" value="/WEB-INF/classes" /> - </containerElement> <building> <setting name="EXPLODED_URL" value="file://$MODULE_DIR$/exploded" /> <setting name="EXPLODED_ENABLED" value="true" /> @@ -116,29 +150,62 @@ <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION" value="false" /> <setting name="BUILD_EXTERNAL_DEPENDENCIES" value="false" /> <setting name="EXCLUDE_EXPLODED_DIRECTORY" value="true" /> - <setting name="RUN_JASPER_VALIDATION" value="true" /> + <setting name="RUN_JASPER_VALIDATION" value="false" /> </building> <packaging> <containerElement type="module" name="core"> <attribute name="method" value="5" /> <attribute name="URI" value="/WEB-INF/lib/core.jar" /> </containerElement> + <containerElement type="module" name="paranamer-example"> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/classes" /> + </containerElement> + <containerElement type="module" name="taglib"> + <attribute name="method" value="0" /> + <attribute name="URI" value="/WEB-INF/classes" /> + </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="0" /> + <attribute name="URI" value="/WEB-INF/lib/asm-3.0.jar" /> + <url>jar://$M2_REPOSITORY$/asm/asm/3.0/asm-3.0.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> + <attribute name="method" value="0" /> <attribute name="URI" value="/WEB-INF/lib/paranamer-1.0.jar" /> <url>jar://$M2_REPOSITORY$/com/thoughtworks/paranamer/paranamer/1.0/paranamer-1.0.jar!/</url> </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="0" /> + <attribute name="URI" value="/WEB-INF/lib/xstream-1.2.2.jar" /> + <url>jar://$M2_REPOSITORY$/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> + <attribute name="method" value="0" /> + <attribute name="URI" value="/WEB-INF/lib/commons-logging-1.1.jar" /> + <url>jar://$M2_REPOSITORY$/commons-logging/commons-logging/1.1/commons-logging-1.1.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> + <attribute name="method" value="0" /> <attribute name="URI" value="/WEB-INF/lib/groovy-all-1.0-jsr-06.jar" /> <url>jar://$M2_REPOSITORY$/groovy/groovy-all-1.0-jsr/06/groovy-all-1.0-jsr-06.jar!/</url> </containerElement> <containerElement type="library" level="module"> + <attribute name="method" value="0" /> + <attribute name="URI" value="<N/A>" /> + <url>jar://$M2_REPOSITORY$/javax/servlet/jsp-api/2.0/jsp-api-2.0.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> <attribute name="method" value="1" /> <attribute name="URI" value="/WEB-INF/lib/jstl-1.1.2.jar" /> <url>jar://$M2_REPOSITORY$/javax/servlet/jstl/1.1.2/jstl-1.1.2.jar!/</url> </containerElement> <containerElement type="library" level="module"> + <attribute name="method" value="0" /> + <attribute name="URI" value="<N/A>" /> + <url>jar://$M2_REPOSITORY$/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> <attribute name="method" value="1" /> <attribute name="URI" value="/WEB-INF/lib/jmock-1.1.0.jar" /> <url>jar://$M2_REPOSITORY$/jmock/jmock/1.1.0/jmock-1.1.0.jar!/</url> @@ -180,6 +247,11 @@ </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="0" /> + <attribute name="URI" value="/WEB-INF/lib/jruby-complete-1.0.jar" /> + <url>jar://$M2_REPOSITORY$/org/jruby/jruby-complete/1.0/jruby-complete-1.0.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> + <attribute name="method" value="0" /> <attribute name="URI" value="/WEB-INF/lib/jetty-util-6.0.1.jar" /> <url>jar://$M2_REPOSITORY$/org/mortbay/jetty/jetty-util/6.0.1/jetty-util-6.0.1.jar!/</url> </containerElement> @@ -213,10 +285,6 @@ <attribute name="method" value="0" /> <attribute name="URI" value="<N/A>" /> </containerElement> - <containerElement type="module" name="paranamer-example"> - <attribute name="method" value="1" /> - <attribute name="URI" value="/WEB-INF/classes" /> - </containerElement> </packaging> </configuration> </facet> @@ -281,6 +349,7 @@ </library> </orderEntry> <orderEntry type="module" module-name="core" exported="" /> + <orderEntry type="module" module-name="taglib" exported="" /> <orderEntryProperties /> </component> </module>
Modified: trunk/examples/paranamer-example/resources/automobile.jspx (302 => 303)
--- trunk/examples/paranamer-example/resources/automobile.jspx 2007-08-07 16:02:12 UTC (rev 302) +++ trunk/examples/paranamer-example/resources/automobile.jspx 2007-08-07 16:20:46 UTC (rev 303) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:jsp="http://java.sun.com/JSP/Page" - xmlns:waffle="http://waffle.codehaus.org/tld" + xmlns:waffle="http://waffle.codehaus.org" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:c="http://java.sun.com/jsp/jstl/core">
Modified: trunk/examples/simple-example/simple-example.iml (302 => 303)
--- trunk/examples/simple-example/simple-example.iml 2007-08-07 16:02:12 UTC (rev 302) +++ trunk/examples/simple-example/simple-example.iml 2007-08-07 16:20:46 UTC (rev 303) @@ -14,6 +14,10 @@ <attribute name="method" value="5" /> <attribute name="URI" value="/WEB-INF/lib/core.jar" /> </containerElement> + <containerElement type="module" name="simple-example"> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/classes" /> + </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="0" /> <attribute name="URI" value="<N/A>" /> @@ -26,13 +30,13 @@ </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="0" /> - <attribute name="URI" value="/WEB-INF/lib/paranamer-1.0.jar" /> - <url>jar://$M2_REPOSITORY$/com/thoughtworks/paranamer/paranamer/1.0/paranamer-1.0.jar!/</url> + <attribute name="URI" value="/WEB-INF/lib/paranamer-1.0-SNAPSHOT.jar" /> + <url>jar://$M2_REPOSITORY$/com/thoughtworks/paranamer/paranamer/1.0-SNAPSHOT/paranamer-1.0-SNAPSHOT.jar!/</url> </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="0" /> - <attribute name="URI" value="/WEB-INF/lib/paranamer-1.0-SNAPSHOT.jar" /> - <url>jar://$M2_REPOSITORY$/com/thoughtworks/paranamer/paranamer/1.0-SNAPSHOT/paranamer-1.0-SNAPSHOT.jar!/</url> + <attribute name="URI" value="/WEB-INF/lib/paranamer-1.0.jar" /> + <url>jar://$M2_REPOSITORY$/com/thoughtworks/paranamer/paranamer/1.0/paranamer-1.0.jar!/</url> </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="1" /> @@ -40,6 +44,11 @@ <url>jar://$M2_REPOSITORY$/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar!/</url> </containerElement> <containerElement type="library" level="module"> + <attribute name="method" value="0" /> + <attribute name="URI" value="/WEB-INF/lib/commons-logging-1.1.jar" /> + <url>jar://$M2_REPOSITORY$/commons-logging/commons-logging/1.1/commons-logging-1.1.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> <attribute name="method" value="1" /> <attribute name="URI" value="/WEB-INF/lib/jstl-1.1.2.jar" /> <url>jar://$M2_REPOSITORY$/javax/servlet/jstl/1.1.2/jstl-1.1.2.jar!/</url> @@ -91,6 +100,11 @@ </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="0" /> + <attribute name="URI" value="/WEB-INF/lib/jruby-complete-1.0.jar" /> + <url>jar://$M2_REPOSITORY$/org/jruby/jruby-complete/1.0/jruby-complete-1.0.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> + <attribute name="method" value="0" /> <attribute name="URI" value="/WEB-INF/lib/jruby-complete-1.0RC3.jar" /> <url>jar://$M2_REPOSITORY$/org/jruby/jruby-complete/1.0RC3/jruby-complete-1.0RC3.jar!/</url> </containerElement> @@ -129,10 +143,6 @@ <attribute name="method" value="1" /> <attribute name="URI" value="/WEB-INF/lib/velocity-tools-view-1.1.jar" /> </containerElement> - <containerElement type="module" name="simple-example"> - <attribute name="method" value="1" /> - <attribute name="URI" value="/WEB-INF/classes" /> - </containerElement> <building> <setting name="EXPLODED_URL" value="file://$MODULE_DIR$/exploded" /> <setting name="EXPLODED_ENABLED" value="true" /> @@ -148,6 +158,10 @@ <attribute name="method" value="5" /> <attribute name="URI" value="/WEB-INF/lib/core.jar" /> </containerElement> + <containerElement type="module" name="simple-example"> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/classes" /> + </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="0" /> <attribute name="URI" value="<N/A>" /> @@ -160,13 +174,13 @@ </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="0" /> - <attribute name="URI" value="/WEB-INF/lib/paranamer-1.0.jar" /> - <url>jar://$M2_REPOSITORY$/com/thoughtworks/paranamer/paranamer/1.0/paranamer-1.0.jar!/</url> + <attribute name="URI" value="/WEB-INF/lib/paranamer-1.0-SNAPSHOT.jar" /> + <url>jar://$M2_REPOSITORY$/com/thoughtworks/paranamer/paranamer/1.0-SNAPSHOT/paranamer-1.0-SNAPSHOT.jar!/</url> </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="0" /> - <attribute name="URI" value="/WEB-INF/lib/paranamer-1.0-SNAPSHOT.jar" /> - <url>jar://$M2_REPOSITORY$/com/thoughtworks/paranamer/paranamer/1.0-SNAPSHOT/paranamer-1.0-SNAPSHOT.jar!/</url> + <attribute name="URI" value="/WEB-INF/lib/paranamer-1.0.jar" /> + <url>jar://$M2_REPOSITORY$/com/thoughtworks/paranamer/paranamer/1.0/paranamer-1.0.jar!/</url> </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="1" /> @@ -174,6 +188,11 @@ <url>jar://$M2_REPOSITORY$/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar!/</url> </containerElement> <containerElement type="library" level="module"> + <attribute name="method" value="0" /> + <attribute name="URI" value="/WEB-INF/lib/commons-logging-1.1.jar" /> + <url>jar://$M2_REPOSITORY$/commons-logging/commons-logging/1.1/commons-logging-1.1.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> <attribute name="method" value="1" /> <attribute name="URI" value="/WEB-INF/lib/jstl-1.1.2.jar" /> <url>jar://$M2_REPOSITORY$/javax/servlet/jstl/1.1.2/jstl-1.1.2.jar!/</url> @@ -225,6 +244,11 @@ </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="0" /> + <attribute name="URI" value="/WEB-INF/lib/jruby-complete-1.0.jar" /> + <url>jar://$M2_REPOSITORY$/org/jruby/jruby-complete/1.0/jruby-complete-1.0.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> + <attribute name="method" value="0" /> <attribute name="URI" value="/WEB-INF/lib/jruby-complete-1.0RC3.jar" /> <url>jar://$M2_REPOSITORY$/org/jruby/jruby-complete/1.0RC3/jruby-complete-1.0RC3.jar!/</url> </containerElement> @@ -263,10 +287,6 @@ <attribute name="method" value="1" /> <attribute name="URI" value="/WEB-INF/lib/velocity-tools-view-1.1.jar" /> </containerElement> - <containerElement type="module" name="simple-example"> - <attribute name="method" value="1" /> - <attribute name="URI" value="/WEB-INF/classes" /> - </containerElement> </packaging> </configuration> </facet>
To unsubscribe from this list please visit:
