[jboss-svn-commits] JBL Code SVN: r13380 - in labs/jbossrules/branches/mvel-tooling-2007-06-30: drools-compiler/src/test/resources/org/drools/integrationtests and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jul 11 21:58:08 EDT 2007
Author: pombredanne
Date: 2007-07-11 21:58:08 -0400 (Wed, 11 Jul 2007)
New Revision: 13380
Modified:
labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/src/test/java/org/drools/Address.java
labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/src/test/resources/org/drools/integrationtests/nested_fields.drl
labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/DRLFileContentHandler.java
labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/src/test/java/org/drools/brms/server/PerfServiceTest.java
labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/src/test/java/org/drools/brms/server/contenthandler/DRLFileContentHandlerTest.java
labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-repository/src/main/java/org/drools/repository/RulesRepository.java
labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-repository/src/test/java/org/drools/repository/RulesRepositoryTest.java
Log:
Ported r13379 from trunk to branch mvel-tooling-2007-06-30.
Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/src/test/java/org/drools/Address.java
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/src/test/java/org/drools/Address.java 2007-07-12 00:38:59 UTC (rev 13379)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/src/test/java/org/drools/Address.java 2007-07-12 01:58:08 UTC (rev 13380)
@@ -4,6 +4,15 @@
private String street;
private String suburb;
+
+ public Address() {
+
+ }
+
+ public Address(String street) {
+ this.street = street;
+ }
+
public String getStreet() {
return street;
}
Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/src/test/resources/org/drools/integrationtests/nested_fields.drl
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/src/test/resources/org/drools/integrationtests/nested_fields.drl 2007-07-12 00:38:59 UTC (rev 13379)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/src/test/resources/org/drools/integrationtests/nested_fields.drl 2007-07-12 01:58:08 UTC (rev 13380)
@@ -15,6 +15,7 @@
addresses[0].street == "High" )
)
then
- p.name = "goober"
- System.out.println(p.name)
+ p.name = "goober";
+ System.out.println(p.name);
+ insert(new Address("Latona"));
end
Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/DRLFileContentHandler.java
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/DRLFileContentHandler.java 2007-07-12 00:38:59 UTC (rev 13379)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/DRLFileContentHandler.java 2007-07-12 01:58:08 UTC (rev 13380)
@@ -50,6 +50,9 @@
* (in the latter case, the content is passed as it to the compiler).
*/
static boolean isStandAloneRule(String content) {
+ if (content == null || "".equals( content.trim() )) {
+ return false;
+ }
StringTokenizer st = new StringTokenizer(content, " ");
while (st.hasMoreTokens()) {
String tok = st.nextToken();
Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/src/test/java/org/drools/brms/server/PerfServiceTest.java
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/src/test/java/org/drools/brms/server/PerfServiceTest.java 2007-07-12 00:38:59 UTC (rev 13379)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/src/test/java/org/drools/brms/server/PerfServiceTest.java 2007-07-12 01:58:08 UTC (rev 13380)
@@ -82,7 +82,7 @@
Calendar lastModified = Calendar.getInstance();
ruleNode.setProperty( AssetItem.LAST_MODIFIED_PROPERTY_NAME, lastModified );
- ruleNode.setProperty( AssetItem.PACKAGE_NAME_PROPERTY, this.getName() );
+// ruleNode.setProperty( AssetItem.PACKAGE_NAME_PROPERTY, this.getName() );
ruleNode.setProperty( AssetItem.CREATOR_PROPERTY_NAME, session.getUserID() );
Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/src/test/java/org/drools/brms/server/contenthandler/DRLFileContentHandlerTest.java
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/src/test/java/org/drools/brms/server/contenthandler/DRLFileContentHandlerTest.java 2007-07-12 00:38:59 UTC (rev 13379)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/src/test/java/org/drools/brms/server/contenthandler/DRLFileContentHandlerTest.java 2007-07-12 01:58:08 UTC (rev 13380)
@@ -44,4 +44,20 @@
assertTrue(h.isStandAloneRule( moreNewRule ));
}
+ public void testRuleWithDialect() {
+ String rule = "rule \"DemoRule\" \n "+
+ " salience 10 \n" +
+ " dialect \"mvel\" \n " +
+ " when \n" +
+ " Driver( age > 65 ) \n" +
+ " then \n" +
+ " insert(new Rejection(\" too old \"));" +
+ "end ";
+ DRLFileContentHandler h = new DRLFileContentHandler();
+ assertFalse(h.isStandAloneRule( rule ));
+
+ assertFalse(h.isStandAloneRule( "" ));
+
+ }
+
}
\ No newline at end of file
Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-repository/src/main/java/org/drools/repository/RulesRepository.java
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-repository/src/main/java/org/drools/repository/RulesRepository.java 2007-07-12 00:38:59 UTC (rev 13379)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-repository/src/main/java/org/drools/repository/RulesRepository.java 2007-07-12 01:58:08 UTC (rev 13380)
@@ -923,6 +923,15 @@
}
this.session.getWorkspace().copy( sourcePath, destPath );
+ PackageItem newPkg = loadPackage( destPackageName );
+
+ for ( Iterator iter = newPkg.getAssets(); iter.hasNext(); ) {
+ AssetItem as = (AssetItem) iter.next();
+ as.updateStringProperty( destPackageName, AssetItem.PACKAGE_NAME_PROPERTY );
+ }
+
+ save();
+
} catch ( RepositoryException e ) {
log.error( e );
throw new RulesRepositoryException(e);
Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-repository/src/test/java/org/drools/repository/RulesRepositoryTest.java
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-repository/src/test/java/org/drools/repository/RulesRepositoryTest.java 2007-07-12 00:38:59 UTC (rev 13379)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-repository/src/test/java/org/drools/repository/RulesRepositoryTest.java 2007-07-12 01:58:08 UTC (rev 13380)
@@ -343,7 +343,18 @@
assertFalse( source.getUUID().equals( dest.getUUID() ));
assertEquals(1, iteratorToList( dest.getAssets()).size());
+ AssetItem item2 = (AssetItem) dest.getAssets().next();
+
+ assertEquals("testCopyPackage", item.getPackageName());
+ assertEquals("testCopyPackage2", item2.getPackageName());
+
+ item2.updateContent( "goober choo" );
+ item2.checkin( "yeah" );
+
+ assertEquals("la", item.getContent());
+
+
try {
repo.copyPackage( "testCopyPackage", "testCopyPackage2" );
fail("should not be able to copy when existing.");
More information about the jboss-svn-commits
mailing list