[jboss-cvs] jboss-seam/src/main/org/jboss/seam/drools ...

[Gavin King]

  User: gavin   
  Date: 07/07/27 02:23:06

  Modified:    src/main/org/jboss/seam/drools    ManagedWorkingMemory.java
                        RuleBase.java SeamGlobalResolver.java
  Log:
  update to GA API
  
  Revision  Changes    Path
  1.15      +3 -3      jboss-seam/src/main/org/jboss/seam/drools/ManagedWorkingMemory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ManagedWorkingMemory.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/drools/ManagedWorkingMemory.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- ManagedWorkingMemory.java	10 Jul 2007 08:57:36 -0000	1.14
  +++ ManagedWorkingMemory.java	27 Jul 2007 06:23:06 -0000	1.15
  @@ -65,7 +65,7 @@
         if (statefulSession==null)
         {
            statefulSession = getRuleBaseFromValueBinding().newStatefulSession();
  -         statefulSession.setGlobalResolver( createGlobalResolver() );
  +         statefulSession.setGlobalResolver( createGlobalResolver( statefulSession.getGlobalResolver() ) );
         }
         return statefulSession;
      }
  @@ -94,9 +94,9 @@
         return ruleBase;
      }
   
  -   protected GlobalResolver createGlobalResolver()
  +   protected GlobalResolver createGlobalResolver(GlobalResolver delegate)
      {
  -      return new SeamGlobalResolver();
  +      return new SeamGlobalResolver(delegate);
      }
      
      @Destroy
  
  
  
  1.14      +0 -2      jboss-seam/src/main/org/jboss/seam/drools/RuleBase.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RuleBase.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/drools/RuleBase.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- RuleBase.java	27 Jul 2007 03:49:49 -0000	1.13
  +++ RuleBase.java	27 Jul 2007 06:23:06 -0000	1.14
  @@ -3,13 +3,11 @@
   import java.io.InputStream;
   import java.io.InputStreamReader;
   import java.io.Reader;
  -import java.util.List;
   
   import org.drools.RuleBaseFactory;
   import org.drools.compiler.DroolsError;
   import org.drools.compiler.PackageBuilder;
   import org.drools.compiler.PackageBuilderConfiguration;
  -import org.drools.compiler.ParserError;
   import org.drools.compiler.RuleError;
   import org.jboss.seam.ScopeType;
   import org.jboss.seam.annotations.Create;
  
  
  
  1.2       +20 -13    jboss-seam/src/main/org/jboss/seam/drools/SeamGlobalResolver.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamGlobalResolver.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/drools/SeamGlobalResolver.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- SeamGlobalResolver.java	10 Jul 2007 08:57:36 -0000	1.1
  +++ SeamGlobalResolver.java	27 Jul 2007 06:23:06 -0000	1.2
  @@ -13,28 +13,35 @@
    */
   class SeamGlobalResolver implements GlobalResolver
   {
  -   public Object resolve(String name)
  +   private GlobalResolver delegate;
  +   
  +   public SeamGlobalResolver(GlobalResolver delegate)
  +   {
  +      this.delegate = delegate;
  +   }
  +
  +   public void setGlobal(String name, Object value)
  +   {
  +      //TODO: is this the right thing to do??
  +      //or: Contexts.getConversationContext().set(name, value);
  +      delegate.setGlobal(name, value);
  +   }
  +   
  +   public Object resolveGlobal(String name)
      {
         if ( !Contexts.isApplicationContextActive() )
         {
  -         //TODO: Drools should let us chain GlobalResolvers
  -         //return resolver.resolve(name)
  -         return null;
  +         return delegate.resolveGlobal(name);
         }
         else
         {
            Object instance = Component.getInstance(name);
            if (instance==null)
            {
  -            /*instance = resolver.resolve(name);
  -            if (instance==null)
  -            {*/
  -               return Init.instance().getRootNamespace().getChild(name);
  -            /*}
  -            else
  -            {
  -               return instance;
  -            }*/
  +            instance = delegate.resolveGlobal(name);
  +            return instance==null ?
  +                  Init.instance().getRootNamespace().getChild(name) :
  +                  instance;
            }
            else
            {