- Revision
- 805
- Author
- mauro
- Date
- 2008-09-03 07:23:58 -0500 (Wed, 03 Sep 2008)
Log Message
Fixed compilation warnings in waffle-ruby. Updated resources configuration in jruby-example.
Modified Paths
- trunk/.classpath
- trunk/examples/jruby-example/pom.xml
- trunk/waffle-ruby/src/main/java/org/codehaus/waffle/bind/RubyViewDataBinder.java
- trunk/waffle-ruby/src/main/java/org/codehaus/waffle/registrar/pico/RubyScriptComponentAdapter.java
- trunk/waffle-ruby/src/test/java/org/codehaus/waffle/controller/RubyControllerDefinitionFactoryTest.java
- trunk/waffle-ruby/src/test/java/org/codehaus/waffle/registrar/pico/RubyScriptComponentAdapterTest.java
Removed Paths
- trunk/waffle-ruby/src/test/java/org/codehaus/waffle/servlet/
Diff
Modified: trunk/.classpath (804 => 805)
--- trunk/.classpath 2008-09-03 11:33:44 UTC (rev 804) +++ trunk/.classpath 2008-09-03 12:23:58 UTC (rev 805) @@ -1,45 +1,46 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" output="waffle-core/target/classes" path="waffle-core/src/main/java"/> + <classpathentry excluding="**" kind="src" output="waffle-core/target/classes" path="waffle-core/src/main/resources"/> <classpathentry kind="src" output="waffle-core/target/test-classes" path="waffle-core/src/test/java"/> - <classpathentry excluding="**" kind="src" output="waffle-core/target/classes" path="waffle-core/src/main/resources"/> <classpathentry excluding="**" kind="src" output="waffle-core/target/test-classes" path="waffle-core/src/test/resources"/> <classpathentry kind="src" output="waffle-ruby/target/classes" path="waffle-ruby/src/main/java"/> + <classpathentry excluding="**" kind="src" output="waffle-ruby/target/classes" path="waffle-ruby/src/main/ruby"/> <classpathentry kind="src" output="waffle-ruby/target/test-classes" path="waffle-ruby/src/test/java"/> - <classpathentry excluding="**" kind="src" output="waffle-ruby/target/classes" path="waffle-ruby/src/main/ruby"/> <classpathentry kind="src" output="waffle-mock/target/classes" path="waffle-mock/src/main/java"/> <classpathentry kind="src" output="waffle-mock/target/test-classes" path="waffle-mock/src/test/java"/> <classpathentry kind="src" output="waffle-testing/target/classes" path="waffle-testing/src/main/java"/> <classpathentry kind="src" output="waffle-testing/target/test-classes" path="waffle-testing/src/test/java"/> <classpathentry excluding="**" kind="src" output="waffle-testing/target/test-classes" path="waffle-testing/src/test/webapp"/> + <classpathentry excluding="**" kind="src" output="waffle-resources/target/classes" path="waffle-resources/src/main/resources"/> <classpathentry kind="src" output="waffle-resources/target/test-classes" path="waffle-resources/src/test/java"/> - <classpathentry excluding="**" kind="src" output="waffle-resources/target/classes" path="waffle-resources/src/main/resources"/> <classpathentry kind="src" output="waffle-taglib/target/classes" path="waffle-taglib/src/main/java"/> + <classpathentry excluding="**" kind="src" output="waffle-taglib/target/classes" path="waffle-taglib/src/main/resources"/> <classpathentry kind="src" output="waffle-taglib/target/test-classes" path="waffle-taglib/src/test/java"/> - <classpathentry excluding="**" kind="src" output="waffle-taglib/target/classes" path="waffle-taglib/src/main/resources"/> <classpathentry kind="src" output="examples/simple-example/target/classes" path="examples/simple-example/src/main/java"/> - <classpathentry kind="src" output="examples/simple-example/target/test-classes" path="examples/simple-example/src/test/java"/> <classpathentry excluding="**" kind="src" output="examples/simple-example/target/classes" path="examples/simple-example/src/main/resources"/> <classpathentry excluding="**" kind="src" output="examples/simple-example/target/classes" path="examples/simple-example/src/main/webapp"/> + <classpathentry kind="src" output="examples/simple-example/target/test-classes" path="examples/simple-example/src/test/java"/> <classpathentry kind="src" output="examples/jruby-example/target/classes" path="examples/jruby-example/src/main/java"/> + <classpathentry excluding="**" kind="src" output="examples/jruby-example/target/classes" path="examples/jruby-example/src/main/webapp"/> + <classpathentry excluding="**" kind="src" output="examples/jruby-example/target/classes" path="examples/jruby-example/src/main/ruby"/> <classpathentry kind="src" output="examples/jruby-example/target/test-classes" path="examples/jruby-example/src/test/java"/> - <classpathentry excluding="**" kind="src" output="examples/jruby-example/target/classes" path="examples/jruby-example/src/main/ruby"/> <classpathentry kind="src" output="examples/freemarker-example/target/classes" path="examples/freemarker-example/src/main/java"/> - <classpathentry kind="src" output="examples/freemarker-example/target/test-classes" path="examples/freemarker-example/src/test/java"/> <classpathentry excluding="**" kind="src" output="examples/freemarker-example/target/classes" path="examples/freemarker-example/src/main/resources"/> <classpathentry excluding="**" kind="src" output="examples/freemarker-example/target/classes" path="examples/freemarker-example/src/main/webapp"/> + <classpathentry kind="src" output="examples/freemarker-example/target/test-classes" path="examples/freemarker-example/src/test/java"/> <classpathentry kind="src" output="examples/paranamer-example/target/classes" path="examples/paranamer-example/src/main/java"/> - <classpathentry kind="src" output="examples/paranamer-example/target/test-classes" path="examples/paranamer-example/src/test/java"/> <classpathentry excluding="**" kind="src" output="examples/paranamer-example/target/classes" path="examples/paranamer-example/src/main/resources"/> <classpathentry excluding="**" kind="src" output="examples/paranamer-example/target/classes" path="examples/paranamer-example/src/main/webapp"/> + <classpathentry kind="src" output="examples/paranamer-example/target/test-classes" path="examples/paranamer-example/src/test/java"/> <classpathentry kind="src" output="examples/migration-example/target/classes" path="examples/migration-example/src/main/java"/> <classpathentry excluding="**" kind="src" output="examples/migration-example/target/classes" path="examples/migration-example/src/main/webapp"/> <classpathentry kind="src" output="examples/mydvds-example/target/classes" path="examples/mydvds-example/src/main/java"/> - <classpathentry kind="src" output="examples/mydvds-example/target/test-classes" path="examples/mydvds-example/src/test/java"/> <classpathentry excluding="**" kind="src" output="examples/mydvds-example/target/classes" path="examples/mydvds-example/src/main/resources"/> <classpathentry excluding="**" kind="src" output="examples/mydvds-example/target/classes" path="examples/mydvds-example/src/main/webapp"/> + <classpathentry kind="src" output="examples/mydvds-example/target/test-classes" path="examples/mydvds-example/src/test/java"/> <classpathentry excluding="**" kind="src" output="examples/mydvds-example/target/test-classes" path="examples/mydvds-example/src/test/resources"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/modules/profiles[examples,integration]"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> <classpathentry kind="output" path="target/classes"/> </classpath>
Modified: trunk/examples/jruby-example/pom.xml (804 => 805)
--- trunk/examples/jruby-example/pom.xml 2008-09-03 11:33:44 UTC (rev 804) +++ trunk/examples/jruby-example/pom.xml 2008-09-03 12:23:58 UTC (rev 805) @@ -1,4 +1,5 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.codehaus.waffle</groupId> @@ -20,6 +21,21 @@ <build> <resources> <resource> + <directory>${basedir}/src/main/java</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.java</exclude> + </excludes> + </resource> + <resource> + <directory>${basedir}/src/main/resources</directory> + <filtering>true</filtering> + </resource> + <resource> + <directory>${basedir}/src/main/webapp</directory> + <filtering>false</filtering> + </resource> + <resource> <directory>src/main/ruby</directory> </resource> </resources> @@ -68,7 +84,7 @@ </execution> </executions> </plugin> - <plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>rspec-maven-plugin</artifactId> <version>1.0-beta-3-SNAPSHOT</version>
Modified: trunk/waffle-ruby/src/main/java/org/codehaus/waffle/bind/RubyViewDataBinder.java (804 => 805)
--- trunk/waffle-ruby/src/main/java/org/codehaus/waffle/bind/RubyViewDataBinder.java 2008-09-03 11:33:44 UTC (rev 804) +++ trunk/waffle-ruby/src/main/java/org/codehaus/waffle/bind/RubyViewDataBinder.java 2008-09-03 12:23:58 UTC (rev 805) @@ -3,6 +3,10 @@ */ package org.codehaus.waffle.bind; +import java.util.List; + +import javax.servlet.http.HttpServletRequest; + import org.codehaus.waffle.controller.ScriptedController; import org.codehaus.waffle.monitor.BindMonitor; import org.jruby.javasupport.JavaEmbedUtils; @@ -10,9 +14,6 @@ import org.jruby.runtime.builtin.InstanceVariables; import org.jruby.runtime.builtin.Variable; -import javax.servlet.http.HttpServletRequest; -import java.util.List; - /** * ScriptedViewDataBinder implementation which handles request via IRubyObject instance_variables. * @@ -25,7 +26,6 @@ super(bindMonitor); } - @SuppressWarnings( { "unchecked" }) protected void handleScriptController(HttpServletRequest request, ScriptedController rubyController) { IRubyObject iRubyObject = (IRubyObject) rubyController.getScriptObject(); InstanceVariables instanceVariables = iRubyObject.getInstanceVariables();
Modified: trunk/waffle-ruby/src/main/java/org/codehaus/waffle/registrar/pico/RubyScriptComponentAdapter.java (804 => 805)
--- trunk/waffle-ruby/src/main/java/org/codehaus/waffle/registrar/pico/RubyScriptComponentAdapter.java 2008-09-03 11:33:44 UTC (rev 804) +++ trunk/waffle-ruby/src/main/java/org/codehaus/waffle/registrar/pico/RubyScriptComponentAdapter.java 2008-09-03 12:23:58 UTC (rev 805) @@ -19,6 +19,7 @@ * * @author Michael Ward */ [EMAIL PROTECTED]("unchecked") public class RubyScriptComponentAdapter implements ComponentAdapter { private final Object componentKey; private final String rubyClassName;
Modified: trunk/waffle-ruby/src/test/java/org/codehaus/waffle/controller/RubyControllerDefinitionFactoryTest.java (804 => 805)
--- trunk/waffle-ruby/src/test/java/org/codehaus/waffle/controller/RubyControllerDefinitionFactoryTest.java 2008-09-03 11:33:44 UTC (rev 804) +++ trunk/waffle-ruby/src/test/java/org/codehaus/waffle/controller/RubyControllerDefinitionFactoryTest.java 2008-09-03 12:23:58 UTC (rev 805) @@ -34,7 +34,7 @@ final ContextContainer contextContainer = mockery.mock(ContextContainer.class); mockery.checking(new Expectations() { { - IRubyObject rubyObject = JavaUtil.convertJavaToRuby(Ruby.getDefaultInstance(), "Hello From Ruby"); + IRubyObject rubyObject = JavaUtil.convertJavaToRuby(Ruby.newInstance(), "Hello From Ruby"); one(contextContainer).getComponentInstance("foobar"); will(returnValue(new RubyController(rubyObject))); }
Modified: trunk/waffle-ruby/src/test/java/org/codehaus/waffle/registrar/pico/RubyScriptComponentAdapterTest.java (804 => 805)
--- trunk/waffle-ruby/src/test/java/org/codehaus/waffle/registrar/pico/RubyScriptComponentAdapterTest.java 2008-09-03 11:33:44 UTC (rev 804) +++ trunk/waffle-ruby/src/test/java/org/codehaus/waffle/registrar/pico/RubyScriptComponentAdapterTest.java 2008-09-03 12:23:58 UTC (rev 805) @@ -15,7 +15,7 @@ @Test public void testComponentKeyAndImplementationMethods() { - ComponentAdapter componentAdapter = new RubyScriptComponentAdapter("foobar", "'ruby script'"); + ComponentAdapter<?> componentAdapter = new RubyScriptComponentAdapter("foobar", "'ruby script'"); assertEquals("foobar", componentAdapter.getComponentKey()); assertEquals(IRubyObject.class, componentAdapter.getComponentImplementation()); } @@ -39,7 +39,7 @@ "end"; runtime.evalScriptlet(script); - ComponentAdapter componentAdapter = new RubyScriptComponentAdapter("foo_bar", "FooBar"); + ComponentAdapter<?> componentAdapter = new RubyScriptComponentAdapter("foo_bar", "FooBar"); MutablePicoContainer picoContainer = new DefaultPicoContainer(new Caching()); picoContainer.addComponent(Ruby.class, runtime);
To unsubscribe from this list please visit:
