[jboss-svn-commits] JBL Code SVN: r8566 - in labs/jbossrules/trunk/drools-jbrms/src: main/java/org/drools/brms/server main/webapp/org.drools.brms.JBRMS test/java/org/drools/brms/server

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Fri Dec 22 17:32:37 EST 2006


Author: michael.neale at jboss.com
Date: 2006-12-22 17:32:27 -0500 (Fri, 22 Dec 2006)
New Revision: 8566

Modified:
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java
   labs/jbossrules/trunk/drools-jbrms/src/main/webapp/org.drools.brms.JBRMS/JBRMS.css
   labs/jbossrules/trunk/drools-jbrms/src/main/webapp/org.drools.brms.JBRMS/JBRMS.html
   labs/jbossrules/trunk/drools-jbrms/src/main/webapp/org.drools.brms.JBRMS/org.drools.brms.JBRMS.nocache.html
   labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java
Log:
fix for nested categories

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	2006-12-22 22:23:18 UTC (rev 8565)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java	2006-12-22 22:32:27 UTC (rev 8566)
@@ -244,7 +244,7 @@
         meta.categories = new String[cats.size()];
         for ( int i = 0; i < meta.categories.length; i++ ) {
             CategoryItem cat = (CategoryItem) cats.get(i);
-            meta.categories[i] = cat.getName();            
+            meta.categories[i] = cat.getFullPath();          
         }
         
         meta.state = (item.getState() != null) ? item.getState().getName() : "";

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/webapp/org.drools.brms.JBRMS/JBRMS.css
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/webapp/org.drools.brms.JBRMS/JBRMS.css	2006-12-22 22:23:18 UTC (rev 8565)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/webapp/org.drools.brms.JBRMS/JBRMS.css	2006-12-22 22:32:27 UTC (rev 8566)
@@ -32,13 +32,13 @@
 }
 
 .gwt-DialogBox {
-  sborder: 8px solid #C3D9FF;
+  sborder: 8px solid #B8B8B8;
   border: 2px outset;
   background-color: white;
 }
 
 .gwt-DialogBox .Caption {
-  background-color: #C3D9FF;
+  background-color: #B8B8B8;
   padding: 3px;
   margin: 2px;
   font-weight: bold;
@@ -53,12 +53,12 @@
 
 .gwt-HorizontalSplitter .Bar {
   width: 8px;
-  background-color: #C3D9FF;
+  background-color: #B8B8B8;
 }
 
 .gwt-VerticalSplitter .Bar {
   height: 8px;
-  background-color: #C3D9FF;
+  background-color: #B8B8B8;
 }
 
 .gwt-HTML {
@@ -76,11 +76,13 @@
 }
 
 .gwt-ListBox {
+  border: 1px solid #B8B8B8;
+  padding: 0px;	
 }
 
 .gwt-MenuBar {
-  background-color: #C3D9FF;
-  border: 1px solid #87B3FF;
+  background-color: #B8B8B8;
+  border: 1px solid #B8B8B8;
   cursor: default;
 }
 
@@ -91,7 +93,7 @@
 }
 
 .gwt-MenuBar .gwt-MenuItem-selected {
-  background-color: #E8EEF7;
+  background-color: #F6F9ED;
 }
 
 .gwt-PasswordTextBox {
@@ -101,52 +103,92 @@
   font-size: smaller;
 }
 
+
+
 .gwt-TabPanel {
+  
 }
 
 .gwt-TabPanelBottom {
-  border-left: 1px solid #87B3FF;
+
 }
 
+.model-builder-Background {
+  background-color: #FDFCDC;
+  border: 1px solid #B8B8B8;
+}
+
+.model-builderInner-Background {
+	background-color: white;
+	border: 1px solid #B8B8B8;
+	//border-top: 1px solid gray;
+	//border-bottom: 1px solid gray;
+}
+
+.model-builderInnerInner-Background {
+        background-color: white;
+	border-top: 0px solid gray;
+	border-bottom: 0px solid gray;
+}
+
+
+.gwt-DialogBox { 
+	border: 1px solid #B8B8B8;
+}
+.gwt-DialogBox .Caption {  
+	background-color: #FDFCDC;
+	font-size: smaller;
+}
+
+
+
 .gwt-TabBar {
-  background-color: #C3D9FF;
+  background-color: #B8B8B8;
   font-size: smaller;
 }
 
 .gwt-TabBar .gwt-TabBarFirst {
   height: 100%;
-  border-bottom: 1px solid #87B3FF;
+  border-bottom: 1px solid #B8B8B8;
   padding-left: 3px;
 }
 
 .gwt-TabBar .gwt-TabBarRest {
-  border-bottom: 1px solid #87B3FF;
+  border-bottom: 1px solid #B8B8B8;
   padding-right: 3px;
 }
 
 .gwt-TabBar .gwt-TabBarItem {
-  border-top: 1px solid #C3D9FF;
-  border-bottom: 1px solid #87B3FF;
+  border: 1px solid #B8B8B8;
   padding: 2px;
-  cursor: pointer;
   cursor: hand;
 }
 
+
+
 .gwt-TabBar .gwt-TabBarItem-selected {
   font-weight: bold;
-  background-color: #E8EEF7;
-  border-top: 1px solid #87B3FF;
-  border-left: 1px solid #87B3FF;
-  border-right: 1px solid #87B3FF;
-  border-bottom: 1px solid #E8EEF7;
+  background-color: #F6F9ED;
+  border-top: 1px solid #F6F9ED;
+  border-left: 1px solid #F6F9ED;
+  border-right: 1px solid #F6F9ED;
+  border-bottom: 0px solid #B8B8B8;
   padding: 2px;
   cursor: default;
 }
 
+
+
+
+
 .gwt-TextArea {
+  border: 1px solid #B8B8B8;
+  padding: 0px;
 }
 
 .gwt-TextBox {
+  border: 1px solid #B8B8B8;
+  padding: 0px;	
 }
 
 .gwt-Tree {
@@ -157,14 +199,14 @@
 }
 
 .gwt-Tree .gwt-TreeItem-selected {
-  background-color: #C3D9FF;
+  background-color: yellow;
 }
 
 .gwt-StackPanel {
 }
 
 .gwt-StackPanel .gwt-StackPanelItem {
-  background-color: #C3D9FF;
+  background-color: #B8B8B8;
   cursor: pointer;
   cursor: hand;
 }
@@ -172,16 +214,24 @@
 .gwt-StackPanel .gwt-StackPanelItem-selected {
 }
 
+.global-Font {
+	font-size: smaller;
+}
+
+
 /* -------------------------------------------------------------------------- */
+
+/* -- orig border: #C3D9FF  replaced with #B8B8B8 
+  orig background: #E8EEF7 replaced with #F6F9ED -- */
 .ks-Sink {
-  border: 8px solid #C3D9FF;
-  background-color: #E8EEF7;
+  border: 4px solid #B8B8B8;
+  background-color: #F6F9ED;
   width: 100%;
   height: 24em;
 }
 
 .ks-Info {
-  background-color: #C3D9FF;
+  background-color: #B8B8B8;
   padding: 10px 10px 2px 10px;
   font-size: smaller;
 }
@@ -201,7 +251,7 @@
 }
 
 .ks-List .ks-SinkItem-selected {
-  background-color: #C3D9FF;
+  background-color: #B8B8B8;
 }
 
 .ks-images-Image {
@@ -219,7 +269,7 @@
 }
 
 .ks-layouts-Label {
-  background-color: #C3D9FF;
+  background-color: #B8B8B8;
   font-weight: bold;
   margin-top: 1em;
   padding: 2px 0px 2px 0px;
@@ -228,20 +278,137 @@
 
 .ks-layouts-Scroller {
   height: 128px;
-  border: 2px solid #C3D9FF;
+  border: 2px solid #B8B8B8;
   padding: 8px;
   margin: 8px;
 }
 
+.outline-Debug {
+  border: 2px solid #B8B8B8;
+}
+
+.warning-Popup {
+  border: 2px solid #B8B8B8;
+  background-color: white;		
+}
+
+
 .ks-popups-Popup {
-  background-color: white;
-  border: 1px solid #87B3FF;
+  background-color: #FDFCDC;
+  border: 1px solid #B8B8B8;
   padding: 4px;
 }
 
+.rule-error-Popup {
+  background-color: red;
+  border: 1px solid #B8B8B8;
+  padding: 4px;
+}
+
+.loading-Popup {
+  background-color: #CCFFCC;
+  border: 1px solid #B8B8B8;
+  padding: 4px;
+}
+
+.rule-warning-Popup {
+  background-color: yellow;
+  border: 1px solid #B8B8B8;
+  padding: 4px;
+}
+
+.rule-breditor-Table {
+  background-color: #FDFCDC;
+  border: 1px solid #B8B8B8;
+  padding: 4px;
+}
+
+.rule-explorer-NewPopups  {
+  border: 1px solid #B8B8B8;
+  background-color: #FDFCDC;
+}
+
+.dt-editor-Grid {
+  background-color: #FDFCDC;
+  border: 1px solid #B8B8B8;  
+  border-spacing: 0px;
+  border-collapse: collapse
+}
+
+.dt-editor-Cell {
+  background-color: white;
+  border: 1px solid #B8B8B8; 
+  font-size: smaller;
+  padding: 2px;
+}
+
+.dt-editor-Toolbar {
+  background-color: white;
+  border: 1px solid #B8B8B8; 
+  padding: 2px;
+}
+
+.dt-editor-Cell-selected {
+  background-color: white;
+  border: 2px solid #B8B8B8; 
+  font-size: smaller;
+  padding: 0px;
+}
+
+.dt-editor-DescriptionCell {
+  background-color: #FDFCDC;
+  font-size: smaller;
+  padding: 3px;
+}
+
+.dt-editor-DescriptionCell-selected {
+  background-color: #B8B8B8;
+  color : #FFFFFF;
+  font-size: smaller;
+  padding: 3px;
+}
+
+.dt-editor-CountColumn {
+  background-color: #FDFCDC;
+  font-size: smaller;
+  padding: 3px;
+}
+.dt-editor-CountColumn-selected {
+  background-color: #B8B8B8;
+  color : #FFFFFF;
+  font-size: smaller;
+  padding: 3px;
+}
+
+.dt-editor-Title {
+  font-size: larger;
+}
+
+.dsl-field-TextBox {
+  border: 1px solid #B8B8B8;
+  padding: 0px;	
+  width: 100%;
+  height: 100%
+}
+
+.dt-field-TextBox {
+  border: none;
+  padding: 0px;	
+  width: 100%;
+}
+
+.rule-viewer-Documentation {
+  background-color: #FDFCDC;
+  font-family: Arial, sans-serif;
+  font-size: smaller;
+  border: 1px solid #B8B8B8;
+  width: 100%;
+}
+
+/* And the rule list stuff */
+
 .rule-ListHeader {
-	background-image: url(images/gray_gradient.gif);
-	background-repeat: repeat-x;
+	background-color: #F6F9ED;
 	font-weight: bold;
 }
 
@@ -250,17 +417,81 @@
 	background-repeat: repeat-x;
 }
 
