- Revision
- 308
- Author
- mward
- Date
- 2007-08-14 21:04:24 -0500 (Tue, 14 Aug 2007)
Log Message
updated paranmer and simple example to fix minor issues. Updated intellij projects so that exploded include the correct dependencies
Modified Paths
- trunk/core/core.iml
- trunk/core/src/main/java/org/codehaus/waffle/context/pico/PicoComponentRegistry.java
- trunk/core/src/test/specs/org/codehaus/waffle/servlet/erb_extension_spec.rb
- trunk/core/src/test/specs/org/codehaus/waffle/servlet/waffle_spec.rb
- trunk/examples/jruby-example/resources/person.rhtml
- trunk/examples/mydvds-example/mydvds-example.iml
- trunk/examples/paranamer-example/paranamer-example.iml
- trunk/examples/paranamer-example/resources/ajaxexample.jspx
- trunk/examples/paranamer-example/resources/selection.jspx
- trunk/examples/paranamer-example/src/main/java/org/codehaus/waffle/example/paranamer/AjaxExample.java
- trunk/examples/paranamer-example/src/main/java/org/codehaus/waffle/example/paranamer/action/CalculatorController.java
- trunk/examples/simple-example/resources/ajaxexample.jspx
- trunk/examples/simple-example/resources/automobile.jspx
- trunk/examples/simple-example/simple-example.iml
- trunk/examples/simple-example/src/main/java/org/codehaus/waffle/example/simple/AjaxExample.java
Diff
Modified: trunk/core/core.iml (307 => 308)
--- trunk/core/core.iml 2007-08-10 14:32:36 UTC (rev 307) +++ trunk/core/core.iml 2007-08-15 02:04:24 UTC (rev 308) @@ -80,15 +80,6 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> <root url="" /> </CLASSES> <JAVADOC /> @@ -169,6 +160,15 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module>
Modified: trunk/core/src/main/java/org/codehaus/waffle/context/pico/PicoComponentRegistry.java (307 => 308)
--- trunk/core/src/main/java/org/codehaus/waffle/context/pico/PicoComponentRegistry.java 2007-08-10 14:32:36 UTC (rev 307) +++ trunk/core/src/main/java/org/codehaus/waffle/context/pico/PicoComponentRegistry.java 2007-08-15 02:04:24 UTC (rev 308) @@ -137,7 +137,7 @@ * @throws WaffleException */ protected static Class<?> locateComponentClass(Object key, Class<?> defaultClass, ServletContext servletContext) throws WaffleException { - String parameterName = null; + String parameterName; if ( key instanceof Class ){ parameterName = ((Class<?>)key).getName(); } else if ( key instanceof String ){
Modified: trunk/core/src/test/specs/org/codehaus/waffle/servlet/erb_extension_spec.rb (307 => 308)
--- trunk/core/src/test/specs/org/codehaus/waffle/servlet/erb_extension_spec.rb 2007-08-10 14:32:36 UTC (rev 307) +++ trunk/core/src/test/specs/org/codehaus/waffle/servlet/erb_extension_spec.rb 2007-08-15 02:04:24 UTC (rev 308) @@ -2,7 +2,7 @@ require 'org/codehaus/waffle/erb_extension' require 'ostruct' -describe "Waffle::PartialController" do +describe Waffle::PartialController do it "should expose locals as readable attributes" do controller = Waffle::PartialController.new(Object.new, {:foo => 'bar', :hello => 'world'}) @@ -31,7 +31,7 @@ end -describe "ERB::Util.partial method" do +describe ERB::Util, "partial method" do class FakeController include ERB::Util # Mix-in whats under test
Modified: trunk/core/src/test/specs/org/codehaus/waffle/servlet/waffle_spec.rb (307 => 308)
--- trunk/core/src/test/specs/org/codehaus/waffle/servlet/waffle_spec.rb 2007-08-10 14:32:36 UTC (rev 307) +++ trunk/core/src/test/specs/org/codehaus/waffle/servlet/waffle_spec.rb 2007-08-15 02:04:24 UTC (rev 308) @@ -3,7 +3,7 @@ include_class 'java.util.Hashtable' -describe "Waffle::ScriptLoader module" do +describe Waffle::ScriptLoader do it "should use 'load' when path prefix begins with 'dir:'" do servlet_context = mock('servlet_context') @@ -31,7 +31,7 @@ end -describe "Waffle::ScriptLoader#locate_template" do +describe Waffle::ScriptLoader, "locate_template method" do before(:each) do @servlet_context = mock('ServletContext') @@ -49,7 +49,7 @@ end -describe "Waffle::WebContext class" do +describe Waffle::WebContext do it "initialize() should obtain all attribute name/values and add them to a Ruby Hash" do table = Hashtable.new # Using Hashtable because we need an enumerator for testing @@ -79,7 +79,7 @@ end -describe "The '__set_all_contexts' Waffle::Controller instance method" do +describe Waffle::Controller, "__set_all_contexts instance method" do it "should process request, response, session attributes as well as request parameters" do controller = Object.new @@ -114,7 +114,7 @@ end -describe "The 'locate' Waffle::Controller instance method" do +describe Waffle::Controller, "locate method" do it "should handle when type passed in is a Module" do module Foo
Modified: trunk/examples/jruby-example/resources/person.rhtml (307 => 308)
--- trunk/examples/jruby-example/resources/person.rhtml 2007-08-10 14:32:36 UTC (rev 307) +++ trunk/examples/jruby-example/resources/person.rhtml 2007-08-15 02:04:24 UTC (rev 308) @@ -40,7 +40,7 @@ <%# Example of partial page %> <div id='editArea'> <% unless @person.nil? %> - <%= partial('edit_person', {:foobar => "Mike"}) %> + <%= partial('edit_person', :foobar => "Mike") %> <% end %> </div>
Modified: trunk/examples/mydvds-example/mydvds-example.iml (307 => 308)
--- trunk/examples/mydvds-example/mydvds-example.iml 2007-08-10 14:32:36 UTC (rev 307) +++ trunk/examples/mydvds-example/mydvds-example.iml 2007-08-15 02:04:24 UTC (rev 308) @@ -40,36 +40,6 @@ </packaging> </configuration> </facet> - <facet type="web" name="Web2" implicit="true"> - <configuration> - <descriptors> - <deploymentDescriptor name="web.xml" url="" optional="false" version="2.4" /> - </descriptors> - <webroots> - <root url="" relative="/" /> - </webroots> - <containerElement type="module" name="mydvds-example"> - <attribute name="method" value="1" /> - <attribute name="URI" value="/WEB-INF/classes" /> - </containerElement> - <building> - <setting name="EXPLODED_URL" value="file://" /> - <setting name="EXPLODED_ENABLED" value="false" /> - <setting name="JAR_URL" value="file://" /> - <setting name="JAR_ENABLED" value="false" /> - <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" /> - </building> - <packaging> - <containerElement type="module" name="mydvds-example"> - <attribute name="method" value="1" /> - <attribute name="URI" value="/WEB-INF/classes" /> - </containerElement> - </packaging> - </configuration> - </facet> </component> <component name="NewModuleRootManager" inherit-compiler-output="false"> <output url="" />
Modified: trunk/examples/paranamer-example/paranamer-example.iml (307 => 308)
--- trunk/examples/paranamer-example/paranamer-example.iml 2007-08-10 14:32:36 UTC (rev 307) +++ trunk/examples/paranamer-example/paranamer-example.iml 2007-08-15 02:04:24 UTC (rev 308) @@ -19,18 +19,18 @@ <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" /> + <attribute name="method" value="5" /> + <attribute name="URI" value="/WEB-INF/lib/taglib.jar" /> </containerElement> <containerElement type="library" level="module"> - <attribute name="method" value="0" /> + <attribute name="method" value="1" /> <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> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/lib/paranamer-1.0.1.jar" /> + <url>jar://$M2_REPOSITORY$/com/thoughtworks/paranamer/paranamer/1.0.1/paranamer-1.0.1.jar!/</url> </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="0" /> @@ -162,18 +162,18 @@ <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" /> + <attribute name="method" value="5" /> + <attribute name="URI" value="/WEB-INF/lib/taglib.jar" /> </containerElement> <containerElement type="library" level="module"> - <attribute name="method" value="0" /> + <attribute name="method" value="1" /> <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> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/lib/paranamer-1.0.1.jar" /> + <url>jar://$M2_REPOSITORY$/com/thoughtworks/paranamer/paranamer/1.0.1/paranamer-1.0.1.jar!/</url> </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="0" /> @@ -339,17 +339,26 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="module" module-name="core" exported="" /> + <orderEntry type="module" module-name="taglib" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="" /> + <root url="" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="core" exported="" /> - <orderEntry type="module" module-name="taglib" exported="" /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module>
Modified: trunk/examples/paranamer-example/resources/ajaxexample.jspx (307 => 308)
--- trunk/examples/paranamer-example/resources/ajaxexample.jspx 2007-08-10 14:32:36 UTC (rev 307) +++ trunk/examples/paranamer-example/resources/ajaxexample.jspx 2007-08-15 02:04:24 UTC (rev 308) @@ -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"> @@ -19,7 +19,7 @@ // </script> <script src="" type="text/_javascript_"> - // + // </script> <style type="text/css" title="currentStyle" media="screen">
Modified: trunk/examples/paranamer-example/resources/selection.jspx (307 => 308)
--- trunk/examples/paranamer-example/resources/selection.jspx 2007-08-10 14:32:36 UTC (rev 307) +++ trunk/examples/paranamer-example/resources/selection.jspx 2007-08-15 02:04:24 UTC (rev 308) @@ -21,14 +21,14 @@ Droppables.add('available', { accept: "item_selected", - onDrop:handleDrop, + onDrop: handleDrop, onHover: function(drag, drop) { new Effect.Highlight(drop) }}); Droppables.add('selected', { accept: "item_available", - onDrop:handleDrop, + onDrop: handleDrop, onHover: function(drag, drop) { new Effect.Highlight(drop) }});
Modified: trunk/examples/paranamer-example/src/main/java/org/codehaus/waffle/example/paranamer/AjaxExample.java (307 => 308)
--- trunk/examples/paranamer-example/src/main/java/org/codehaus/waffle/example/paranamer/AjaxExample.java 2007-08-10 14:32:36 UTC (rev 307) +++ trunk/examples/paranamer-example/src/main/java/org/codehaus/waffle/example/paranamer/AjaxExample.java 2007-08-15 02:04:24 UTC (rev 308) @@ -31,14 +31,14 @@ AjaxExample.Item item = available.remove(index); selected.add(item); - return new View("foo.jspx", this); + return new View("selection.jspx", this); } public View remove(int index) { AjaxExample.Item item = selected.remove(index); available.add(item); - return new View("foo.jspx", this); + return new View("selection.jspx", this); } public class Item {
Modified: trunk/examples/paranamer-example/src/main/java/org/codehaus/waffle/example/paranamer/action/CalculatorController.java (307 => 308)
--- trunk/examples/paranamer-example/src/main/java/org/codehaus/waffle/example/paranamer/action/CalculatorController.java 2007-08-10 14:32:36 UTC (rev 307) +++ trunk/examples/paranamer-example/src/main/java/org/codehaus/waffle/example/paranamer/action/CalculatorController.java 2007-08-15 02:04:24 UTC (rev 308) @@ -1,7 +1,7 @@ package org.codehaus.waffle.example.paranamer.action; public class CalculatorController { - public Number result; + private Number result; public Number getResult() { return result;
Modified: trunk/examples/simple-example/resources/ajaxexample.jspx (307 => 308)
--- trunk/examples/simple-example/resources/ajaxexample.jspx 2007-08-10 14:32:36 UTC (rev 307) +++ trunk/examples/simple-example/resources/ajaxexample.jspx 2007-08-15 02:04:24 UTC (rev 308) @@ -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/resources/automobile.jspx (307 => 308)
--- trunk/examples/simple-example/resources/automobile.jspx 2007-08-10 14:32:36 UTC (rev 307) +++ trunk/examples/simple-example/resources/automobile.jspx 2007-08-15 02:04:24 UTC (rev 308) @@ -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 (307 => 308)
--- trunk/examples/simple-example/simple-example.iml 2007-08-10 14:32:36 UTC (rev 307) +++ trunk/examples/simple-example/simple-example.iml 2007-08-15 02:04:24 UTC (rev 308) @@ -18,6 +18,10 @@ <attribute name="method" value="1" /> <attribute name="URI" value="/WEB-INF/classes" /> </containerElement> + <containerElement type="module" name="taglib"> + <attribute name="method" value="5" /> + <attribute name="URI" value="/WEB-INF/lib/taglib.jar" /> + </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="0" /> <attribute name="URI" value="<N/A>" /> @@ -35,8 +39,8 @@ </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.1.jar" /> + <url>jar://$M2_REPOSITORY$/com/thoughtworks/paranamer/paranamer/1.0.1/paranamer-1.0.1.jar!/</url> </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="1" /> @@ -49,6 +53,11 @@ <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="<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> @@ -56,6 +65,11 @@ <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="0" /> + <attribute name="URI" value="<N/A>" /> <url>jar://$M2_REPOSITORY$/jmock/jmock/1.1.0/jmock-1.1.0.jar!/</url> </containerElement> <containerElement type="library" level="module"> @@ -162,6 +176,10 @@ <attribute name="method" value="1" /> <attribute name="URI" value="/WEB-INF/classes" /> </containerElement> + <containerElement type="module" name="taglib"> + <attribute name="method" value="5" /> + <attribute name="URI" value="/WEB-INF/lib/taglib.jar" /> + </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="0" /> <attribute name="URI" value="<N/A>" /> @@ -179,8 +197,8 @@ </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.1.jar" /> + <url>jar://$M2_REPOSITORY$/com/thoughtworks/paranamer/paranamer/1.0.1/paranamer-1.0.1.jar!/</url> </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="1" /> @@ -193,6 +211,11 @@ <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="<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> @@ -200,6 +223,11 @@ <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="0" /> + <attribute name="URI" value="<N/A>" /> <url>jar://$M2_REPOSITORY$/jmock/jmock/1.1.0/jmock-1.1.0.jar!/</url> </containerElement> <containerElement type="library" level="module"> @@ -359,6 +387,7 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="module" module-name="taglib" /> <orderEntryProperties /> </component> </module>
Modified: trunk/examples/simple-example/src/main/java/org/codehaus/waffle/example/simple/AjaxExample.java (307 => 308)
--- trunk/examples/simple-example/src/main/java/org/codehaus/waffle/example/simple/AjaxExample.java 2007-08-10 14:32:36 UTC (rev 307) +++ trunk/examples/simple-example/src/main/java/org/codehaus/waffle/example/simple/AjaxExample.java 2007-08-15 02:04:24 UTC (rev 308) @@ -19,6 +19,7 @@ available.add(new Item(4, "four")); available.add(new Item(5, "five")); } + public List<Item> getSelected() { return selected; } @@ -31,14 +32,14 @@ AjaxExample.Item item = available.remove(index); selected.add(item); - return new View("foo.jspx", this); + return new View("selection.jspx", this); } public View remove(int index) { AjaxExample.Item item = selected.remove(index); available.add(item); - return new View("foo.jspx", this); + return new View("selection.jspx", this); } public class Item {
To unsubscribe from this list please visit:
