- Revision
- 96
- Author
- mward
- Date
- 2007-05-28 00:34:46 -0500 (Mon, 28 May 2007)
Log Message
added several TODO's for ruby integration work
Modified Paths
- trunk/core/src/main/java/org/codehaus/waffle/registrar/pico/RubyScriptComponentAdapter.java
- trunk/core/src/main/java/org/codehaus/waffle/servlet/WaffleServlet.java
- trunk/core/src/main/ruby/waffle.rb
Diff
Modified: trunk/core/src/main/java/org/codehaus/waffle/registrar/pico/RubyScriptComponentAdapter.java (95 => 96)
--- trunk/core/src/main/java/org/codehaus/waffle/registrar/pico/RubyScriptComponentAdapter.java 2007-05-28 05:22:09 UTC (rev 95) +++ trunk/core/src/main/java/org/codehaus/waffle/registrar/pico/RubyScriptComponentAdapter.java 2007-05-28 05:34:46 UTC (rev 96) @@ -13,6 +13,7 @@ private Object componentKey; private final String rubyScript; + // TODO this needs to be changed ... key is the name controller regiester under and the value is the Ruby class name public RubyScriptComponentAdapter(Object componentKey, String rubyScript) { this.componentKey = componentKey; this.rubyScript = rubyScript;
Modified: trunk/core/src/main/java/org/codehaus/waffle/servlet/WaffleServlet.java (95 => 96)
--- trunk/core/src/main/java/org/codehaus/waffle/servlet/WaffleServlet.java 2007-05-28 05:22:09 UTC (rev 95) +++ trunk/core/src/main/java/org/codehaus/waffle/servlet/WaffleServlet.java 2007-05-28 05:34:46 UTC (rev 96) @@ -14,14 +14,6 @@ import static org.codehaus.waffle.Constants.METHOD_INVOCATION_ERROR_PAGE; import static org.codehaus.waffle.Constants.VIEW_PREFIX_KEY; import static org.codehaus.waffle.Constants.VIEW_SUFFIX_KEY; - -import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.codehaus.waffle.WaffleComponentRegistry; import org.codehaus.waffle.action.ActionMethodExecutor; import org.codehaus.waffle.action.ActionMethodResponse; @@ -36,6 +28,12 @@ import org.codehaus.waffle.validation.Validator; import org.codehaus.waffle.view.View; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + /** * Waffle's FrontController for handling user requests. * @@ -141,6 +139,9 @@ } } + // TODO ... pluggable way to register controller instance variables to the request ... no longer have to do "controller.foobar" + // pluggable cause we need to support ognl and ruby (get_instance_variables + actionMethodResponseHandler.handle(request, response, actionMethodResponse); } catch (MethodInvocationException e) { log(e.getMessage());
Modified: trunk/core/src/main/ruby/waffle.rb (95 => 96)
--- trunk/core/src/main/ruby/waffle.rb 2007-05-28 05:22:09 UTC (rev 95) +++ trunk/core/src/main/ruby/waffle.rb 2007-05-28 05:34:46 UTC (rev 96) @@ -52,7 +52,7 @@ end def method_missing(symbol, *args) - if symbol.to_s =~ /^find_/ + if symbol.to_s =~ /^find_/ # todo: I don't like "find_" for this ... sounds to model-ish key = symbol.to_s key = key[5..key.length] component = @@__pico_container.getComponentInstance(key)
To unsubscribe from this list please visit:
