[servicemix-scm] updated to latest snapshot of drools and re-enabled the test case

[jstrachan]

Commit in servicemix/base on MAIN
src/main/java/org/servicemix/components/drools/dsl/JaxenCondition.java	+7	-6	1.1 -> 1.2
project.xml		-3	1.63 -> 1.64
	+7	-9

2 modified files

updated to latest snapshot of drools and re-enabled the test case

---

servicemix/base/src/main/java/org/servicemix/components/drools/dsl

JaxenCondition.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- JaxenCondition.java	26 Jul 2005 18:58:44 -0000	1.1
+++ JaxenCondition.java	5 Aug 2005 11:12:41 -0000	1.2
@@ -1,4 +1,4 @@

-/** 

+/**

  * 
  * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com
  * 

@@ -31,11 +31,12 @@

 import javax.jbi.messaging.MessagingException;
 import java.util.Iterator;
 import java.util.List;

+import java.util.Collection;

 
 /**
  * Represents a Jaxen based condition using the W3C DOM.
  *

- * @version $Revision: 1.1 $

+ * @version $Revision: 1.2 $

  */
 public class JaxenCondition implements Condition {
     private Rule rule;

@@ -47,14 +48,14 @@

     }
 
     public Declaration[] getRequiredTupleMembers() {

-        List list = rule.getParameterDeclarations();

+        Collection list = rule.getParameterDeclarations();

         Declaration[] answer = new Declaration[list.size()];
         list.toArray(answer);
         return answer;
     }
 

-    public boolean isAllowed(Tuple tuple) throws ConditionException {
-        List list = rule.getParameterDeclarations();

+    public boolean isAllowed(Tuple tuple) {
+        List list = (List) rule.getParameterDeclarations();

         WorkingMemory memory = tuple.getWorkingMemory();
         JaxenVariableContext variableContext = _expression_.getVariableContext();
         variableContext.setVariables(null);

@@ -72,7 +73,7 @@

             return _expression_.matches(exchange, message);
         }
         catch (MessagingException e) {

-            throw new ConditionException(e);

+            throw new RuntimeException(e);

         }
     }
 

---

servicemix/base

project.xml 1.63 -> 1.64

diff -u -r1.63 -r1.64
--- project.xml	2 Aug 2005 12:50:20 -0000	1.63
+++ project.xml	5 Aug 2005 11:12:41 -0000	1.64
@@ -932,9 +932,6 @@

         <exclude>**/ScriptTest.*</exclude>
         <exclude>**/ReflectionBindingTest.*</exclude>
 

-        <!-- enable when Drools 2.1-SNAPSHOT available -->
-        <exclude>**/DroolsWithJbiRulesTest.*</exclude>
-

         <!-- need a jabber test server... -->
         <exclude>**/JabberGroupChatTest.*</exclude>
         <exclude>**/JabberChatWithActiveMQTest.*</exclude>

CVSspam 0.2.8