[jboss-svn-commits] JBL Code SVN: r12405 - in labs/jbossrules/trunk: drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui and 7 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jun 8 01:38:39 EDT 2007
Author: michael.neale at jboss.com
Date: 2007-06-08 01:38:39 -0400 (Fri, 08 Jun 2007)
New Revision: 12405
Modified:
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/RulePackageSelector.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionAssertFactWidget.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionSetFieldWidget.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageBuilderWidget.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageEditor.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageExplorerWidget.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/ChoiceList.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/DSLRuleEditor.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/NewAssetWizard.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/RuleValidatorWrapper.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/welcome.html
labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java
labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java
labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/ArchiveItemTest.java
labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java
labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RulesRepositoryTest.java
labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/scm/jcr/JcrActionFactoryTest.java
Log:
JBRULES-913 plus a fix for the default package and much more
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/RulePackageSelector.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/RulePackageSelector.java 2007-06-08 05:36:55 UTC (rev 12404)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/RulePackageSelector.java 2007-06-08 05:38:39 UTC (rev 12405)
@@ -1,5 +1,7 @@
package org.drools.brms.client.common;
+import java.util.Iterator;
+
import org.drools.brms.client.rpc.PackageConfigData;
import org.drools.brms.client.rpc.RepositoryServiceFactory;
@@ -14,6 +16,7 @@
public class RulePackageSelector extends Composite {
private ListBox packageList;
+ private String currentlySelectedPackage;
public RulePackageSelector() {
packageList = new ListBox();
@@ -29,6 +32,10 @@
for ( int i = 0; i < list.length; i++ ) {
packageList.addItem( list[i].name );
+ if (currentlySelectedPackage != null &&
+ list[i].name.equals( currentlySelectedPackage )) {
+ packageList.setSelectedIndex( i );
+ }
}
}
@@ -45,5 +52,9 @@
public String getSelectedPackage() {
return packageList.getItemText( packageList.getSelectedIndex() );
}
+
+ public void selectPackage(String currentlySelectedPackage) {
+ this.currentlySelectedPackage = currentlySelectedPackage;
+ }
}
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionAssertFactWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionAssertFactWidget.java 2007-06-08 05:36:55 UTC (rev 12404)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionAssertFactWidget.java 2007-06-08 05:38:39 UTC (rev 12405)
@@ -9,6 +9,7 @@
import org.drools.brms.client.modeldriven.HumanReadable;
import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
import org.drools.brms.client.modeldriven.brxml.ActionAssertFact;
+import org.drools.brms.client.modeldriven.brxml.ActionAssertLogicalFact;
import org.drools.brms.client.modeldriven.brxml.ActionFieldValue;
import com.google.gwt.user.client.Command;
@@ -134,8 +135,11 @@
} );
-
- horiz.add( new Lbl(HumanReadable.getActionDisplayName(this.model.getType()) + " " + this.model.factType, "modeller-action-Label") );
+ String assertType = "assert";
+ if (this.model instanceof ActionAssertLogicalFact) {
+ assertType = "assertLogical";
+ }
+ horiz.add( new Lbl(HumanReadable.getActionDisplayName(assertType) + " " + this.model.factType, "modeller-action-Label") );
horiz.add( edit );
return horiz;
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionSetFieldWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionSetFieldWidget.java 2007-06-08 05:36:55 UTC (rev 12404)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionSetFieldWidget.java 2007-06-08 05:38:39 UTC (rev 12405)
@@ -10,6 +10,7 @@
import org.drools.brms.client.modeldriven.HumanReadable;
import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
import org.drools.brms.client.modeldriven.brxml.ActionFieldValue;
+import org.drools.brms.client.modeldriven.brxml.ActionModifyField;
import org.drools.brms.client.modeldriven.brxml.ActionSetField;
import org.drools.brms.client.modeldriven.brxml.FactPattern;
import org.drools.brms.client.modeldriven.brxml.RuleModel;
@@ -113,8 +114,11 @@
showAddFieldPopup(w);
}
} );
-
- horiz.add( new Lbl(HumanReadable.getActionDisplayName(this.model.getType()) + " [" + model.variable + "]", "modeller-action-Label") );
+ String modifyType = "set";
+ if (this.model instanceof ActionModifyField) {
+ modifyType = "modify";
+ }
+ horiz.add( new Lbl(HumanReadable.getActionDisplayName(modifyType) + " [" + model.variable + "]", "modeller-action-Label") );
horiz.add( edit );
return horiz;
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageBuilderWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageBuilderWidget.java 2007-06-08 05:36:55 UTC (rev 12404)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageBuilderWidget.java 2007-06-08 05:38:39 UTC (rev 12405)
@@ -26,6 +26,7 @@
import com.google.gwt.user.client.ui.FlexTable;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.HorizontalPanel;
+import com.google.gwt.user.client.ui.Hyperlink;
import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.Panel;
@@ -172,16 +173,21 @@
vert.add( new HTML("<img src='images/tick_green.gif'/><i>Package built successfully.</i>") );
final String hyp = getDownloadLink(this.conf);
- Button download = new Button("Download binary package");
- download.setTitle( "You can download the package here for deployment, or you can use the snapshot deployment feature to have a more permanent downloadable package." );
- download.addClickListener( new ClickListener() {
- public void onClick(Widget arg0) {
- Window.open( hyp, "downloading...", "resizable=no,scrollbars=yes,status=no" );
- }
- });
- vert.add( download );
+
+ HTML html = new HTML("<a href='" + hyp + "' target='_blank'>Download binary package</a>");
+
+// Button download = new Button("Download binary package");
+// download.setTitle( "You can download the package here for deployment, or you can use the snapshot deployment feature to have a more permanent downloadable package." );
+// download.addClickListener( new ClickListener() {
+// public void onClick(Widget arg0) {
+// Window.open( hyp, "downloading...", "resizable=no,scrollbars=yes,status=no" );
+// }
+// });
+
+ //vert.add( download );
+ vert.add( html );
Button snap = new Button("Create snapshot for deployment");
snap.addClickListener( new ClickListener() {
public void onClick(Widget w) {
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageEditor.java 2007-06-08 05:36:55 UTC (rev 12404)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageEditor.java 2007-06-08 05:38:39 UTC (rev 12405)
@@ -157,20 +157,17 @@
save.addClickListener( new ClickListener() {
public void onClick(Widget w) {
- doSaveAction();
+ doSaveAction(null);
}
} );
-
horiz.add( save );
-
Button archive = new Button("Archive");
archive.addClickListener(new ClickListener() {
public void onClick(Widget w) {
if ( Window.confirm( "Are you sure you want to archive (remove) this package?" ) ) {
conf.archived = true;
- doSaveAction();
- refreshCommand.execute();
+ doSaveAction(refreshCommand);
}
}
});
@@ -223,7 +220,7 @@
}
- private void doSaveAction() {
+ private void doSaveAction(final Command refresh) {
LoadingPopup.showMessage( "Saving package configuration. Please wait ..." );
RepositoryServiceFactory.getService().savePackage( this.conf, new GenericCallback() {
public void onSuccess(Object data) {
@@ -237,6 +234,9 @@
SuggestionCompletionCache.getInstance().refreshPackage( conf.name, new Command() {
public void execute() {
+ if (refresh != null) {
+ refresh.execute();
+ }
LoadingPopup.close();
}
});
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageExplorerWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageExplorerWidget.java 2007-06-08 05:36:55 UTC (rev 12404)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageExplorerWidget.java 2007-06-08 05:38:39 UTC (rev 12405)
@@ -48,6 +48,7 @@
private AssetItemListViewer listView;
private EditItemEvent editEvent;
private String uuid;
+ private String currentlySelectedPackage;
/**
@@ -156,7 +157,7 @@
public void open(String key) {
editEvent.open( key );
}
- }, true, null, "Create a new rule asset");
+ }, true, null, "Create a new rule asset", currentlySelectedPackage);
pop.setPopupPosition( left, top );
pop.show();
@@ -260,6 +261,7 @@
private void addPackage(final PackageConfigData conf, boolean preSelect) {
TreeItem pkg = makeItem(conf.name, "images/package.gif", new PackageTreeItem(new Command() {
+
public void execute() {
if ( isDirty() ) {
@@ -268,6 +270,7 @@
loadPackageConfig(conf.uuid);
}
} else {
+
loadPackageConfig(conf.uuid);
}
}
@@ -318,13 +321,15 @@
*/
private void loadPackageConfig(String uuid) {
-
+ LoadingPopup.showMessage( "Loading package information ..." );
+
RepositoryServiceFactory.getService().loadPackageConfig( uuid, new GenericCallback() {
public void onSuccess(Object data) {
final PackageConfigData conf = (PackageConfigData) data;
StackPanel sp = new StackPanel();
+ currentlySelectedPackage = conf.name;
FormStyleLayout infoLayout = new FormStyleLayout("images/package_large.png", conf.name);
infoLayout.setStyleName( "package-Editor" );
@@ -336,13 +341,15 @@
infoLayout.addAttribute( "Snapshot created on:", new Label(conf.lastModified.toLocaleString()) );
infoLayout.addAttribute( "Snapshot comment:", new Label(conf.checkinComment) );
final String uri = PackageBuilderWidget.getDownloadLink( conf );
- Button download = new Button("Download package");
- download.addClickListener( new ClickListener() {
- public void onClick(Widget arg0) {
- Window.open( uri, "downloading...", "resizable=no,scrollbars=yes,status=no" );
- }
- });
- infoLayout.addAttribute( "Download package:", download );
+// Button download = new Button("Download package");
+// download.addClickListener( new ClickListener() {
+// public void onClick(Widget arg0) {
+// Window.open( uri, "downloading...", "resizable=no,scrollbars=yes,status=no" );
+// }
+// });
+
+ HTML html = new HTML("<a href='" + uri + "' target='_blank'>Download binary package</a>");
+ infoLayout.addAttribute( "Download package:", html );
infoLayout.addAttribute( "Package URI:", new Label(uri) );
Button viewSource = new Button("View package source");
viewSource.addClickListener( new ClickListener() {
@@ -384,7 +391,8 @@
sp.setWidth( "100%" );
- layout.setWidget( 0, 1, sp );
+ layout.setWidget( 0, 1, sp );
+ LoadingPopup.close();
}
});
@@ -414,7 +422,7 @@
public void open(String key) {
editEvent.open( key );
}
- }, false, format, title);
+ }, false, format, title, currentlySelectedPackage);
pop.setPopupPosition( left, top );
pop.show();
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/ChoiceList.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/ChoiceList.java 2007-06-08 05:36:55 UTC (rev 12404)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/ChoiceList.java 2007-06-08 05:38:39 UTC (rev 12405)
@@ -6,6 +6,7 @@
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.ClickListener;
+import com.google.gwt.user.client.ui.FocusListener;
import com.google.gwt.user.client.ui.KeyboardListener;
import com.google.gwt.user.client.ui.ListBox;
import com.google.gwt.user.client.ui.PopupPanel;
@@ -34,6 +35,17 @@
this.sentences = sen;
filter = new TextBox();
+ filter.setWidth( "100%" );
+ final String defaultMessage = "<enter text to filter list>";
+ filter.setText( defaultMessage );
+ filter.addFocusListener( new FocusListener() {
+ public void onFocus(Widget w) {
+ filter.setText( "" );
+ }
+ public void onLostFocus(Widget w) {
+ filter.setText( defaultMessage );
+ }
+ });
filter.addKeyboardListener( new KeyboardListener() {
public void onKeyDown(Widget arg0,
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/DSLRuleEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/DSLRuleEditor.java 2007-06-08 05:36:55 UTC (rev 12404)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/DSLRuleEditor.java 2007-06-08 05:38:39 UTC (rev 12405)
@@ -42,6 +42,7 @@
text.setHeight("100%");
text.setVisibleLines(10);
text.setText(data.content);
+ text.setTitle( "Hint: press control+space for popup assistance, or use one of the icons to the right." );
SuggestionCompletionEngine eng = SuggestionCompletionCache.getInstance().getEngineFromCache( asset.metaData.packageName );
this.actions = eng.actionDSLSentences;
this.conditions = eng.conditionDSLSentences;
@@ -119,8 +120,8 @@
} else {
showSuggestions(this.conditions);
}
-
}
+
private void showSuggestions(DSLSentence[] items) {
ChoiceList choice = new ChoiceList(items, this);
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/NewAssetWizard.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/NewAssetWizard.java 2007-06-08 05:36:55 UTC (rev 12404)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/NewAssetWizard.java 2007-06-08 05:38:39 UTC (rev 12405)
@@ -78,6 +78,16 @@
setStyleName( "ks-popups-Popup" );
}
+ /**
+ * This will create a new asset wizard with the given preselected package.
+ */
+ public NewAssetWizard(
+ EditItemEvent event, boolean showCategories, String format2, String title, String currentlySelectedPackage) {
+ this(event, showCategories, format2, title);
+ packageSelector.selectPackage(currentlySelectedPackage);
+
+ }
+
private Widget getCatChooser() {
return new CategoryExplorerWidget( new CategorySelectHandler() {
public void selected(String selectedPath) {
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/RuleValidatorWrapper.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/RuleValidatorWrapper.java 2007-06-08 05:36:55 UTC (rev 12404)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/RuleValidatorWrapper.java 2007-06-08 05:38:39 UTC (rev 12405)
@@ -129,8 +129,8 @@
//scroll.setScrollPosition( 100 );
//errTable.setWidth( "60%" );
pop.addRow( scroll );
- pop.setWidth( "70%" );
- pop.setHeight( "50%" );
+// pop.setWidth( "70%" );
+// pop.setHeight( "50%" );
}
pop.setPopupPosition( 100, 100 );
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/welcome.html
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/welcome.html 2007-06-08 05:36:55 UTC (rev 12404)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/welcome.html 2007-06-08 05:38:39 UTC (rev 12405)
@@ -7,10 +7,10 @@
<i>Welcome to JBoss Rules management system</i>
</h3>
<ul>
- <li><a href="http://www.jboss.com/products/rules">Product home page</a></li>
- <li><a href="http://labs.jboss.com/jbossrules">Community home page</a></li>
- <li><a href="http://wiki.jboss.org/wiki/Wiki.jsp?page=JBossRules">Wiki</a></li>
- <li><a href="http://jira.jboss.com/jira/browse/JBRULES">Bugs and feature requests</li>
+ <li><a href="http://www.jboss.com/products/rules" target="_blank">Product home page</a></li>
+ <li><a href="http://labs.jboss.com/jbossrules" target="_blank">Community home page</a></li>
+ <li><a href="http://wiki.jboss.org/wiki/Wiki.jsp?page=JBossRules" target="_blank">Wiki</a></li>
+ <li><a href="http://jira.jboss.com/jira/browse/JBRULES" target="_blank">Bugs and feature requests</li>
</ul>
</body>
</html>
\ No newline at end of file
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-06-08 05:36:55 UTC (rev 12404)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java 2007-06-08 05:38:39 UTC (rev 12405)
@@ -374,7 +374,7 @@
String uuid = serv.createNewRule( "testChecking",
"this is a description",
"testCheckinCategory",
- "default",
+ RulesRepository.DEFAULT_PACKAGE,
"drl" );
RuleAsset asset = serv.loadRuleAsset( uuid );
@@ -505,7 +505,7 @@
PackageConfigData data = impl.loadPackageConfig( uuid );
assertNotNull( data );
- assertEquals( "default",
+ assertEquals( RulesRepository.DEFAULT_PACKAGE,
data.name );
assertEquals( "header",
data.header );
@@ -520,8 +520,8 @@
Thread.sleep( 100 );
- impl.createPackageSnapshot( "default", "TEST SNAP 2.0", false, "ya" );
- PackageItem loaded = impl.repository.loadPackageSnapshot( "default", "TEST SNAP 2.0" );
+ impl.createPackageSnapshot( RulesRepository.DEFAULT_PACKAGE, "TEST SNAP 2.0", false, "ya" );
+ PackageItem loaded = impl.repository.loadPackageSnapshot( RulesRepository.DEFAULT_PACKAGE, "TEST SNAP 2.0" );
data = impl.loadPackageConfig( loaded.getUUID() );
assertTrue(data.isSnapshot);
@@ -806,17 +806,17 @@
String uuid = impl.createNewRule( "testCopyAsset",
"",
"templates",
- "default",
+ RulesRepository.DEFAULT_PACKAGE,
"drl" );
String uuid2 = impl.copyAsset( uuid,
- "default",
+ RulesRepository.DEFAULT_PACKAGE,
"testCopyAsset2" );
assertNotSame( uuid,
uuid2 );
RuleAsset asset = impl.loadRuleAsset( uuid2 );
assertNotNull( asset );
- assertEquals( "default",
+ assertEquals( RulesRepository.DEFAULT_PACKAGE,
asset.metaData.packageName );
assertEquals( "testCopyAsset2",
asset.metaData.name );
Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java 2007-06-08 05:36:55 UTC (rev 12404)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java 2007-06-08 05:38:39 UTC (rev 12405)
@@ -66,7 +66,7 @@
*/
public class RulesRepository {
- static final String DEFAULT_PACKAGE = "default";
+ public static final String DEFAULT_PACKAGE = "defaultPackage";
public static final String DROOLS_URI = "http://www.jboss.org/drools-repository/1.0";
Modified: labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/ArchiveItemTest.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/ArchiveItemTest.java 2007-06-08 05:36:55 UTC (rev 12404)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/ArchiveItemTest.java 2007-06-08 05:38:39 UTC (rev 12405)
@@ -136,7 +136,7 @@
assertEquals( 2,
list.size() );
- repo.createPackageSnapshot( "default",
+ repo.createPackageSnapshot( RulesRepository.DEFAULT_PACKAGE,
"testFindRulesByName2" );
repo.save();
Modified: labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java 2007-06-08 05:36:55 UTC (rev 12404)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java 2007-06-08 05:38:39 UTC (rev 12405)
@@ -441,7 +441,7 @@
assertEquals("test content", predecessorRuleItem.getContent());
- assertEquals("default", predecessorRuleItem.getPackageName());
+ assertEquals(RulesRepository.DEFAULT_PACKAGE, predecessorRuleItem.getPackageName());
ruleItem1.updateContent("newer lhs");
ruleItem1.checkin( "another" );
Modified: labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RulesRepositoryTest.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RulesRepositoryTest.java 2007-06-08 05:36:55 UTC (rev 12404)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RulesRepositoryTest.java 2007-06-08 05:38:39 UTC (rev 12405)
@@ -33,7 +33,7 @@
PackageItem def = repo.loadDefaultPackage();
assertNotNull(def);
- assertEquals("default", def.getName());
+ assertEquals(RulesRepository.DEFAULT_PACKAGE, def.getName());
String userId = repo.getSession().getUserID();
assertNotNull(userId);
@@ -96,7 +96,7 @@
assertEquals(2, list.size());
- repo.createPackageSnapshot( "default", "testFindRulesByName" );
+ repo.createPackageSnapshot( RulesRepository.DEFAULT_PACKAGE, "testFindRulesByName" );
repo.save();
list = iteratorToList(repo.findAssetsByName( "findRulesByNamex2" ));
Modified: labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/scm/jcr/JcrActionFactoryTest.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/scm/jcr/JcrActionFactoryTest.java 2007-06-08 05:36:55 UTC (rev 12404)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/scm/jcr/JcrActionFactoryTest.java 2007-06-08 05:38:39 UTC (rev 12405)
@@ -125,7 +125,7 @@
long oldVersion = asset.getVersionNumber();
JcrActionFactory fact = new JcrActionFactory( repo );
- ScmAction action = fact.updateFile( "default",
+ ScmAction action = fact.updateFile( RulesRepository.DEFAULT_PACKAGE,
"testUpdateFilesSVN.drl",
"lala".getBytes(),
"lala2".getBytes() );
More information about the jboss-svn-commits
mailing list