[jboss-svn-commits] JBL Code SVN: r33939 - in labs/jbossrules/trunk/drools-server/drools-server-app: src/main/java/org/drools/server and 4 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Fri Jul 16 08:41:28 EDT 2010


Author: mark.proctor at jboss.com
Date: 2010-07-16 08:41:27 -0400 (Fri, 16 Jul 2010)
New Revision: 33939

Added:
   labs/jbossrules/trunk/drools-server/drools-server-app/src/main/resources/WEB-INF/beans.xml
   labs/jbossrules/trunk/drools-server/drools-server-app/src/main/resources/WEB-INF/camel.xml
   labs/jbossrules/trunk/drools-server/drools-server-app/src/main/resources/WEB-INF/knowledge-services.xml
   labs/jbossrules/trunk/drools-server/drools-server-app/src/main/resources/WEB-INF/test.drl
   labs/jbossrules/trunk/drools-server/drools-server-app/src/main/resources/WEB-INF/web.xml
Removed:
   labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/drools/server/service/
   labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/pipeline/camel/server/
   labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/server/KnowledgeServiceBaseTest.java
   labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/server/examples/
   labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/server/service/
   labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/changesets/
   labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/configuration-test.xml
   labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/core-test.xml
   labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/model/
   labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/rules/
   labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/services-test.xml
   labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/sessions-test.xml
Modified:
   labs/jbossrules/trunk/drools-server/drools-server-app/pom.xml
Log:
JBRULES-2347 Camel
-migrating drools-server to camel

Modified: labs/jbossrules/trunk/drools-server/drools-server-app/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-app/pom.xml	2010-07-16 11:50:50 UTC (rev 33938)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/pom.xml	2010-07-16 12:41:27 UTC (rev 33939)
@@ -16,125 +16,164 @@
    </build>
    
    <dependencies>
-	<dependency>
-		<groupId>org.drools</groupId>
-		<artifactId>drools-camel</artifactId>
-		<version>${project.version}</version>
-		<exclusions>
-			<exclusion>
-				<groupId>xml-apis</groupId>
-				<artifactId>xml-apis</artifactId>
-			</exclusion>
-		</exclusions>
-	</dependency>
-	<dependency>
-		<groupId>org.drools</groupId>
-		<artifactId>drools-compiler</artifactId>
-	</dependency>
-	<dependency>
-		<groupId>org.drools</groupId>
-		<artifactId>drools-server-spring</artifactId>
-		<version>${project.version}</version>
-	</dependency>
-	<dependency>
-		<groupId>org.drools</groupId>
-		<artifactId>drools-spring</artifactId>
-		<exclusions>
-			<exclusion>
-				<groupId>org.drools</groupId>
-				<artifactId>drools-vsm</artifactId>
-			</exclusion>
-		</exclusions>
-	</dependency>
-    <!-- CXF deps -->
-	<dependency>
-		<groupId>org.apache.cxf</groupId>
-		<artifactId>cxf-rt-frontend-jaxws</artifactId>
-		<version>2.2.6</version>
-	</dependency>
-	<dependency>
-		<groupId>org.apache.cxf</groupId>
-		<artifactId>cxf-bundle-jaxrs</artifactId>
-		<version>2.2.6</version>
-		<exclusions>
-			<exclusion>
-				<groupId>xerces</groupId>
-				<artifactId>xercesImpl</artifactId>
-			</exclusion>
-			<exclusion>
-				<groupId>xerces</groupId>
-				<artifactId>xmlParserAPIs</artifactId>
-			</exclusion>
-			<exclusion>
-				<groupId>xml-apis</groupId>
-				<artifactId>xml-apis</artifactId>
-			</exclusion>
-			<exclusion>
-				<groupId>org.apache.geronimo.specs</groupId>
-				<artifactId>geronimo-servlet_2.5_spec</artifactId>
-			</exclusion>
-			<exclusion>
-				<groupId>jaxen</groupId>
-				<artifactId>jaxen</artifactId>
-			</exclusion>
-			<exclusion>
-				<groupId>org.apache.xmlbeans</groupId>
-				<artifactId>xmlbeans</artifactId>
-			</exclusion>
-		</exclusions>
-	</dependency>
 
