[jboss-svn-commits] JBL Code SVN: r16808 - in labs/jbossrules/trunk/drools-jbrms/src: main/java/org/drools/brms/client/rpc and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Nov 26 01:58:02 EST 2007
Author: michael.neale at jboss.com
Date: 2007-11-26 01:58:02 -0500 (Mon, 26 Nov 2007)
New Revision: 16808
Modified:
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/qa/ScenarioResultsWidget.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/qa/ScenarioWidget.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryService.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/JBRMS.css
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/ServiceImplementation.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/files/FileManagerUtils.java
labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java
labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/util/FileManagerUtilsTest.java
Log:
JBRULES-1271 scenario persistence
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/qa/ScenarioResultsWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/qa/ScenarioResultsWidget.java 2007-11-26 06:56:18 UTC (rev 16807)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/qa/ScenarioResultsWidget.java 2007-11-26 06:58:02 UTC (rev 16808)
@@ -44,7 +44,7 @@
VerifyRuleFired vr = (VerifyRuleFired)f;
HorizontalPanel h = new HorizontalPanel();
if (!vr.successResult.booleanValue()) {
- h.add(new Image("images/test_failed.png"));
+ h.add(new Image("images/warning.gif"));
failures++;
} else {
h.add(new Image("images/test_passed.png"));
@@ -58,7 +58,7 @@
VerifyField vfl = (VerifyField) it.next();
HorizontalPanel h = new HorizontalPanel();
if (!vfl.successResult.booleanValue()) {
- h.add(new Image("images/test_failed.png"));
+ h.add(new Image("images/warning.gif"));
failures++;
} else {
h.add(new Image("images/test_passed.png"));
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/qa/ScenarioWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/qa/ScenarioWidget.java 2007-11-26 06:56:18 UTC (rev 16807)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/qa/ScenarioWidget.java 2007-11-26 06:58:02 UTC (rev 16808)
@@ -879,8 +879,11 @@
if (fld.successResult != null) {
if (fld.successResult.booleanValue()) {
- data.setWidget(i, 0, new Image("images/test_failed.png"));
- data.setWidget(i, 5, new HTML("<i><small>(Actual: " + fld.actualResult + ")</small></i>"));
+ data.setWidget(i, 0, new Image("images/warning.gif"));
+ data.setWidget(i, 5, new HTML("(Actual: " + fld.actualResult + ")"));
+
+ data.getCellFormatter().addStyleName(i, 5, "testErrorValue");
+
} else {
data.setWidget(i, 0, new Image("images/test_passed.png"));
}
@@ -927,9 +930,11 @@
if (v.successResult != null) {
if (v.successResult.booleanValue()) {
- data.setWidget(i, 0, new Image("images/test_failed.png"));
- data.setWidget(i, 4, new HTML("<i><small>(Actual: " + v.actualResult +")</small></i>"));
+ data.setWidget(i, 0, new Image("images/warning.gif"));
+ data.setWidget(i, 4, new HTML("(Actual: " + v.actualResult +")"));
+ data.getCellFormatter().addStyleName(i, 4, "testErrorValue");
+
} else {
data.setWidget(i, 0, new Image("images/test_passed.png"));
}
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryService.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryService.java 2007-11-26 06:56:18 UTC (rev 16807)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryService.java 2007-11-26 06:58:02 UTC (rev 16808)
@@ -313,6 +313,7 @@
/**
* This will list the rules available in a package.
+ * This has an upper limit of what it will return (it just doesn't make sense to show a list of 20K items !).
*/
public String[] listRulesInPackage(String packageName) throws SerializableException;
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/JBRMS.css
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/JBRMS.css 2007-11-26 06:56:18 UTC (rev 16807)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/JBRMS.css 2007-11-26 06:58:02 UTC (rev 16808)
@@ -20,12 +20,18 @@
}
.testSuccessBackground {background: green;}
-.testFailureBackground {background: red;}
+.testFailureBackground {background: #CC0000;}
.testBar {
border-spacing:0;
border-collapse:collapse;
padding:0;
}
+.testErrorValue { border: 1px solid #CC0000;
+font-color: #CC000;
+font-size: small;
+font-style: italics;
+}
+
.successBar {border: 1px; solid #aa9; }
.gwt-DialogBox {
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/ServiceImplementation.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/ServiceImplementation.java 2007-11-26 06:56:18 UTC (rev 16807)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/ServiceImplementation.java 2007-11-26 06:58:02 UTC (rev 16808)
@@ -377,7 +377,8 @@
if (!(asset.metaData.format.equals(AssetFormats.TEST_SCENARIO))
||
asset.metaData.format.equals(AssetFormats.ENUMERATION)) {
- setPackageBinaryUpToDate(repoAsset.getPackage(), false);
+ repoAsset.getPackage().updateBinaryUpToDate(false);
+
}
repoAsset.checkin( meta.checkinComment );
@@ -385,22 +386,10 @@
return repoAsset.getUUID();
}
- /**
- * Sets a flag to say if the binary package is up to date.
- * Flip it (or remove it) if it is no longer up to date.
- */
- private void setPackageBinaryUpToDate(PackageItem p, boolean status) {
- try {
- p.checkout();
- p.getNode().setProperty("drools:binaryUpToDate", status);
- repository.save();
- } catch (RepositoryException e) {
- log.error(e);
- }
- }
+
@WebRemote
@Restrict("#{identity.loggedIn}")
public TableDataResult loadAssetHistory(String uuid) throws SerializableException {
@@ -559,7 +548,7 @@
item.updateExternalURI( data.externalURI );
item.updateDescription( data.description );
item.archiveItem( data.archived );
-
+ item.updateBinaryUpToDate(false);
item.checkin( data.description );
BRMSSuggestionCompletionLoader loader = new BRMSSuggestionCompletionLoader();
@@ -577,8 +566,10 @@
res.errorMessage = err;
}
- setPackageBinaryUpToDate(item, false);
+
+
+
return res;
}
@@ -813,7 +804,7 @@
public BuilderResult[] buildPackage(String packageUUID, String selectorConfigName, boolean force) throws SerializableException {
PackageItem item = repository.loadPackageByUUID( packageUUID );
- if (!force && isPackageBinaryUpToDate(item)) {
+ if (!force && item.isBinaryUpToDate()) {
//we can just return all OK if its up to date.
return null;
}
@@ -831,7 +822,8 @@
out.flush();
out.close();
- this.setPackageBinaryUpToDate(item, true);
+ item.updateBinaryUpToDate(true);
+
repository.save();
} catch (IOException e) {
log.error( e );
@@ -845,21 +837,6 @@
}
- /**
- * Will return true if the package binary is ok to use as is, or if it should be rebuilt.
- */
- boolean isPackageBinaryUpToDate(PackageItem item) {
- try {
- if (item.getNode().hasProperty("drools:binaryUpToDate")) {
- return item.getNode().getProperty("drools:binaryUpToDate").getBoolean();
- } else {
- return false;
- }
- } catch (RepositoryException e) {
- log.error(e);
- throw new RulesRepositoryException(e);
- }
- }
private BuilderResult[] generateBuilderResults(ContentPackageAssembler asm) {
BuilderResult[] result = new BuilderResult[asm.getErrors().size()];
@@ -997,7 +974,7 @@
buf.append( res[i].toString() );
buf.append( '\n' );
}
- throw new DetailedSerializableException("Unable to rebuild snapshot [" + snapName, buf.toString() );
+ throw new DetailedSerializableException("Unable to rebuild snapshot [" + snapName, buf.toString() + "]" );
}
}
}
@@ -1012,9 +989,15 @@
DrlParser p = new DrlParser();
try {
PackageDescr pkg = p.parse(asm.getDRL());
+ int count = 0;
for (Iterator iterator = pkg.getRules().iterator(); iterator.hasNext();) {
RuleDescr r = (RuleDescr) iterator.next();
result.add(r.getName());
+ count++;
+ if (count == 5000) {
+ result.add("More then 5000 rules.");
+ break;
+ }
}
return result.toArray(new String[result.size()]);
} catch (DroolsParserException e) {
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/files/FileManagerUtils.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/files/FileManagerUtils.java 2007-11-26 06:56:18 UTC (rev 16807)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/files/FileManagerUtils.java 2007-11-26 06:58:02 UTC (rev 16808)
@@ -89,6 +89,7 @@
AssetItem item = repository.loadAssetByUUID( uuid );
item.updateBinaryContentAttachment( fileData );
item.updateBinaryContentAttachmentFileName( fileName );
+ item.getPackage().updateBinaryUpToDate(false);
item.checkin( "Attached file: " + fileName );
Modified: labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java 2007-11-26 06:56:18 UTC (rev 16807)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java 2007-11-26 06:58:02 UTC (rev 16808)
@@ -1703,7 +1703,7 @@
//create our package
PackageItem pkg = repo.createPackage( "testBinaryPackageUpToDate",
"" );
- assertFalse(impl.isPackageBinaryUpToDate(pkg));
+ assertFalse(pkg.isBinaryUpToDate());
pkg.updateHeader( "import org.drools.Person" );
AssetItem rule1 = pkg.addAsset( "rule_1",
"" );
@@ -1735,10 +1735,10 @@
impl.savePackage(config);
assertFalse(pkg.getNode().getProperty("drools:binaryUpToDate").getBoolean());
- assertFalse(impl.isPackageBinaryUpToDate(pkg));
+ assertFalse(pkg.isBinaryUpToDate());
impl.buildPackage(pkg.getUUID(), null, false );
assertTrue(pkg.getNode().getProperty("drools:binaryUpToDate").getBoolean());
- assertTrue(impl.isPackageBinaryUpToDate(pkg));
+ assertTrue(pkg.isBinaryUpToDate());
}
Modified: labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/util/FileManagerUtilsTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/util/FileManagerUtilsTest.java 2007-11-26 06:56:18 UTC (rev 16807)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/util/FileManagerUtilsTest.java 2007-11-26 06:58:02 UTC (rev 16808)
@@ -73,15 +73,19 @@
asset.updateFormat(AssetFormats.MODEL);
asset.checkin("");
+ pkg.updateBinaryUpToDate(true);
+ repo.save();
+ assertTrue(pkg.isBinaryUpToDate());
-
FileManagerUtils fm = new FileManagerUtils();
fm.repository = repo;
fm.attachFileToAsset(asset.getUUID(), this.getClass().getResourceAsStream("/billasurf.jar"), "billasurf.jar");
pkg = repo.loadPackage("testAttachModelImports");
+
+ assertFalse(pkg.isBinaryUpToDate());
assertNotNull(pkg.getHeader());
assertTrue(pkg.getHeader().indexOf("import com.billasurf.Board") > -1);
assertTrue(pkg.getHeader().indexOf("import com.billasurf.Person") > -1);
More information about the jboss-svn-commits
mailing list