[jboss-svn-commits] JBL Code SVN: r35985 - in labs/jbossrules/trunk/drools-server/src: test/java/org/drools/server and 1 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Mon Nov 15 20:11:25 EST 2010


Author: mark.proctor at jboss.com
Date: 2010-11-15 20:11:24 -0500 (Mon, 15 Nov 2010)
New Revision: 35985

Modified:
   labs/jbossrules/trunk/drools-server/src/main/resources/camel-client.xml
   labs/jbossrules/trunk/drools-server/src/main/resources/test.drl
   labs/jbossrules/trunk/drools-server/src/test/java/org/drools/server/CxfRsClientServerTest.java
   labs/jbossrules/trunk/drools-server/src/test/java/org/drools/server/CxfSoapClientServerTest.java
   labs/jbossrules/trunk/drools-server/src/test/resources/camel-embedded-server-test.xml
Log:
JBRULES-2746 Drools Grid Impl2
-drools server now works again

Modified: labs/jbossrules/trunk/drools-server/src/main/resources/camel-client.xml
===================================================================
--- labs/jbossrules/trunk/drools-server/src/main/resources/camel-client.xml	2010-11-16 01:04:42 UTC (rev 35984)
+++ labs/jbossrules/trunk/drools-server/src/main/resources/camel-client.xml	2010-11-16 01:11:24 UTC (rev 35985)
@@ -28,7 +28,7 @@
 
   
   <!-- Leave this, as it's needed to make Camel "drools" aware -->
-  <bean id="droolsPolicy" class="org.drools.camel.component.DroolsPolicy" />  
+  <bean id="droolsPolicy" class="org.drools.camel.component.DroolsPolicy" />          
     
   <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
       

Modified: labs/jbossrules/trunk/drools-server/src/main/resources/test.drl
===================================================================
--- labs/jbossrules/trunk/drools-server/src/main/resources/test.drl	2010-11-16 01:04:42 UTC (rev 35984)
+++ labs/jbossrules/trunk/drools-server/src/main/resources/test.drl	2010-11-16 01:11:24 UTC (rev 35985)
@@ -23,7 +23,7 @@
 
 rule "echo" dialect "mvel"
 when
-    $m : Message();
+    $m : Message()
 then
     $m.text = "echo:" + $m.text;
 end
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-server/src/test/java/org/drools/server/CxfRsClientServerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-server/src/test/java/org/drools/server/CxfRsClientServerTest.java	2010-11-16 01:04:42 UTC (rev 35984)
+++ labs/jbossrules/trunk/drools-server/src/test/java/org/drools/server/CxfRsClientServerTest.java	2010-11-16 01:11:24 UTC (rev 35985)
@@ -16,34 +16,30 @@
 
 package org.drools.server;
 
+import junit.framework.TestCase;
+
 import org.apache.camel.CamelContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-import junit.framework.TestCase;
-
 public class CxfRsClientServerTest extends TestCase {
-    
     public void test1() throws Exception {
-    }
-    
-    public void FIXMEtest1() throws Exception {
-        ClassPathXmlApplicationContext springContext = new ClassPathXmlApplicationContext("classpath:beans-test.xml");
-        
+        ClassPathXmlApplicationContext springContext = new ClassPathXmlApplicationContext( "classpath:beans-test.xml" );
+
         String cmd = "";
         cmd += "<batch-execution lookup=\"ksession1\">\n";
         cmd += "  <insert out-identifier=\"message\">\n";
         cmd += "      <org.test.Message>\n";
-        cmd += "         <text>Helllo World</text>\n";
+        cmd += "         <text>Hello World</text>\n";
         cmd += "      </org.test.Message>\n";
         cmd += "   </insert>\n";
         cmd += "</batch-execution>\n";
-               
+
         Test test = new Test();
         String response = test.execute( cmd,
-                                        ( CamelContext ) springContext.getBean( "camel-client-ctx" ) );
-        
+                                        (CamelContext) springContext.getBean( "camel-client-ctx" ) );
+
         assertTrue( response.contains( "execution-results" ) );
-        assertTrue( response.contains( "echo" ) ); 
+        assertTrue( response.contains( "echo" ) );
     }