-	<dependency>
-		<groupId>commons-httpclient</groupId>
-		<artifactId>commons-httpclient</artifactId>
-		<version>3.1</version>
-		<scope>test</scope>
-	</dependency>
-	
-	<dependency>
-		<groupId>org.springframework</groupId>
-		<artifactId>spring-test</artifactId>
-		<version>2.5.6</version>
-		<scope>test</scope>  
-	</dependency>  
+		<!-- Drools -->
+        <dependency>
+            <groupId>org.drools</groupId>
+            <artifactId>drools-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.drools</groupId>
+            <artifactId>drools-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.drools</groupId>
+            <artifactId>drools-compiler</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.drools</groupId>
+            <artifactId>drools-spring</artifactId>
+        </dependency>        				
+        <dependency>
+            <groupId>org.drools</groupId>
+            <artifactId>drools-grid-core</artifactId>
+        </dependency>
+		
+		 <!-- Camel -->
+         <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-spring</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test</artifactId>
+            <version>2.4-SNAPSHOT</version>
+        </dependency>                
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-cxf</artifactId>
+        </dependency>        
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-xstream</artifactId>
+        </dependency>     		
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-jaxb</artifactId>
+        </dependency>  
+         <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-core</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>		
+		
+		<!-- Spring -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring</artifactId>
+        </dependency>
+		
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-test</artifactId>
+			<scope>test</scope>  
+		</dependency>  		
+		
+	    <!-- CXF deps -->
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-frontend-jaxws</artifactId>
+			<version>2.2.6</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-bundle-jaxrs</artifactId>
+			<version>2.2.6</version>
+			<exclusions>
+				<exclusion>
+					<groupId>xerces</groupId>
+					<artifactId>xercesImpl</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>xerces</groupId>
+					<artifactId>xmlParserAPIs</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>xml-apis</groupId>
+					<artifactId>xml-apis</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.geronimo.specs</groupId>
+					<artifactId>geronimo-servlet_2.5_spec</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>jaxen</groupId>
+					<artifactId>jaxen</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.xmlbeans</groupId>
+					<artifactId>xmlbeans</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 
-	<dependency>
-		<groupId>org.jboss</groupId>
-		<artifactId>jboss-vfs</artifactId>
-		<version>2.1.3.GA</version>
-		<scope>provided</scope>
-	</dependency>
+		<dependency>
+			<groupId>commons-httpclient</groupId>
+			<artifactId>commons-httpclient</artifactId>
+			<version>3.1</version>
+			<scope>test</scope>
+		</dependency>	
 
-	<dependency>
-		<groupId>com.sun.xml.bind</groupId>
-		<artifactId>jaxb-impl</artifactId>
-<!--		<optional>true</optional>-->
-	</dependency>
+		<dependency>
+			<groupId>com.sun.xml.bind</groupId>
+			<artifactId>jaxb-impl</artifactId>
+		     <optional>true</optional>
+		</dependency>
 
-	<dependency>
-		<groupId>com.sun.xml.bind</groupId>
-		<artifactId>jaxb-xjc</artifactId>
-<!--		<optional>true</optional>-->
-	</dependency>
+		<dependency>
+			<groupId>com.sun.xml.bind</groupId>
+			<artifactId>jaxb-xjc</artifactId>
+			<optional>true</optional>
+		</dependency>
 
-	<dependency>
-		<groupId>junit</groupId>
-		<artifactId>junit</artifactId>
-		<version>4.4</version>
-		<scope>test</scope>  
-	</dependency> 
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.4</version>
+			<scope>test</scope>  
+		</dependency> 
+		
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+		</dependency>		
 
-	<dependency>
-	  	<groupId>org.slf4j</groupId>
-	  	<artifactId>slf4j-log4j12</artifactId>
-	</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<scope>test</scope>
+		</dependency>	
 
-	<!-- web app deps -->
+
 	<dependency>
-		<groupId>javax.servlet</groupId>
-		<artifactId>servlet-api</artifactId>
-		<scope>provided</scope>  
+		<groupId>org.jboss</groupId>
+		<artifactId>jboss-vfs</artifactId>
+		<version>2.1.3.GA</version>
+		<scope>provided</scope>
 	</dependency>
+		
+		
+		<!-- web app deps -->
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<scope>provided</scope>  
+		</dependency>		
 	  
    </dependencies>
    

Added: labs/jbossrules/trunk/drools-server/drools-server-app/src/main/resources/WEB-INF/beans.xml
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-app/src/main/resources/WEB-INF/beans.xml	                        (rev 0)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/main/resources/WEB-INF/beans.xml	2010-07-16 12:41:27 UTC (rev 33939)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:context="http://www.springframework.org/schema/context"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd"
+    default-autowire="byName">
+
+
+	<!-- loads the kbases and ksessions into the ApplicationContext -->
+	<import resource="classpath:services-test.xml" />
+	
+	<!-- Builds the routes that makes the ksessesions available as services -->
+	<import resource="classpath:knowledge-services.xml" />
+
+
+</beans>
\ No newline at end of file

Added: labs/jbossrules/trunk/drools-server/drools-server-app/src/main/resources/WEB-INF/camel.xml
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-app/src/main/resources/WEB-INF/camel.xml	                        (rev 0)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/main/resources/WEB-INF/camel.xml	2010-07-16 12:41:27 UTC (rev 33939)
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:cxf="http://camel.apache.org/schema/cxf"
+       xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+       xsi:schemaLocation="
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+       http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd
+       http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd
+       http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
+    ">
+
+  <!--
+   !   Define the server end point.
+   !   Copy and paste this element, changing id and the path for the address to expose services on different urls.
+   !   Different Camel routes can handle different end point paths.
+    --> 
+  <cxf:rsServer id="rsServer"  
+                address="/"
+                serviceClass="org.drools.jax.rs.CommandExecutorImpl">
+       <cxf:providers>
+           <bean class="org.drools.jax.rs.CommandMessageBodyReader"/>
+       </cxf:providers>
+  </cxf:rsServer>  
+  
+  <!-- Leave this, as it's needed to make Camel "drools" aware -->
+  <bean id="droolsPolicy" class="org.drools.camel.component.DroolsPolicy" />  
+    
+  <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
+    
+    <!-- 
+     ! Routes incoming messages from end point id="rsServer"
+     ! Example route unmarshals the messages with xstream and executes against ksession1
+     ! Copy and paste this element, changing marsalls and the to uri, to target different sessions, as needed
+     !-->
+     
+    <route>
+       <from uri="cxfrs://bean://rsServer"/>
+       <policy ref="droolsPolicy">
+	       <unmarshal ref="xstream" />       
+	       <to uri="drools:node1/ksession1" />
+	       <marshal ref="xstream" />
+       </policy>
+    </route>    
+        
+  </camelContext>
+  
+</beans>

Added: labs/jbossrules/trunk/drools-server/drools-server-app/src/main/resources/WEB-INF/knowledge-services.xml
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-app/src/main/resources/WEB-INF/knowledge-services.xml	                        (rev 0)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/main/resources/WEB-INF/knowledge-services.xml	2010-07-16 12:41:27 UTC (rev 33939)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:drools="http://drools.org/schema/drools-spring"       
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+                           http://drools.org/schema/drools-spring http://drools.org/schema/drools-spring.xsd">
+	
+	<drools:execution-node id="node1" />
+
+	<drools:kbase id="kbase1" node="node1">
+	    <drools:resources>
+            <drools:resource  type="DRL" source="classpath:test.drl"/>
+		</drools:resources>						
+	</drools:kbase>
+	
+	<drools:ksession id="ksession1" type="stateless" kbase="kbase1" node="node1"/>	
+
+</beans>
\ No newline at end of file

Added: labs/jbossrules/trunk/drools-server/drools-server-app/src/main/resources/WEB-INF/test.drl
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-app/src/main/resources/WEB-INF/test.drl	                        (rev 0)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/main/resources/WEB-INF/test.drl	2010-07-16 12:41:27 UTC (rev 33939)
@@ -0,0 +1,13 @@
+package  org.test
+
+declare Message
+    text : String
+end
+    
+
+rule "echo" dialect "mvel"
+when
+    $m : Message();
+then
+    $m.text = "echo:" + $m.text;
+end
\ No newline at end of file

Added: labs/jbossrules/trunk/drools-server/drools-server-app/src/main/resources/WEB-INF/web.xml
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-app/src/main/resources/WEB-INF/web.xml	                        (rev 0)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/main/resources/WEB-INF/web.xml	2010-07-16 12:41:27 UTC (rev 33939)
@@ -0,0 +1,26 @@
+<web-app>
+	<context-param>
+		<param-name>contextConfigLocation</param-name>
+		<param-value>WEB-INF/beans.xml</param-value>
+	</context-param>
+
+	<listener>
+		<listener-class>
+			org.springframework.web.context.ContextLoaderListener
+		</listener-class>
+	</listener>
+
+	<servlet>
+		<servlet-name>CXFServlet</servlet-name>
+		<display-name>CXF Servlet</display-name>
+		<servlet-class>
+			org.apache.cxf.transport.servlet.CXFServlet
+		</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>KnowledgeService</servlet-name>
+		<url-pattern>/kservice/*</url-pattern>
+	</servlet-mapping>
+</web-app>

Deleted: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/server/KnowledgeServiceBaseTest.java
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/server/KnowledgeServiceBaseTest.java	2010-07-16 11:50:50 UTC (rev 33938)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/server/KnowledgeServiceBaseTest.java	2010-07-16 12:41:27 UTC (rev 33939)
@@ -1,48 +0,0 @@
-package org.drools.server;
-
-import junit.framework.TestCase;
-
-public abstract class KnowledgeServiceBaseTest extends TestCase {
-
-    public String getJaxbCommand() throws Exception {
-        String cmd = "";
-        cmd += "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n";
-        cmd += "<batch-execution lookup='ksession1' xmlns:ns2='http://drools.org/model'>\n";
-        cmd += "    <insert out-identifier='lucaz'>\n";
-        cmd += "        <object xsi:type='ns2:person' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>\n";
-        cmd += "            <ns2:name>lucaz</ns2:name>\n";
-        cmd += "            <ns2:age>25</ns2:age>\n";
-        cmd += "        </object>\n";
-        cmd += "    </insert>\n";
-        cmd += "    <insert out-identifier='baunax'>\n";
-        cmd += "        <object xsi:type='ns2:person' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>\n";
-        cmd += "            <ns2:name>baunax</ns2:name>\n";
-        cmd += "            <ns2:age>21</ns2:age>\n";
-        cmd += "        </object>\n";
-        cmd += "    </insert>\n";
-        cmd += "    <query name='persons' out-identifier='persons'/>\n";
-        cmd += "    <fire-all-rules max='-1'/>\n";
-        cmd += "</batch-execution>\n";
-        return cmd;
-    }
-
-    public String getXStreamCommand() {
-        String cmd = "";
-        cmd += "<batch-execution lookup='ksession2'>\n";
-        cmd += "   <insert out-identifier='baunax'>\n";
-        cmd += "      <org.drools.pipeline.camel.server.Person>\n";
-        cmd += "         <name>baunax</name>\n";
-        cmd += "      </org.drools.pipeline.camel.server.Person>\n";
-        cmd += "   </insert>\n";
-        cmd += "   <insert out-identifier='lucaz'>\n";
-        cmd += "      <org.drools.pipeline.camel.server.Person>\n";
-        cmd += "         <name>lucaz</name>\n";
-        cmd += "      </org.drools.pipeline.camel.server.Person>\n";
-        cmd += "   </insert>\n";
-        cmd += "   <query name='persons' out-identifier='persons'/>\n";
-        cmd += "   <fire-all-rules/>\n";
-        cmd += "</batch-execution>\n";
-        return cmd;
-    }
-
-}

Deleted: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/configuration-test.xml
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/configuration-test.xml	2010-07-16 11:50:50 UTC (rev 33938)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/configuration-test.xml	2010-07-16 12:41:27 UTC (rev 33939)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd"
-    default-autowire="byName">
-
-	<import resource="classpath:sessions-test.xml" />
-	<import resource="classpath:services-test.xml" />
-	<import resource="classpath:core-test.xml" />
-
-</beans>
\ No newline at end of file

Deleted: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/core-test.xml
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/core-test.xml	2010-07-16 11:50:50 UTC (rev 33938)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/core-test.xml	2010-07-16 12:41:27 UTC (rev 33939)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xmlns:cxf="http://cxf.apache.org/core"
-    xmlns:jaxws="http://cxf.apache.org/jaxws"
-    xmlns:jaxrs="http://cxf.apache.org/jaxrs"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
-        http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
-        http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
-        http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd"
-    default-autowire="byName">
-
-    <!-- Load CXF modules from cxf.jar -->
-    <import resource="classpath:META-INF/cxf/cxf.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
-    
-    <bean id="knowledgeServiceSoapImpl" class="org.drools.server.service.KnowledgeServiceSoapImpl">
-    	<property name="service">
-			<ref bean="service" />
-		</property>
-    </bean>
-
-    <!-- Service endpoint -->
-    <jaxws:endpoint id="knowledgeServiceSoap"
-            implementorClass="org.drools.server.service.KnowledgeServiceSoapImpl"
-            implementor="#knowledgeServiceSoapImpl"
-            address="/soap">
-    </jaxws:endpoint>
-    
-    <jaxrs:server id="knowledgeServiceRest" address="/">
-        <jaxrs:serviceBeans>
-            <ref bean="knowledgeServiceRestImpl" />
-        </jaxrs:serviceBeans>
-    </jaxrs:server>
-
-    <bean id="knowledgeServiceRestImpl" class="org.drools.server.service.KnowledgeServiceRest" >
-    	<property name="service">
-			<ref bean="service" />
-		</property>
-    </bean>
-    
-</beans>
\ No newline at end of file

Deleted: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/services-test.xml
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/services-test.xml	2010-07-16 11:50:50 UTC (rev 33938)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/services-test.xml	2010-07-16 12:41:27 UTC (rev 33939)
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xmlns:camel="http://camel.apache.org/schema/spring"
-    xmlns:drools-service="http://drools.org/schema/drools-service-spring"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
-		http://drools.org/schema/drools-service-spring http://drools.org/schema/drools-service-spring.xsd
-		http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd"
-    default-autowire="byName">
-    
-	<!-- Only needed to deploy on JBoss AS 5.X -->    
-<!--    <bean id="jbossResolver" class="org.apache.camel.jboss.JBossPackageScanClassResolver"/>-->
-    
-    <!-- This camel context bean is required -->
-	<camelContext id="executionContext" xmlns="http://camel.apache.org/schema/spring" />
-
-	<drools-service:configuration id="service-conf-2" marshaller="XSTREAM" session="ksession2" />
-	
-	<drools-service:definition id="service" node="node1" camelContext="executionContext">
-		<drools-service:configuration marshaller="JAXB" session="ksession1">
-			<drools-service:class>org.drools.model.Person</drools-service:class>
-			<drools-service:startup-command>
-				<![CDATA[
-				<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-				<batch-execution lookup="ksession1" xmlns:ns2="http://drools.org/model">
-				    <insert out-identifier="santa">
-				        <object xsi:type="ns2:person" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-				            <ns2:name>santa</ns2:name>
-				            <ns2:age>99</ns2:age>
-				        </object>
-				    </insert>
-				</batch-execution>
-	  	   		]]>
-			</drools-service:startup-command>
-		</drools-service:configuration>
-		<drools-service:configuration-ref id="service-conf-2" />
-	</drools-service:definition>
-	
-</beans>
\ No newline at end of file

Deleted: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/sessions-test.xml
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/sessions-test.xml	2010-07-16 11:50:50 UTC (rev 33938)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/sessions-test.xml	2010-07-16 12:41:27 UTC (rev 33939)
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xmlns:drools="http://drools.org/schema/drools-spring"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
-		http://drools.org/schema/drools-spring http://drools.org/schema/drools-spring.xsd"
-    default-autowire="byName">
-
-
-	<drools:connection id="connection1" type="local" />
-	
-	<drools:execution-node id="node1" connection="connection1" />
-    
-	<drools:kbase id="kbase1" node="node1">
-		<drools:resource source="classpath:model/person.xsd" type="XSD">
-		   <drools:jaxb-conf system-id="xsd" />
-		</drools:resource>
-		<drools:resource source="classpath:changesets/change-set-1.xml" type="CHANGE_SET" />	
-	</drools:kbase>
-
-	<drools:kbase id="kbase2" node="node1">
-		<drools:resource source="classpath:changesets/change-set-2.xml" type="CHANGE_SET" />
-	</drools:kbase>
-
-	<drools:ksession id="ksession1" type="stateful"  kbase="kbase1" node="node1"/>
-
-	<drools:ksession id="ksession2" type="stateless" kbase="kbase2" node="node1"/>
-
-</beans>
\ No newline at end of file



More information about the jboss-svn-commits mailing list