-
-.infoProse {
-  margin: 8px;
+.rule-ListEvenRow {
+	background-color: #FDFCDC;
 }
 
 
+
 .rule-List {
-	border: 1px solid #AAAAAA;
+	border: 1px solid #B8B8B8;
 	background-color: white;
-	font-size: 70%;
-	cursor: pointer;
+        font-family: Arial, sans-serif;
+        font-size: smaller;
+	/*cursor: pointer;*/
 	cursor: hand;
+        border-spacing: 0px;
+        border-collapse: collapse
 }
 
+/* end the rule list stuff */
+
+.resource-name-Label {	
+ 	font-weight: bold;
+}
+
+.infoProse {
+  margin: 8px;
+}
+
+
+.DatePicker {
+  border: 1px solid #B8B8B8;
+}
+
+.DatePicker .navbar {
+  width: 100%;
+  background-color: #FDFCDC;
+  vertical-align: middle;
+  border-bottom: 1px solid #B8B8B8;
+}
+
+.DatePicker .navbar .gwt-Button {
+  padding-left: 5px;
+  padding-right: 5px;
+}
+
+.DatePicker .table {
+  text-align: center;
+}
+
+.DatePicker .weekheader {
+  background-color: #FDFCDC;
+}
+
+.DatePicker .weekheader .days {
+  width: 3em;
+}
+
+.DatePicker .cell {
+  cursor:pointer;
+}
+
+.DatePicker .cell .gwt-HTML {
+  border: 1px solid #B8B8B8;
+}
+
+.DatePicker .cell .gwt-HTML span {
+  width: 100%;
+  height: 100%;
+  line-height: 2em;
+}
+
+.DatePicker .today .gwt-HTML {
+  background-color: white;
+}
+
+.DatePicker .day .gwt-HTML {
+  border: 1px solid #B8B8B8;
+} 
+

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/webapp/org.drools.brms.JBRMS/JBRMS.html
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/webapp/org.drools.brms.JBRMS/JBRMS.html	2006-12-22 22:23:18 UTC (rev 8565)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/webapp/org.drools.brms.JBRMS/JBRMS.html	2006-12-22 22:32:27 UTC (rev 8566)
@@ -3,9 +3,11 @@
 		<meta name='gwt:module' content='org.drools.brms.JBRMS'>		
 		<link rel='stylesheet' href='JBRMS.css'>
 		<title>JBoss Business Rules Management System</title>
+	    <link rel="shortcut icon" href="images/drools.gif" type="image/gif">
+	    <link rel="icon" href="images/drools.gif" type="image/gif">		
 	</head>
-	<body> 			
-		<img src="images/drools_logo.png" />		
+	<body> 
+		<img src="images/top_logo.png" />
 		<!-- This script is the bootstrap stuff that simply must be there; it is sent down uncompressed -->
 		<script language='javascript' src='gwt.js'></script>
 		<iframe id='__gwt_historyFrame' style='width:0;height:0;border:0'></iframe>

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/webapp/org.drools.brms.JBRMS/org.drools.brms.JBRMS.nocache.html
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/webapp/org.drools.brms.JBRMS/org.drools.brms.JBRMS.nocache.html	2006-12-22 22:23:18 UTC (rev 8565)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/webapp/org.drools.brms.JBRMS/org.drools.brms.JBRMS.nocache.html	2006-12-22 22:32:27 UTC (rev 8566)
@@ -10,7 +10,7 @@
   if (ua.indexOf('opera') != -1) {
     return 'opera';
   }
-   else if (ua.indexOf('safari') != -1) {
+   else if (ua.indexOf('webkit') != -1) {
     return 'safari';
   }
    else if (ua.indexOf('msie 6.0') != -1 || ua.indexOf('msie 7.0') != -1) {
@@ -69,11 +69,11 @@
     var F;
     var I = ["true", (F=window["prop$user.agent"],F(1))];
 
-    O(["true","gecko1_8"],"02D55B6C17D8CB9E4B314EBA74D96176");
-    O(["true","gecko"],"51020A54662D0F6A5C82585118050747");
-    O(["true","safari"],"927D95ADAE7773515D708EDC0F78069F");
-    O(["true","opera"],"B577C14457C333C21850C7B7CE292ECD");
-    O(["true","ie6"],"D0B8925E97A067A562D3A74CD0E4C548");
+    O(["true","gecko1_8"],"22DB0BD1B7220A130CD171C0F8E3AA34");
+    O(["true","safari"],"22E115AE099C4776A499616329CDED32");
+    O(["true","gecko"],"408100B98485EFFBF2B46403D5B91A10");
+    O(["true","opera"],"748A00DB7042609F7149D38649C440B7");
+    O(["true","ie6"],"790B026AFB75510B0FD342E3A2D1D02B");
 
     var strongName = O.answers[I[0]][I[1]];
     var query = location.search;

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	2006-12-22 22:23:18 UTC (rev 8565)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java	2006-12-22 22:32:27 UTC (rev 8566)
@@ -60,7 +60,7 @@
       cat.addCategory( "testAddRule", "yeah" );
       
       
-      String result = impl.createNewRule( "testAddRule", "a description", "testAddRule", "another", "txt" );
+      String result = impl.createNewRule( "test AddRule", "a description", "testAddRule", "another", "txt" );
       assertNotNull(result);
       assertFalse("".equals( result ));
       
@@ -182,6 +182,7 @@
           
           serv.createCategory( "/", "testCheckinCategory", "this is a description" );
           serv.createCategory( "/", "testCheckinCategory2", "this is a description" );
+          serv.createCategory( "testCheckinCategory", "deeper", "description" );
           
           String uuid = serv.createNewRule( "testChecking", "this is a description", "testCheckinCategory", "default", "drl" );
           
@@ -206,20 +207,21 @@
           asset2.metaData.checkinComment = "checked in";
           
           String cat = asset2.metaData.categories[0];
-          asset2.metaData.categories = new String[2];
+          asset2.metaData.categories = new String[3];
           asset2.metaData.categories[0] = cat;          
           asset2.metaData.categories[1] = "testCheckinCategory2";
+          asset2.metaData.categories[2] = "testCheckinCategory/deeper";
           
-          
           serv.checkinVersion( asset2 );
           
           asset2 = serv.loadRuleAsset( uuid );
           assertEquals("ya", asset2.metaData.coverage);
           assertEquals("2", asset2.metaData.versionNumber);
           assertEquals("checked in", asset2.metaData.checkinComment);
-          assertEquals(2, asset2.metaData.categories.length);
+          assertEquals(3, asset2.metaData.categories.length);
           assertEquals("testCheckinCategory", asset2.metaData.categories[0]);
           assertEquals("testCheckinCategory2", asset2.metaData.categories[1]);
+          assertEquals("testCheckinCategory/deeper", asset2.metaData.categories[2]);
           
   }
   




More information about the jboss-svn-commits mailing list