[jboss-svn-commits] JBL Code SVN: r9283 - in labs/jbossrules/trunk/drools-jbrms/src: main/java/org/drools/brms/client/packages and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Feb 1 22:38:56 EST 2007
Author: michael.neale at jboss.com
Date: 2007-02-01 22:38:56 -0500 (Thu, 01 Feb 2007)
New Revision: 9283
Added:
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/images/category_small.gif
Modified:
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/categorynav/CategoryExplorerWidget.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/rpc/PackageConfigData.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/server/JBRMSServiceServlet.java
labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java
Log:
JBRULES-633 package configuration
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/categorynav/CategoryExplorerWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/categorynav/CategoryExplorerWidget.java 2007-02-02 03:34:15 UTC (rev 9282)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/categorynav/CategoryExplorerWidget.java 2007-02-02 03:38:56 UTC (rev 9283)
@@ -125,7 +125,11 @@
navTreeWidget.removeItems();
String[] categories = (String[]) result;
for ( int i = 0; i < categories.length; i++ ) {
- navTreeWidget.addItem( categories[i] ).addItem( new PendingItem() );
+ TreeItem it = new TreeItem();
+ it.setHTML( "<img src=\"images/category_small.gif\"/>" + categories[i] );
+ it.setUserObject( categories[i] );
+ it.addItem( new PendingItem() );
+ navTreeWidget.addItem( it );
}
}
@@ -154,7 +158,7 @@
//walk back up to build a tree
this.selectedPath = getPath( item );
- item.setUserObject( new Boolean( true ) );
+ //item.setUserObject( new Boolean( true ) );
service.loadChildCategories( selectedPath,
new AsyncCallback() {
@@ -170,7 +174,12 @@
}
String[] list = (String[]) result;
for ( int i = 0; i < list.length; i++ ) {
- root.addItem( list[i] ).addItem( new PendingItem() );
+ TreeItem it = new TreeItem();
+ it.setHTML( "<img src=\"images/category_small.gif\"/>" + list[i] );
+ it.setUserObject( list[i] );
+ it.addItem( new PendingItem() );
+
+ root.addItem( it );
}
}
@@ -179,15 +188,17 @@
}
private boolean hasBeenLoaded(TreeItem item) {
- if ( item.getUserObject() == null ) return false;
- return (((Boolean) item.getUserObject()).booleanValue());
+ if (item.getChildCount() == 1 && item.getChild( 0 ) instanceof PendingItem) {
+ return false;
+ }
+ return true;
}
private String getPath(TreeItem item) {
- String categoryPath = item.getText();
+ String categoryPath = (String) item.getUserObject();
TreeItem parent = item.getParentItem();
while ( parent != null ) {
- categoryPath = parent.getText() + "/" + categoryPath;
+ categoryPath = ((String)parent.getUserObject()) + "/" + categoryPath;
parent = parent.getParentItem();
}
return categoryPath;
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-02-02 03:34:15 UTC (rev 9282)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageEditor.java 2007-02-02 03:38:56 UTC (rev 9283)
@@ -36,11 +36,18 @@
addAttribute( "Header:", header() );
addAttribute( "External URI:", externalURI() );
-
}
private Widget externalURI() {
- return new TextBox();
+ final TextBox box = new TextBox();
+ box.setWidth( "100%" );
+ box.setText( this.conf.externalURI );
+ box.addChangeListener( new ChangeListener() {
+ public void onChange(Widget w) {
+ conf.externalURI = box.getText();
+ }
+ });
+ return box;
}
private Widget header() {
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/PackageConfigData.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/PackageConfigData.java 2007-02-02 03:34:15 UTC (rev 9282)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/PackageConfigData.java 2007-02-02 03:38:56 UTC (rev 9283)
@@ -13,6 +13,7 @@
public String uuid;
public String header;
+ public String externalURI;
public MetaData metaData;
}
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-02-02 03:34:15 UTC (rev 9282)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryService.java 2007-02-02 03:38:56 UTC (rev 9283)
@@ -84,4 +84,12 @@
*/
public PackageConfigData loadPackage(String name);
+// /**
+// * This will save the package info. It will also
+// * checkin a new version (a baseline of the package) if needed.
+// * If a state is provded, the status will be changed to that ot the package and all its
+// * assets.
+// */
+// public String savePackageConfiguration(PackageConfigData config, boolean createBaseline, String newState);
+//
}
Added: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/images/category_small.gif
===================================================================
(Binary files differ)
Property changes on: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/images/category_small.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java 2007-02-02 03:34:15 UTC (rev 9282)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java 2007-02-02 03:38:56 UTC (rev 9283)
@@ -367,21 +367,7 @@
String assetUUID,
String comment) {
RulesRepository repo = getRulesRepository();
-// try {
-// RuleAsset old = loadRuleAsset( versionUUID );
-// RuleAsset head = loadRuleAsset( assetUUID );
-//
-// old.uuid = assetUUID;
-// old.metaData.versionNumber = head.metaData.versionNumber;
-// old.metaData.checkinComment = comment;
-//
-// checkinVersion( old );
-//
-// } catch (SerializableException e) {
-// throw new RulesRepositoryException(e);
-// }
-//This uses JCR restore feature
repo.restoreHistoricalAsset( repo.loadAssetByUUID( versionUUID ),
repo.loadAssetByUUID( assetUUID ),
comment );
@@ -401,6 +387,7 @@
PackageConfigData data = new PackageConfigData();
data.uuid = item.getUUID();
data.header = item.getHeader();
+ data.externalURI = item.getExternalURI();
data.metaData = this.populateMetaData( item );
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-02-02 03:34:15 UTC (rev 9282)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java 2007-02-02 03:38:56 UTC (rev 9283)
@@ -292,10 +292,20 @@
public void testLoadPackageConfig() throws Exception {
MockJBRMSServiceServlet impl = new MockJBRMSServiceServlet();
+ PackageItem it = impl.repo.loadDefaultPackage();
+ it.updateCoverage( "xyz" );
+ it.updateExternalURI( "ext" );
+ it.updateHeader( "header" );
+ impl.repo.save();
+
PackageConfigData data = impl.loadPackage( "default" );
assertNotNull(data);
assertEquals("default", data.metaData.name);
+ assertEquals("header", data.header);
+ assertEquals("ext", data.externalURI);
+ assertEquals("xyz", data.metaData.coverage);
+
assertNotNull(data.uuid);
}
More information about the jboss-svn-commits
mailing list