[jboss-svn-commits] JBL Code SVN: r16446 - 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:21:49 -0500 (Thu, 08 Nov 2007)
New Revision: 16446

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:12:47 UTC (rev 16445)
+++ labs/jbossesb/workspace/jdelong/ruleservice/product/services/jbrules/src/test/resources/ruleAgent/brmsdeployedrules.properties	2007-11-09 02:21:49 UTC (rev 16446)
@@ -1,19 +1,5 @@
-<<<<<<< .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
 
@@ -23,17 +9,3 @@
 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