[jboss-svn-commits] JBL Code SVN: r16442 - labs/jbossesb/workspace/jdelong/ruleservice/product/services/jbrules/src/test/resources/ruleAgent.

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

Author: jeffdelong
Date: 2007-11-08 21:04:20 -0500 (Thu, 08 Nov 2007)
New Revision: 16442

Modified:
   labs/jbossesb/workspace/jdelong/ruleservice/product/services/jbrules/src/test/resources/ruleAgent/brmsdeployedrules.properties
Log:


Modified: labs/jbossesb/workspace/jdelong/ruleservice/product/services/jbrules/src/test/resources/ruleAgent/brmsdeployedrules.properties
===================================================================
--- labs/jbossesb/workspace/jdelong/ruleservice/product/services/jbrules/src/test/resources/ruleAgent/brmsdeployedrules.properties	2007-11-09 02:01:56 UTC (rev 16441)
+++ labs/jbossesb/workspace/jdelong/ruleservice/product/services/jbrules/src/test/resources/ruleAgent/brmsdeployedrules.properties	2007-11-09 02:04:20 UTC (rev 16442)
@@ -1,5 +1,19 @@
+<<<<<<< .working
+<<<<<<< .working
 newInstance=true
 
+file=/org.jboss.soa.esb.services.rules.pkg
+dir=/shared/workspace/ruleservice/product/services/jbrules/src/test/resources/ruleAgent/package
+
+
+#url=http://localhost:8080/drools-jbrms/org.drools.brms.JBRMS/package/org.jboss.soa.esb.services.rules/LATEST
+#localCacheDir=/home/jdelong/workspace/ESBRuleService/jbrules/src/test/resources/ruleAgent/cache
+poll=30
+
+name=insuranceconfig
+=======
+newInstance=true
+
 #file=org.jboss.soa.esb.services.rules
 dir=/home/jdelong/workspace/ESBRuleService/jbrules/src/test/resources/ruleAgent/package
 
@@ -9,3 +23,17 @@
 poll=30
 
 name=insuranceconfig
+>>>>>>> .merge-right.r16439
+=======
+newInstance=true
+
+#file=org.jboss.soa.esb.services.rules
+dir=/home/jdelong/workspace/ESBRuleService/jbrules/src/test/resources/ruleAgent/package
+
+
+#url=http://localhost:8080/drools-jbrms/org.drools.brms.JBRMS/package/org.jboss.soa.esb.services.rules/LATEST
+#localCacheDir=/home/jdelong/workspace/ESBRuleService/jbrules/src/test/resources/ruleAgent/cache
+poll=30
+
+name=insuranceconfig
+>>>>>>> .merge-right.r16440