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

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

Author: michael.neale at jboss.com
Date: 2008-10-27 22:46:02 -0400 (Mon, 27 Oct 2008)
New Revision: 23602

Added:
   labs/jbossrules/trunk/drools-server/src/main/java/org/drools/server/InsertedFact.java
Removed:
   labs/jbossrules/trunk/drools-server/src/test/java/org/drools/server/InsertedFact.java
Modified:
   labs/jbossrules/trunk/drools-server/src/main/java/org/drools/server/KnowledgeStatelessServlet.java
   labs/jbossrules/trunk/drools-server/src/main/webapp/index.jsp
Log:
patches from Ross Hall for query support

Copied: labs/jbossrules/trunk/drools-server/src/main/java/org/drools/server/InsertedFact.java (from rev 23589, labs/jbossrules/trunk/drools-server/src/test/java/org/drools/server/InsertedFact.java)
===================================================================
--- labs/jbossrules/trunk/drools-server/src/main/java/org/drools/server/InsertedFact.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-server/src/main/java/org/drools/server/InsertedFact.java	2008-10-28 02:46:02 UTC (rev 23602)
@@ -0,0 +1,20 @@
+package org.drools.server;
+
+public class InsertedFact {
+
+	String name;
+	
+	public InsertedFact(String name) {
+		super();
+		this.name = name;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+}

Modified: labs/jbossrules/trunk/drools-server/src/main/java/org/drools/server/KnowledgeStatelessServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-server/src/main/java/org/drools/server/KnowledgeStatelessServlet.java	2008-10-28 01:04:31 UTC (rev 23601)
+++ labs/jbossrules/trunk/drools-server/src/main/java/org/drools/server/KnowledgeStatelessServlet.java	2008-10-28 02:46:02 UTC (rev 23602)
@@ -262,6 +262,10 @@
 
 	public static String getRequestExample(boolean json) {
 		ServiceRequestMessage req = new ServiceRequestMessage();
+		req.queries = new QueryType[1];
+		String nameFacts[] = { "ninsf" };
+		Object args[] = { new String("one"), new String("two") };
+		req.queries[0] = new QueryType("Get named inserted fact", nameFacts, args);
 		req.globals = new NamedFact[1];
 		req.globals[0] = new NamedFact("myglobal", new ExampleFact("Saab", 42));
 		req.inFacts = new AnonFact[2];
@@ -279,6 +283,9 @@
 		req.globals[0] = new NamedFact("myglobal", new ExampleFact("Saab", 42));
 		req.inOutFacts = new NamedFact[1];
 		req.inOutFacts[0] = new NamedFact("myfact", new ExampleFact("BMW", 50));
+		req.outFacts = new NamedFact[2];
+		req.outFacts[0] = new NamedFact("ninsf", new InsertedFact("one"));
+		req.outFacts[1] = new NamedFact("ninsf", new InsertedFact("two"));
 		return configureXStream(json).toXML(req);
 	}
 

Modified: labs/jbossrules/trunk/drools-server/src/main/webapp/index.jsp
===================================================================
--- labs/jbossrules/trunk/drools-server/src/main/webapp/index.jsp	2008-10-28 01:04:31 UTC (rev 23601)
+++ labs/jbossrules/trunk/drools-server/src/main/webapp/index.jsp	2008-10-28 02:46:02 UTC (rev 23602)
@@ -15,6 +15,12 @@
 		This configuration then declares what packages are used, where the repository is etc (this can work with both Guvnor, but also DRL files, etc).
 		This properties file must be in the classpath for this war - in the WEB-INF/classes directory.
 		<h3>Sample request content:</h3>
+		<p>
+		A request may contain queries, globals, inOutFacts, and inFacts. Globals and inOutFacts may be modified 
+		by the rules and returned in the response. Queries provide a mechanism to declare which queries in the 
+		rule base may be run to return selected facts as outFacts. Queries contain the name of the query, the declarations,
+		and arguments.
+		</p>
 		<textarea rows=20 cols=80><%=KnowledgeStatelessServlet.getRequestExample(false) %></textarea>
 
 		<h3>Sample response content:</h3>

Deleted: labs/jbossrules/trunk/drools-server/src/test/java/org/drools/server/InsertedFact.java
===================================================================
--- labs/jbossrules/trunk/drools-server/src/test/java/org/drools/server/InsertedFact.java	2008-10-28 01:04:31 UTC (rev 23601)
+++ labs/jbossrules/trunk/drools-server/src/test/java/org/drools/server/InsertedFact.java	2008-10-28 02:46:02 UTC (rev 23602)
@@ -1,20 +0,0 @@
-package org.drools.server;
-
-public class InsertedFact {
-
-	String name;
-	
-	public InsertedFact(String name) {
-		super();
-		this.name = name;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-	
-}