-    
+
 }

Modified: labs/jbossrules/trunk/drools-server/src/test/java/org/drools/server/CxfSoapClientServerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-server/src/test/java/org/drools/server/CxfSoapClientServerTest.java	2010-11-16 01:04:42 UTC (rev 35984)
+++ labs/jbossrules/trunk/drools-server/src/test/java/org/drools/server/CxfSoapClientServerTest.java	2010-11-16 01:11:24 UTC (rev 35985)
@@ -28,34 +28,34 @@
 
 public class CxfSoapClientServerTest extends TestCase {
 
-	public void test1() throws Exception {
-	}
-	
-	public void FIXMEtest1() throws Exception {
-		ClassPathXmlApplicationContext springContext = new ClassPathXmlApplicationContext("classpath:beans-test.xml");
+    public void test1() throws Exception {
+        ClassPathXmlApplicationContext springContext = new ClassPathXmlApplicationContext( "classpath:beans-test.xml" );
 
-		SOAPMessage soapMessage = MessageFactory.newInstance().createMessage();
-		SOAPBody body = soapMessage.getSOAPPart().getEnvelope().getBody();
-		QName payloadName = new QName("http://soap.jax.drools.org", "execute", "ns1");
+        SOAPMessage soapMessage = MessageFactory.newInstance().createMessage();
+        SOAPBody body = soapMessage.getSOAPPart().getEnvelope().getBody();
+        QName payloadName = new QName( "http://soap.jax.drools.org",
+                                       "execute",
+                                       "ns1" );
 
-		body.addBodyElement(payloadName);
+        body.addBodyElement( payloadName );
 
-		String cmd = "";
-		cmd += "<batch-execution lookup=\"ksession1\">\n";
-		cmd += "  <insert out-identifier=\"message\">\n";
-		cmd += "      <org.test.Message>\n";
-		cmd += "         <text>Helllo World</text>\n";
-		cmd += "      </org.test.Message>\n";
-		cmd += "   </insert>\n";
-		cmd += "</batch-execution>\n";
+        String cmd = "";
+        cmd += "<batch-execution lookup=\"ksession1\">\n";
+        cmd += "  <insert out-identifier=\"message\">\n";
+        cmd += "      <org.test.Message>\n";
+        cmd += "         <text>Helllo World</text>\n";
+        cmd += "      </org.test.Message>\n";
+        cmd += "   </insert>\n";
+        cmd += "</batch-execution>\n";
 
-		body.addTextNode(cmd);
+        body.addTextNode( cmd );
 
-		Test test = new Test();
-		String response = test.execute( soapMessage, ( CamelContext ) springContext.getBean( "camel-client-ctx" ) );
+        Test test = new Test();
+        String response = test.execute( soapMessage,
+                                        (CamelContext) springContext.getBean( "camel-client-ctx" ) );
 
-		assertTrue( response.contains( "execution-results" ) );
-		assertTrue( response.contains( "echo" ) ); 
-	}
+        assertTrue( response.contains( "execution-results" ) );
+        assertTrue( response.contains( "echo" ) );
+    }
 
 }

Modified: labs/jbossrules/trunk/drools-server/src/test/resources/camel-embedded-server-test.xml
===================================================================
--- labs/jbossrules/trunk/drools-server/src/test/resources/camel-embedded-server-test.xml	2010-11-16 01:04:42 UTC (rev 35984)
+++ labs/jbossrules/trunk/drools-server/src/test/resources/camel-embedded-server-test.xml	2010-11-16 01:11:24 UTC (rev 35985)
@@ -30,8 +30,7 @@
 	<import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml"/>
 	<import resource="classpath:META-INF/cxf/cxf-extension-soap.xml"/>
 	<import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml"/>
-
-
+    
   <cxf:rsServer id="rsServer"  
                 address="http://localhost:9002/rest"
                 serviceClass="org.drools.jax.rs.CommandExecutorImpl">



More information about the jboss-svn-commits mailing list