[jboss-svn-commits] JBL Code SVN: r25478 - in labs/jbossrules/trunk/drools-guvnor/src: main/java/org/drools/guvnor/server/builder and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Mar 2 21:57:09 EST 2009
Author: michael.neale at jboss.com
Date: 2009-03-02 21:57:08 -0500 (Mon, 02 Mar 2009)
New Revision: 25478
Modified:
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/public/version.txt
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/BRMSPackageBuilder.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentPackageAssembler.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/FactModelContentHandler.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/ContentPackageAssemblerTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/FactModelContentHandlerTest.java
Log:
GUVNOR-172 fixes
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/public/version.txt
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/public/version.txt 2009-03-02 23:22:06 UTC (rev 25477)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/public/version.txt 2009-03-03 02:57:08 UTC (rev 25478)
@@ -1 +1 @@
-5.0.0.SNAPSHOT 25467M
\ No newline at end of file
+5.0.0.SNAPSHOT 25475M
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/BRMSPackageBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/BRMSPackageBuilder.java 2009-03-02 23:22:06 UTC (rev 25477)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/BRMSPackageBuilder.java 2009-03-03 02:57:08 UTC (rev 25478)
@@ -167,22 +167,24 @@
List<DSLTokenizedMappingFile> result = new ArrayList<DSLTokenizedMappingFile>();
AssetItemIterator it = pkg.listAssetsByFormat( new String[]{AssetFormats.DSL} );
while ( it.hasNext() ) {
- AssetItem item = (AssetItem) it.next();
- String dslData = item.getContent();
- DSLTokenizedMappingFile file = new DSLTokenizedMappingFile();
- try {
- if ( file.parseAndLoad( new StringReader( dslData ) ) ) {
- result.add( file );
- } else {
- List errs = file.getErrors();
- for ( Iterator iter = errs.iterator(); iter.hasNext(); ) {
- DSLMappingParseException e = (DSLMappingParseException) iter.next();
- err.recordError( item, "Line " + e.getLine() + " : " + e.getMessage() );
+ AssetItem item = it.next();
+ if (!item.getDisabled()) {
+ String dslData = item.getContent();
+ DSLTokenizedMappingFile file = new DSLTokenizedMappingFile();
+ try {
+ if ( file.parseAndLoad( new StringReader( dslData ) ) ) {
+ result.add( file );
+ } else {
+ List errs = file.getErrors();
+ for ( Iterator iter = errs.iterator(); iter.hasNext(); ) {
+ DSLMappingParseException e = (DSLMappingParseException) iter.next();
+ err.recordError( item, "Line " + e.getLine() + " : " + e.getMessage() );
+ }
}
+
+ } catch ( IOException e ) {
+ throw new RulesRepositoryException(e);
}
-
- } catch ( IOException e ) {
- throw new RulesRepositoryException(e);
}
}
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentPackageAssembler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentPackageAssembler.java 2009-03-02 23:22:06 UTC (rev 25477)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentPackageAssembler.java 2009-03-03 02:57:08 UTC (rev 25478)
@@ -236,12 +236,14 @@
AssetItemIterator it = this.pkg
.listAssetsByFormat(new String[] { AssetFormats.FUNCTION });
while (it.hasNext()) {
- AssetItem func = (AssetItem) it.next();
- addDrl(func.getContent());
- if (builder.hasErrors()) {
- recordBuilderErrors(func);
- builder.clearErrors();
- }
+ AssetItem func = it.next();
+ if (!func.getDisabled()) {
+ addDrl(func.getContent());
+ if (builder.hasErrors()) {
+ recordBuilderErrors(func);
+ builder.clearErrors();
+ }
+ }
}
return errors.size() == 0;
@@ -252,18 +254,20 @@
.listAssetsByFormat(new String[] { AssetFormats.DRL_MODEL });
while (it.hasNext()) {
AssetItem as = it.next();
- try {
- String content = as.getContent();
- if (nonEmpty(content)) {
- builder.addPackageFromDrl(new StringReader(as.getContent()));
+ if (!as.getDisabled()) {
+ try {
+ String content = as.getContent();
+ if (nonEmpty(content)) {
+ builder.addPackageFromDrl(new StringReader(as.getContent()));
+ }
+ } catch (DroolsParserException e) {
+ this.errors.add(new ContentAssemblyError(as,
+ "Parser exception: " + e.getMessage()));
+ } catch (IOException e) {
+ this.errors.add(new ContentAssemblyError(as, "IOException: "
+ + e.getMessage()));
}
- } catch (DroolsParserException e) {
- this.errors.add(new ContentAssemblyError(as,
- "Parser exception: " + e.getMessage()));
- } catch (IOException e) {
- this.errors.add(new ContentAssemblyError(as, "IOException: "
- + e.getMessage()));
- }
+ }
}
}
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/FactModelContentHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/FactModelContentHandler.java 2009-03-02 23:22:06 UTC (rev 25477)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/FactModelContentHandler.java 2009-03-03 02:57:08 UTC (rev 25478)
@@ -66,6 +66,9 @@
}
List<FactMetaModel> toModel(String drl) throws DroolsParserException {
+ if (drl != null && drl.startsWith("#advanced")) {
+ throw new DroolsParserException("Using advanced editor");
+ }
DrlParser parser = new DrlParser();
PackageDescr pkg = parser.parse(drl);
if (parser.hasErrors()) {
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/ContentPackageAssemblerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/ContentPackageAssemblerTest.java 2009-03-02 23:22:06 UTC (rev 25477)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/ContentPackageAssemblerTest.java 2009-03-03 02:57:08 UTC (rev 25478)
@@ -621,6 +621,39 @@
}
+
+ public void testSkipDisabledPackageStuff() throws Exception {
+ RulesRepository repo = getRepo();
+
+ //first, setup the package correctly:
+ PackageItem pkg = repo.createPackage( "testSkipDisabledPackageStuff",
+ "" );
+ repo.save();
+
+ AssetItem assertRule1 = pkg.addAsset( "model1",
+ "" );
+ assertRule1.updateFormat( AssetFormats.DRL_MODEL );
+ assertRule1.updateContent( "garbage" );
+ assertRule1.updateDisabled( true );
+ assertRule1.checkin( "" );
+
+
+ assertRule1 = pkg.addAsset( "function1",
+ "" );
+ assertRule1.updateFormat( AssetFormats.FUNCTION );
+ assertRule1.updateContent( "garbage" );
+ assertRule1.updateDisabled( true );
+ assertRule1.checkin( "" );
+
+ ContentPackageAssembler asm = new ContentPackageAssembler(pkg);
+ assertFalse(asm.hasErrors());
+
+
+
+
+
+ }
+
public void testSkipDisabledAssets() throws Exception {
RulesRepository repo = getRepo();
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/FactModelContentHandlerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/FactModelContentHandlerTest.java 2009-03-02 23:22:06 UTC (rev 25477)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/FactModelContentHandlerTest.java 2009-03-03 02:57:08 UTC (rev 25478)
@@ -81,7 +81,19 @@
}
+ public void testAdvanced() throws Exception {
+ String drl = "#advanced editor \ndeclare FooBar\n\t name: String \nend";
+ try {
+ FactModelContentHandler ch = new FactModelContentHandler();
+ ch.toModel(drl);
+ fail("should not parse this");
+ } catch (DroolsParserException e) {
+ assertNotNull(e.getMessage());
+ }
+ }
+
+
public void testFromEmptyDrl() throws Exception {
String drl = "";
More information about the jboss-svn-commits
mailing list