[waffle-scm] [789] trunk/examples/jruby-example/src/main/webapp: one step closer to getting jruby-example up and running with latest JRuby and Pico

Thu, 28 Aug 2008 12:29:27 -0700

Title: [waffle-scm] [789] trunk/examples/jruby-example/src/main/webapp: one step closer to getting jruby-example up and running with latest JRuby and Pico

Diff

Modified: trunk/examples/jruby-example/src/main/java/org/codehaus/waffle/example/jruby/JRubyRegistrar.java (788 => 789)

--- trunk/examples/jruby-example/src/main/java/org/codehaus/waffle/example/jruby/JRubyRegistrar.java	2008-08-27 14:44:50 UTC (rev 788)
+++ trunk/examples/jruby-example/src/main/java/org/codehaus/waffle/example/jruby/JRubyRegistrar.java	2008-08-28 04:14:57 UTC (rev 789)
@@ -1,13 +1,12 @@
 package org.codehaus.waffle.example.jruby;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.codehaus.waffle.context.pico.RubyScriptLoader;
 import org.codehaus.waffle.example.jruby.dao.SimplePersonDAO;
 import org.codehaus.waffle.registrar.AbstractScriptedRegistrar;
 import org.codehaus.waffle.registrar.Registrar;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class JRubyRegistrar extends AbstractScriptedRegistrar {
 
     public JRubyRegistrar(Registrar delegate) {
@@ -31,6 +30,6 @@
 
     @Override
     public void request() {
-        register(RubyScriptLoader.class);
+        register(RubyScriptReloader.class);
     }
 }

Added: trunk/examples/jruby-example/src/main/webapp/errors.rhtml (0 => 789)

--- trunk/examples/jruby-example/src/main/webapp/errors.rhtml	                        (rev 0)
+++ trunk/examples/jruby-example/src/main/webapp/errors.rhtml	2008-08-28 04:14:57 UTC (rev 789)
@@ -0,0 +1 @@
+fixme

Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/context/pico/PicoContextContainerFactory.java (788 => 789)

--- trunk/waffle-core/src/main/java/org/codehaus/waffle/context/pico/PicoContextContainerFactory.java	2008-08-27 14:44:50 UTC (rev 788)
+++ trunk/waffle-core/src/main/java/org/codehaus/waffle/context/pico/PicoContextContainerFactory.java	2008-08-28 04:14:57 UTC (rev 789)
@@ -11,10 +11,13 @@
 import org.codehaus.waffle.monitor.ContextMonitor;
 import org.codehaus.waffle.monitor.RegistrarMonitor;
 import org.codehaus.waffle.registrar.Registrar;
+import org.codehaus.waffle.registrar.pico.ParameterResolver;
 import org.codehaus.waffle.registrar.pico.PicoRegistrar;
-import org.codehaus.waffle.registrar.pico.ParameterResolver;
-import org.picocontainer.*;
-import org.picocontainer.behaviors.Caching;
+import org.picocontainer.ComponentMonitor;
+import org.picocontainer.DefaultPicoContainer;
+import org.picocontainer.LifecycleStrategy;
+import org.picocontainer.MutablePicoContainer;
+import org.picocontainer.PicoContainer;
 import org.picocontainer.monitors.NullComponentMonitor;
 
 import javax.servlet.http.HttpServletRequest;

Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/PicoRegistrar.java (788 => 789)

--- trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/PicoRegistrar.java	2008-08-27 14:44:50 UTC (rev 788)
+++ trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/PicoRegistrar.java	2008-08-28 04:14:57 UTC (rev 789)
@@ -3,26 +3,24 @@
  */
 package org.codehaus.waffle.registrar.pico;
 
-import static org.picocontainer.Characteristics.NO_CACHE;
-import static org.picocontainer.Characteristics.CACHE;
-
-import java.util.List;
-import java.util.Properties;
-
 import org.codehaus.waffle.monitor.RegistrarMonitor;
 import org.codehaus.waffle.registrar.Registrar;
 import org.codehaus.waffle.registrar.RegistrarException;
 import org.codehaus.waffle.registrar.ScriptedRegistrar;
+import static org.picocontainer.Characteristics.CACHE;
+import static org.picocontainer.Characteristics.NO_CACHE;
 import org.picocontainer.ComponentAdapter;
 import org.picocontainer.ComponentMonitor;
 import org.picocontainer.InjectionFactory;
 import org.picocontainer.LifecycleStrategy;
 import org.picocontainer.MutablePicoContainer;
 import org.picocontainer.Parameter;
-import org.picocontainer.behaviors.Cached;
 import org.picocontainer.injectors.ConstructorInjection;
 import org.picocontainer.injectors.SetterInjection;
 
+import java.util.List;
+import java.util.Properties;
+
 /**
  * This Registrar is backed by PicoContainer for managing Dependency Injection.  This registrar
  * is passed to the custom registrar defined in the web.xml as a delegate.
@@ -38,8 +36,11 @@
     private final ComponentMonitor componentMonitor;
     private Injection injection = Injection.CONSTRUCTOR;
 
-    public PicoRegistrar(MutablePicoContainer picoContainer, ParameterResolver parameterResolver,
-            LifecycleStrategy lifecycleStrategy, RegistrarMonitor registrarMonitor, ComponentMonitor componentMonitor) {
+    public PicoRegistrar(MutablePicoContainer picoContainer,
+                         ParameterResolver parameterResolver,
+                         LifecycleStrategy lifecycleStrategy,
+                         RegistrarMonitor registrarMonitor,
+                         ComponentMonitor componentMonitor) {
         this.picoContainer = picoContainer;
         this.parameterResolver = parameterResolver;
         this.lifecycleStrategy = lifecycleStrategy;

Modified: trunk/waffle-ruby/src/main/java/org/codehaus/waffle/context/pico/RubyPicoContextContainerFactory.java (788 => 789)

--- trunk/waffle-ruby/src/main/java/org/codehaus/waffle/context/pico/RubyPicoContextContainerFactory.java	2008-08-27 14:44:50 UTC (rev 788)
+++ trunk/waffle-ruby/src/main/java/org/codehaus/waffle/context/pico/RubyPicoContextContainerFactory.java	2008-08-28 04:14:57 UTC (rev 789)
@@ -10,6 +10,7 @@
 import org.codehaus.waffle.monitor.RegistrarMonitor;
 import org.codehaus.waffle.registrar.pico.ParameterResolver;
 import org.jruby.Ruby;
+import static org.picocontainer.Characteristics.CACHE;
 import org.picocontainer.MutablePicoContainer;
 
 import java.io.BufferedReader;
@@ -20,8 +21,10 @@
 
 public class RubyPicoContextContainerFactory extends ScriptedPicoContextContainerFactory {
 
-    public RubyPicoContextContainerFactory(MessageResources messageResources, ContextMonitor contextMonitor,
-            RegistrarMonitor registrarMonitor, ParameterResolver parameterResolver) {
+    public RubyPicoContextContainerFactory(MessageResources messageResources,
+                                           ContextMonitor contextMonitor,
+                                           RegistrarMonitor registrarMonitor,
+                                           ParameterResolver parameterResolver) {
         super(messageResources, contextMonitor, registrarMonitor, parameterResolver);
     }
 
@@ -41,7 +44,7 @@
         // (IOError)
 
         picoContainer.addComponent(Ruby.class, runtime);
-        picoContainer.addComponent(RubyScriptLoader.class);
+        picoContainer.as(CACHE).addComponent(RubyScriptLoader.class);
     }
 
     private void loadRubyScriptFromClassLoader(String fileName, Ruby runtime) {

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to