- Revision
- 137
- Author
- mward
- Date
- 2007-06-03 17:06:00 -0500 (Sun, 03 Jun 2007)
Log Message
updated views in examples to no longer prefix controller property access with 'controller'. Updated jsp refernces to waffle tld
Modified Paths
- trunk/core/core.iml
- trunk/examples/freemarker-example/freemarker-example.iml
- trunk/examples/jruby-example/jruby-example.iml
- trunk/examples/jruby-example/resources/foobar.jspx
- trunk/examples/paranamer-example/paranamer-example.iml
- trunk/examples/paranamer-example/resources/ajaxexample.jspx
- trunk/examples/paranamer-example/resources/automobile.jspx
- trunk/examples/paranamer-example/resources/calculator.jspx
- trunk/examples/paranamer-example/resources/helloworld.jspx
- trunk/examples/paranamer-example/resources/selection.jspx
- trunk/examples/simple-example/resources/ajaxexample.jspx
- trunk/examples/simple-example/resources/automobile.jspx
- trunk/examples/simple-example/resources/calculator.jspx
- trunk/examples/simple-example/resources/editperson.jspx
- trunk/examples/simple-example/resources/helloworld.jspx
- trunk/examples/simple-example/resources/person.jspx
- trunk/examples/simple-example/resources/selection.jspx
- trunk/examples/simple-example/simple-example.iml
- trunk/root.iml
- trunk/waffle.ipr
Diff
Modified: trunk/core/core.iml (136 => 137)
--- trunk/core/core.iml 2007-06-03 18:47:34 UTC (rev 136) +++ trunk/core/core.iml 2007-06-03 22:06:00 UTC (rev 137) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<module relativePaths="false" type="JAVA_MODULE" version="4"> +<module version="4" relativePaths="false" type="JAVA_MODULE"> <component name="ModuleRootManager" /> <component name="NewModuleRootManager" inherit-compiler-output="false"> <output url="" />
Modified: trunk/examples/freemarker-example/freemarker-example.iml (136 => 137)
--- trunk/examples/freemarker-example/freemarker-example.iml 2007-06-03 18:47:34 UTC (rev 136) +++ trunk/examples/freemarker-example/freemarker-example.iml 2007-06-03 22:06:00 UTC (rev 137) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<module relativePaths="true" type="J2EE_WEB_MODULE" version="4"> +<module version="4" relativePaths="true" type="J2EE_WEB_MODULE"> <component name="AppServerSpecificValidatorsManager" /> <component name="ModuleRootManager" /> <component name="NewModuleRootManager" inherit-compiler-output="false"> @@ -62,6 +62,7 @@ <setting name="EXPLODED_ENABLED" value="true" /> <setting name="JAR_URL" value="file://" /> <setting name="JAR_ENABLED" value="false" /> + <setting name="SYNC_EXPLODED_DIR" value="false" /> <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION" value="false" /> <setting name="BUILD_EXTERNAL_DEPENDENCIES" value="false" /> <setting name="RUN_JASPER_VALIDATION" value="true" /> @@ -73,10 +74,20 @@ </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-RC-3-SNAPSHOT.jar" /> <url>jar://$M2_REPOSITORY$/com/thoughtworks/paranamer/paranamer/1.0-RC-3-SNAPSHOT/paranamer-1.0-RC-3-SNAPSHOT.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="1" /> <attribute name="URI" value="/WEB-INF/lib/freemarker-2.3.8.jar" /> <url>jar://$M2_REPOSITORY$/freemarker/freemarker/2.3.8/freemarker-2.3.8.jar!/</url> @@ -143,6 +154,11 @@ </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> + <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>
Modified: trunk/examples/jruby-example/jruby-example.iml (136 => 137)
--- trunk/examples/jruby-example/jruby-example.iml 2007-06-03 18:47:34 UTC (rev 136) +++ trunk/examples/jruby-example/jruby-example.iml 2007-06-03 22:06:00 UTC (rev 137) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<module relativePaths="true" type="J2EE_WEB_MODULE" version="4"> +<module version="4" relativePaths="true" type="J2EE_WEB_MODULE"> <component name="AppServerSpecificValidatorsManager" /> <component name="ModuleRootManager" /> <component name="NewModuleRootManager" inherit-compiler-output="false"> @@ -56,7 +56,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="" /> + <root url="" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -69,6 +69,7 @@ <setting name="EXPLODED_ENABLED" value="true" /> <setting name="JAR_URL" value="file://" /> <setting name="JAR_ENABLED" value="false" /> + <setting name="SYNC_EXPLODED_DIR" value="false" /> <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION" value="false" /> <setting name="BUILD_EXTERNAL_DEPENDENCIES" value="false" /> <setting name="RUN_JASPER_VALIDATION" value="true" /> @@ -84,11 +85,21 @@ <url>jar://$APPLICATION_HOME_DIR$/lib/j2ee.jar!/</url> </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="1" /> <attribute name="URI" value="/WEB-INF/lib/paranamer-1.0-RC-3-SNAPSHOT.jar" /> <url>jar://$M2_REPOSITORY$/com/thoughtworks/paranamer/paranamer/1.0-RC-3-SNAPSHOT/paranamer-1.0-RC-3-SNAPSHOT.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="1" /> <attribute name="URI" value="/WEB-INF/lib/jmock-1.2.0.jar" /> <url>jar://$M2_REPOSITORY$/jmock/jmock/1.2.0/jmock-1.2.0.jar!/</url> @@ -124,9 +135,9 @@ <url>jar://$M2_REPOSITORY$/org/jmock/jmock/2.0.0/jmock-2.0.0.jar!/</url> </containerElement> <containerElement type="library" level="module"> - <attribute name="method" value="1" /> - <attribute name="URI" value="/WEB-INF/lib/jruby-complete-1.0RC2.jar" /> - <url>jar://$M2_REPOSITORY$/org/jruby/jruby-complete/1.0RC2/jruby-complete-1.0RC2.jar!/</url> + <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> <containerElement type="library" level="module"> <attribute name="method" value="1" />
Modified: trunk/examples/jruby-example/resources/foobar.jspx (136 => 137)
--- trunk/examples/jruby-example/resources/foobar.jspx 2007-06-03 18:47:34 UTC (rev 136) +++ trunk/examples/jruby-example/resources/foobar.jspx 2007-06-03 22:06:00 UTC (rev 137) @@ -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://thoughtworks.com/java/waffle" + xmlns:waffle="http://waffle.codehaus.org/tld" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:c="http://java.sun.com/jsp/jstl/core">
Modified: trunk/examples/paranamer-example/paranamer-example.iml (136 => 137)
--- trunk/examples/paranamer-example/paranamer-example.iml 2007-06-03 18:47:34 UTC (rev 136) +++ trunk/examples/paranamer-example/paranamer-example.iml 2007-06-03 22:06:00 UTC (rev 137) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<module relativePaths="true" type="J2EE_WEB_MODULE" version="4"> +<module version="4" relativePaths="true" type="J2EE_WEB_MODULE"> <component name="AppServerSpecificValidatorsManager" /> <component name="ModuleRootManager" /> <component name="NewModuleRootManager" inherit-compiler-output="false"> @@ -70,6 +70,7 @@ <setting name="EXPLODED_ENABLED" value="true" /> <setting name="JAR_URL" value="file://" /> <setting name="JAR_ENABLED" value="false" /> + <setting name="SYNC_EXPLODED_DIR" value="false" /> <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION" value="false" /> <setting name="BUILD_EXTERNAL_DEPENDENCIES" value="false" /> <setting name="RUN_JASPER_VALIDATION" value="true" />
Modified: trunk/examples/paranamer-example/resources/ajaxexample.jspx (136 => 137)
--- trunk/examples/paranamer-example/resources/ajaxexample.jspx 2007-06-03 18:47:34 UTC (rev 136) +++ trunk/examples/paranamer-example/resources/ajaxexample.jspx 2007-06-03 22:06:00 UTC (rev 137) @@ -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://thoughtworks.com/java/waffle" + xmlns:waffle="http://waffle.codehaus.org/tld" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:c="http://java.sun.com/jsp/jstl/core">
Modified: trunk/examples/paranamer-example/resources/automobile.jspx (136 => 137)
--- trunk/examples/paranamer-example/resources/automobile.jspx 2007-06-03 18:47:34 UTC (rev 136) +++ trunk/examples/paranamer-example/resources/automobile.jspx 2007-06-03 22:06:00 UTC (rev 137) @@ -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://thoughtworks.com/java/waffle" + xmlns:waffle="http://waffle.codehaus.org/tld" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:c="http://java.sun.com/jsp/jstl/core"> @@ -27,14 +27,14 @@ <tr> <td>Make:</td> <td> - <input type="text" value="${fn:escapeXml(controller.make)}" name="make"/> + <input type="text" value="${fn:escapeXml(make)}" name="make"/> </td> </tr> <tr> <td>Model:</td> <td> - <input type="text" value="${fn:escapeXml(controller.model)}" name="model"/> + <input type="text" value="${fn:escapeXml(model)}" name="model"/> </td> </tr> @@ -43,12 +43,12 @@ <tr> <td>Top Speed:</td> <td> - <input type="text" value="${fn:escapeXml(controller.topSpeed)}" name="topSpeed"/> + <input type="text" value="${fn:escapeXml(topSpeed)}" name="topSpeed"/> </td> </tr> <tr> <td>Speed:</td> - <td>${controller.speed}</td> + <td>${speed}</td> </tr> </table> <br/>
Modified: trunk/examples/paranamer-example/resources/calculator.jspx (136 => 137)
--- trunk/examples/paranamer-example/resources/calculator.jspx 2007-06-03 18:47:34 UTC (rev 136) +++ trunk/examples/paranamer-example/resources/calculator.jspx 2007-06-03 22:06:00 UTC (rev 137) @@ -36,7 +36,7 @@ <div class="fieldRow"> <label for="" - <input type="text" name="result" id="result" value="${controller.result}" disabled="disabled" readonly="readonly"/> + <input type="text" name="result" id="result" value="${result}" disabled="disabled" readonly="readonly"/> <br style="clear:both"/> </div>
Modified: trunk/examples/paranamer-example/resources/helloworld.jspx (136 => 137)
--- trunk/examples/paranamer-example/resources/helloworld.jspx 2007-06-03 18:47:34 UTC (rev 136) +++ trunk/examples/paranamer-example/resources/helloworld.jspx 2007-06-03 22:06:00 UTC (rev 137) @@ -9,6 +9,6 @@ <head><title>Hello World Controller</title></head> <body> -<h1>${controller.greeting}</h1> +<h1>${greeting}</h1> </body> </html> \ No newline at end of file
Modified: trunk/examples/paranamer-example/resources/selection.jspx (136 => 137)
--- trunk/examples/paranamer-example/resources/selection.jspx 2007-06-03 18:47:34 UTC (rev 136) +++ trunk/examples/paranamer-example/resources/selection.jspx 2007-06-03 22:06:00 UTC (rev 137) @@ -2,7 +2,7 @@ <div id="selected" class="items"> <div style="float:left; font-weight:bold">Selected</div> <br style="clear:both"/> - <c:forEach var="item" items="${controller.selected}" varStatus="status"> + <c:forEach var="item" items="${selected}" varStatus="status"> <div class="item_selected" id="remove|${status.index}">${item.name}</div> </c:forEach> </div> @@ -10,7 +10,7 @@ <div id="available" class="items"> <div style="float:left; font-weight:bold">Available</div> <br style="clear:both"/> - <c:forEach var="item" items="${controller.available}" varStatus="status"> + <c:forEach var="item" items="${available}" varStatus="status"> <div class="item_available" id="add|${status.index}">${item.name}</div> </c:forEach> </div>
Modified: trunk/examples/simple-example/resources/ajaxexample.jspx (136 => 137)
--- trunk/examples/simple-example/resources/ajaxexample.jspx 2007-06-03 18:47:34 UTC (rev 136) +++ trunk/examples/simple-example/resources/ajaxexample.jspx 2007-06-03 22:06:00 UTC (rev 137) @@ -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://thoughtworks.com/java/waffle" + xmlns:waffle="http://waffle.codehaus.org/tld" 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 (136 => 137)
--- trunk/examples/simple-example/resources/automobile.jspx 2007-06-03 18:47:34 UTC (rev 136) +++ trunk/examples/simple-example/resources/automobile.jspx 2007-06-03 22:06:00 UTC (rev 137) @@ -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://thoughtworks.com/java/waffle" + xmlns:waffle="http://waffle.codehaus.org/tld" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:c="http://java.sun.com/jsp/jstl/core"> @@ -27,14 +27,14 @@ <tr> <td>Make:</td> <td> - <input type="text" value="${fn:escapeXml(controller.make)}" name="make"/> + <input type="text" value="${fn:escapeXml(make)}" name="make"/> </td> </tr> <tr> <td>Model:</td> <td> - <input type="text" value="${fn:escapeXml(controller.model)}" name="model"/> + <input type="text" value="${fn:escapeXml(model)}" name="model"/> </td> </tr> @@ -43,12 +43,12 @@ <tr> <td>Top Speed:</td> <td> - <input type="text" value="${fn:escapeXml(controller.topSpeed)}" name="topSpeed"/> + <input type="text" value="${fn:escapeXml(topSpeed)}" name="topSpeed"/> </td> </tr> <tr> <td>Speed:</td> - <td>${controller.speed}</td> + <td>${speed}</td> </tr> </table> <br/>
Modified: trunk/examples/simple-example/resources/calculator.jspx (136 => 137)
--- trunk/examples/simple-example/resources/calculator.jspx 2007-06-03 18:47:34 UTC (rev 136) +++ trunk/examples/simple-example/resources/calculator.jspx 2007-06-03 22:06:00 UTC (rev 137) @@ -36,7 +36,7 @@ <div class="fieldRow"> <label for="" - <input type="text" name="result" id="result" value="${controller.result}" disabled="disabled" readonly="readonly"/> + <input type="text" name="result" id="result" value="${result}" disabled="disabled" readonly="readonly"/> <br style="clear:both"/> </div>
Modified: trunk/examples/simple-example/resources/editperson.jspx (136 => 137)
--- trunk/examples/simple-example/resources/editperson.jspx 2007-06-03 18:47:34 UTC (rev 136) +++ trunk/examples/simple-example/resources/editperson.jspx 2007-06-03 22:06:00 UTC (rev 137) @@ -17,27 +17,27 @@ <div class="fieldRow"> <label for="" - <input type="text" name="person.id" id="person.id" value="${controller.person.id}" readonly="true" disabled="true"/> + <input type="text" name="person.id" id="person.id" value="${person.id}" readonly="true" disabled="true"/> <br style="clear:both"/> </div> <div class="fieldRow"> <label for="" Name:</label> - <input type="text" name="person.firstName" id="person.firstName" value="${controller.person.firstName}"/> + <input type="text" name="person.firstName" id="person.firstName" value="${person.firstName}"/> <br style="clear:both"/> </div> <div class="fieldRow"> <label for="" Name:</label> - <input type="text" name="person.lastName" id="person.lastName" value="${controller.person.lastName}"/> + <input type="text" name="person.lastName" id="person.lastName" value="${person.lastName}"/> <br style="clear:both"/> </div> <div class="fieldRow"> <label for="" - <input type="text" name="person.email" id="person.email" value="${controller.person.email}"/> + <input type="text" name="person.email" id="person.email" value="${person.email}"/> <br style="clear:both"/> </div> <div class="fieldRow"> <label for="" of Birth:</label> - <fmt:formatDate value="${controller.person.dateOfBirth}" var="birthDate" pattern="dd-MM-yyyy"/> + <fmt:formatDate value="${person.dateOfBirth}" var="birthDate" pattern="dd-MM-yyyy"/> <input type="text" name="person.dateOfBirth" id="person.dateOfBirth" value="${birthDate}"/> <br style="clear:both"/> </div>
Modified: trunk/examples/simple-example/resources/helloworld.jspx (136 => 137)
--- trunk/examples/simple-example/resources/helloworld.jspx 2007-06-03 18:47:34 UTC (rev 136) +++ trunk/examples/simple-example/resources/helloworld.jspx 2007-06-03 22:06:00 UTC (rev 137) @@ -9,6 +9,6 @@ <head><title>Hello World Controller</title></head> <body> -<h1>${controller.greeting}</h1> +<h1>${greeting}</h1> </body> </html> \ No newline at end of file
Modified: trunk/examples/simple-example/resources/person.jspx (136 => 137)
--- trunk/examples/simple-example/resources/person.jspx 2007-06-03 18:47:34 UTC (rev 136) +++ trunk/examples/simple-example/resources/person.jspx 2007-06-03 22:06:00 UTC (rev 137) @@ -35,7 +35,7 @@ <th>Email</th> <th>Date of Birth</th> </tr> - <c:forEach var="person" items="${controller.persons}" varStatus="status"> + <c:forEach var="person" items="${persons}" varStatus="status"> <tr class="${status.index % 2 eq 0 ? 'even' : 'odd'}"> <td> <a href="" @@ -52,7 +52,7 @@ <!-- Example of partial page --> <div id="editArea"> - <c:if test="${controller.person != null}"> + <c:if test="${person != null}"> <jsp:directive.include file="editperson.jspx"/> </c:if> </div>
Modified: trunk/examples/simple-example/resources/selection.jspx (136 => 137)
--- trunk/examples/simple-example/resources/selection.jspx 2007-06-03 18:47:34 UTC (rev 136) +++ trunk/examples/simple-example/resources/selection.jspx 2007-06-03 22:06:00 UTC (rev 137) @@ -2,7 +2,7 @@ <div id="selected" class="items"> <div style="float:left; font-weight:bold">Selected</div> <br style="clear:both"/> - <c:forEach var="item" items="${controller.selected}" varStatus="status"> + <c:forEach var="item" items="${selected}" varStatus="status"> <div class="item_selected" id="remove|${status.index}">${item.name}</div> </c:forEach> </div> @@ -10,7 +10,7 @@ <div id="available" class="items"> <div style="float:left; font-weight:bold">Available</div> <br style="clear:both"/> - <c:forEach var="item" items="${controller.available}" varStatus="status"> + <c:forEach var="item" items="${available}" varStatus="status"> <div class="item_available" id="add|${status.index}">${item.name}</div> </c:forEach> </div>
Modified: trunk/examples/simple-example/simple-example.iml (136 => 137)
--- trunk/examples/simple-example/simple-example.iml 2007-06-03 18:47:34 UTC (rev 136) +++ trunk/examples/simple-example/simple-example.iml 2007-06-03 22:06:00 UTC (rev 137) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<module relativePaths="true" type="J2EE_WEB_MODULE" version="4"> +<module version="4" relativePaths="true" type="J2EE_WEB_MODULE"> <component name="AppServerSpecificValidatorsManager" /> <component name="ModuleRootManager" /> <component name="NewModuleRootManager" inherit-compiler-output="false"> @@ -44,6 +44,33 @@ </library> </orderEntry> <orderEntry type="module" module-name="core" exported="" /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> <component name="WebModuleBuildComponent"> @@ -51,9 +78,10 @@ <setting name="EXPLODED_ENABLED" value="true" /> <setting name="JAR_URL" value="file://" /> <setting name="JAR_ENABLED" value="false" /> + <setting name="SYNC_EXPLODED_DIR" value="false" /> <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION" value="false" /> <setting name="BUILD_EXTERNAL_DEPENDENCIES" value="false" /> - <setting name="RUN_JASPER_VALIDATION" value="true" /> + <setting name="RUN_JASPER_VALIDATION" value="false" /> </component> <component name="WebModuleProperties"> <containerElement type="module" name="core"> @@ -66,6 +94,11 @@ <url>jar://$APPLICATION_HOME_DIR$/lib/j2ee.jar!/</url> </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="1" /> <attribute name="URI" value="/WEB-INF/lib/paranamer-1.0-beta-2.jar" /> <url>jar://$M2_REPOSITORY$/com/thoughtworks/paranamer/paranamer/1.0-beta-2/paranamer-1.0-beta-2.jar!/</url> @@ -82,7 +115,17 @@ </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="1" /> - <attribute name="URI" value="/WEB-INF/lib/jmock-1.1.0.jar" /> + <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="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$/jmock/jmock/1.1.0/jmock-1.1.0.jar!/</url> </containerElement> <containerElement type="library" level="module"> @@ -126,6 +169,11 @@ <url>jar://$M2_REPOSITORY$/org/jmock/jmock/2.0.0/jmock-2.0.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> + <containerElement type="library" level="module"> <attribute name="method" value="1" /> <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> @@ -135,6 +183,11 @@ <attribute name="URI" value="/WEB-INF/lib/picocontainer-1.2.jar" /> <url>jar://$M2_REPOSITORY$/org/picocontainer/picocontainer/1.2/picocontainer-1.2.jar!/</url> </containerElement> + <containerElement type="library" level="module"> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/lib/standard-1.1.2.jar" /> + <url>jar://$M2_REPOSITORY$/taglibs/standard/1.1.2/standard-1.1.2.jar!/</url> + </containerElement> <containerElement type="library" name="Groovy from GroovyJ 0.1.8 (Demetra)" level="application"> <attribute name="method" value="0" /> <attribute name="URI" value="/WEB-INF/lib" /> @@ -157,8 +210,8 @@ </containerElement> <deploymentDescriptor name="web.xml" url="" optional="false" version="2.4" /> <webroots> - <root url="" relative="/" /> <root url="" relative="/WEB-INF" /> + <root url="" relative="/" /> </webroots> </component> <component name="WeblogicWebModuleProperties" />
Modified: trunk/root.iml (136 => 137)
--- trunk/root.iml 2007-06-03 18:47:34 UTC (rev 136) +++ trunk/root.iml 2007-06-03 22:06:00 UTC (rev 137) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<module relativePaths="true" type="JAVA_MODULE" version="4"> +<module version="4" relativePaths="true" type="JAVA_MODULE"> <component name="ModuleRootManager" /> <component name="NewModuleRootManager" inherit-compiler-output="true"> <content url=""
Modified: trunk/waffle.ipr (136 => 137)
--- trunk/waffle.ipr 2007-06-03 18:47:34 UTC (rev 136) +++ trunk/waffle.ipr 2007-06-03 22:06:00 UTC (rev 137) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project relativePaths="false" version="4"> +<project version="4" relativePaths="false"> <component name="AntConfiguration"> <defaultAnt bundledAnt="true" /> </component> @@ -54,15 +54,6 @@ </option> <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" /> <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" /> - <ADDITIONAL_INDENT_OPTIONS fileType="js"> - <option name="INDENT_SIZE" value="2" /> - <option name="CONTINUATION_INDENT_SIZE" value="8" /> - <option name="TAB_SIZE" value="2" /> - <option name="USE_TAB_CHARACTER" value="false" /> - <option name="SMART_TABS" value="false" /> - <option name="LABEL_INDENT_SIZE" value="0" /> - <option name="LABEL_INDENT_ABSOLUTE" value="false" /> - </ADDITIONAL_INDENT_OPTIONS> </value> </option> <option name="USE_PER_PROJECT_SETTINGS" value="true" /> @@ -107,7 +98,7 @@ <option name="MAXIMUM_HEAP_SIZE" value="128" /> </component> <component name="EntryPointsManager"> - <entry_points version="2.0" /> + <entry_points /> </component> <component name="ExportToHTMLSettings"> <option name="PRINT_LINE_NUMBERS" value="false" /> @@ -358,7 +349,11 @@ </option> </component> <component name="libraryTable" /> - <component name="uidesigner-configuration" /> + <component name="uidesigner-configuration"> + <option name="INSTRUMENT_CLASSES" value="true" /> + <option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" /> + <option name="DEFAULT_LAYOUT_MANAGER" value="GridLayoutManager" /> + </component> <UsedPathMacros> <macro name="M2_REPOSITORY" /> </UsedPathMacros>
To unsubscribe from this list please visit:
