[jboss-svn-commits] JBL Code SVN: r33434 - in labs/jbossrules/trunk/drools-server: drools-server-app/src/main/webapp/WEB-INF and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: lucazamador
Date: 2010-06-09 21:04:23 -0400 (Wed, 09 Jun 2010)
New Revision: 33434

Modified:
   labs/jbossrules/trunk/drools-server/drools-server-app/pom.xml
   labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/web.xml
   labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/java/org/drools/server/KnowledgeServiceImpl.java
Log:
JBRULES-2544: drools-server: multiple marshallers routes creation
- Fixed a bug found when multiples routes are created to the same marshaller type. Also fixed changed dependencies

Modified: labs/jbossrules/trunk/drools-server/drools-server-app/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-app/pom.xml	2010-06-09 23:34:47 UTC (rev 33433)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/pom.xml	2010-06-10 01:04:23 UTC (rev 33434)
@@ -108,13 +108,13 @@
 	<dependency>
 		<groupId>com.sun.xml.bind</groupId>
 		<artifactId>jaxb-impl</artifactId>
-		<optional>true</optional>
+<!--		<optional>true</optional>-->
 	</dependency>
 
 	<dependency>
 		<groupId>com.sun.xml.bind</groupId>
 		<artifactId>jaxb-xjc</artifactId>
-		<optional>true</optional>
+<!--		<optional>true</optional>-->
 	</dependency>
 
 	<dependency>
@@ -124,12 +124,11 @@
 		<scope>test</scope>  
 	</dependency> 
 
-    	 <dependency>
-        	<groupId>org.slf4j</groupId>
-        	<artifactId>slf4j-log4j12</artifactId>
-        	<version>1.5.2</version>
-        	<scope>test</scope>
-        </dependency>
+	<dependency>
+	  	<groupId>org.slf4j</groupId>
+	  	<artifactId>slf4j-log4j12</artifactId>
+	  	<version>1.5.2</version>
+	</dependency>
 
 	<!-- web app deps -->
 	<dependency>

Modified: labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/web.xml
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/web.xml	2010-06-09 23:34:47 UTC (rev 33433)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/web.xml	2010-06-10 01:04:23 UTC (rev 33434)
@@ -14,19 +14,11 @@
 	</listener>
 	
 	<servlet>
-		<servlet-name>knowledgeService</servlet-name>
-		<servlet-class>org.drools.server.KnowledgeServiceServlet</servlet-class>
-	</servlet>
-	<servlet>
 		<servlet-name>CXFServlet</servlet-name>
 		<servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
 	</servlet>
 	
 	<servlet-mapping>
-		<servlet-name>knowledgeService</servlet-name>
-		<url-pattern>/servlet/*</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
 		<servlet-name>CXFServlet</servlet-name>
 		<url-pattern>/services/*</url-pattern>
 	</servlet-mapping>

Modified: labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/java/org/drools/server/KnowledgeServiceImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/java/org/drools/server/KnowledgeServiceImpl.java	2010-06-09 23:34:47 UTC (rev 33433)
+++ labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/java/org/drools/server/KnowledgeServiceImpl.java	2010-06-10 01:04:23 UTC (rev 33434)
@@ -67,12 +67,14 @@
         }
         if ( "JAXB".equals( serviceConfiguration.getMarshaller() ) ) {
             JAXBContext jaxbContext = serviceConfiguration.getContext();
-            return new String( (byte[]) template.requestBodyAndHeader( "direct:with-session-jaxb",
+            String endpointUri = "direct:with-session-jaxb-" + lookup;
+			return new String( (byte[]) template.requestBodyAndHeader( endpointUri,
                                                                        cmd,
                                                                        "jaxb-context",
                                                                        jaxbContext ) );
         } else if ( "XSTREAM".equals( serviceConfiguration.getMarshaller() ) ) {
-            return new String( (byte[]) template.requestBody( "direct:with-session-xstream",
+            String endpointUri = "direct:with-session-xstream-" + lookup;
+			return new String( (byte[]) template.requestBody( endpointUri,
                                                               cmd ) );
         }
         return null;
@@ -84,9 +86,11 @@
             }
         };
         if ( "JAXB".equals( configuration.getMarshaller() ) ) {
-            rb.from( "direct:with-session-jaxb" ).to( "drools:" + smId + "/" + configuration.getSessionId() + "?dataFormat=drools-jaxb" );
+            String uri = "direct:with-session-jaxb-" + configuration.getSessionId();
+			rb.from( uri ).to( "drools:" + smId + "/" + configuration.getSessionId() + "?dataFormat=drools-jaxb" );
         } else if ( "XSTREAM".equals( configuration.getMarshaller() ) ) {
-            rb.from( "direct:with-session-xstream" ).to( "drools:" + smId + "/" + configuration.getSessionId() + "?dataFormat=drools-xstream" );
+        	String uri = "direct:with-session-xstream-" + configuration.getSessionId();
+            rb.from( uri ).to( "drools:" + smId + "/" + configuration.getSessionId() + "?dataFormat=drools-xstream" );
         } else {
             throw new IllegalArgumentException( "Invalid marshaller value on camel routes creation: " + configuration.getMarshaller() );
         }