[jboss-svn-commits] JBL Code SVN: r11347 - 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 Apr 26 03:39:23 EDT 2007
Author: michael.neale at jboss.com
Date: 2007-04-26 03:39:23 -0400 (Thu, 26 Apr 2007)
New Revision: 11347
Modified:
labs/jbossrules/trunk/drools-jbrms/.classpath
labs/jbossrules/trunk/drools-jbrms/JBRMS.launch
labs/jbossrules/trunk/drools-jbrms/build.properties
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/RepositoryService.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryServiceAsync.java
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/builder/BRMSPackageBuilder.java
labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java
Log:
JBRULES-773 BRMS assembler
Modified: labs/jbossrules/trunk/drools-jbrms/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/.classpath 2007-04-26 07:32:02 UTC (rev 11346)
+++ labs/jbossrules/trunk/drools-jbrms/.classpath 2007-04-26 07:39:23 UTC (rev 11347)
@@ -1,52 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources"/>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-classes"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="src" path="/drools-compiler"/>
- <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.1/commons-io-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.0/slf4j-log4j12-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/jcr/jcr/1.0/jcr-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.5/janino-2.5.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.1.1/commons-fileupload-1.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.2.1.ga/hibernate-annotations-3.2.1.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.0.0/lucene-core-2.0.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/seam/jboss-seam/1.2.0.GA/jboss-seam-1.2.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/antlr/3.0b7/antlr-3.0b7.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.1.ga/hibernate-3.2.1.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/derby/derby/10.2.1.6/derby-10.2.1.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-jcr-commons/1.2.2/jackrabbit-jcr-commons-1.2.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/seam/profiles/seam-nopersistence/1.2.0.GA/seam-nopersistence-1.2.0.GA.jar"/>
- <classpathentry kind="src" path="/drools-repository"/>
- <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/antlr/stringtemplate/3.0/stringtemplate-3.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-core/1.2.2/jackrabbit-core-1.2.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/tmatesoft/javasvn/1.1-beta5/javasvn-1.1-beta5.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/jms/jms/1.1/jms-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jta_1.0.1B_spec/1.0.1/geronimo-jta_1.0.1B_spec-1.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/javassist/3.4.ga/javassist-3.4.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2beta15/mvel14-1.2beta15.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-api/1.2.2/jackrabbit-api-1.2.2.jar"/>
- <classpathentry kind="src" path="/drools-core"/>
- <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.1.v_677_R32x/core-3.2.1.v_677_R32x.jar"/>
- <classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
- <classpathentry kind="var" path="M2_REPO/google/gwt-servlet/1.3.3/gwt-servlet-1.3.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.8/log4j-1.2.8.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar"/>
-</classpath>
\ No newline at end of file
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="src" path="/drools-compiler"/>
+ <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.1/commons-io-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.0/slf4j-log4j12-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/jcr/jcr/1.0/jcr-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.5/janino-2.5.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.1.1/commons-fileupload-1.1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.2.1.ga/hibernate-annotations-3.2.1.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.0.0/lucene-core-2.0.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/seam/jboss-seam/1.2.0.GA/jboss-seam-1.2.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/antlr/3.0b7/antlr-3.0b7.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.1.ga/hibernate-3.2.1.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/derby/derby/10.2.1.6/derby-10.2.1.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-jcr-commons/1.2.2/jackrabbit-jcr-commons-1.2.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/seam/profiles/seam-nopersistence/1.2.0.GA/seam-nopersistence-1.2.0.GA.jar"/>
+ <classpathentry kind="src" path="/drools-repository"/>
+ <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/antlr/stringtemplate/3.0/stringtemplate-3.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-core/1.2.2/jackrabbit-core-1.2.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/tmatesoft/javasvn/1.1-beta5/javasvn-1.1-beta5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/jms/jms/1.1/jms-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jta_1.0.1B_spec/1.0.1/geronimo-jta_1.0.1B_spec-1.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/javassist/3.4.ga/javassist-3.4.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2beta15/mvel14-1.2beta15.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-api/1.2.2/jackrabbit-api-1.2.2.jar"/>
+ <classpathentry kind="src" path="/drools-core"/>
+ <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/google/gwt-servlet/1.3.3/gwt-servlet-1.3.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.8/log4j-1.2.8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: labs/jbossrules/trunk/drools-jbrms/JBRMS.launch
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/JBRMS.launch 2007-04-26 07:32:02 UTC (rev 11346)
+++ labs/jbossrules/trunk/drools-jbrms/JBRMS.launch 2007-04-26 07:39:23 UTC (rev 11347)
@@ -14,7 +14,6 @@
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry containerPath="GWT_HOME/gwt-servlet.jar" path="3" type="3"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry containerPath="GWT_HOME/gwt-user.jar" path="3" type="3"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/antlr-2.7.7.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/antlr-3.0b5.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/asm-1.5.3.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/asm-attrs-1.5.3.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/cglib-2.1_3.jar" path="3" type="2"/> "/>
@@ -23,11 +22,9 @@
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/commons-io-1.1.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/commons-logging-1.0.4.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/concurrent-1.3.4.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/core-3.2.1.v_677_R32x.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/derby-10.2.1.6.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/dom4j-1.6.1.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/drools-core-3.1.0-M1.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/hibernate-3.2.1.ga.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/jackrabbit-api-1.2.2.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/jackrabbit-core-1.2.2.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/jackrabbit-jcr-commons-1.2.2.jar" path="3" type="2"/> "/>
@@ -38,7 +35,6 @@
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/jta-1.0.1B.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/log4j-1.2.8.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/lucene-core-2.0.0.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/seam-nopersistence-1.2.0.GA.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/mvel14-1.2beta15.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/slf4j-log4j12-1.0.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/stringtemplate-3.0.jar" path="3" type="2"/> "/>
@@ -48,6 +44,7 @@
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/xstream-1.1.3.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry path="3" projectName="drools-compiler" type="1"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry path="3" projectName="drools-repository" type="1"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/drools-jbrms/WEB-INF/lib/antlr-3.0b7.jar" path="3" type="2"/> "/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-out www org.drools.brms.JBRMS/JBRMS.html"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="drools-jbrms"/>
Modified: labs/jbossrules/trunk/drools-jbrms/build.properties
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/build.properties 2007-04-26 07:32:02 UTC (rev 11346)
+++ labs/jbossrules/trunk/drools-jbrms/build.properties 2007-04-26 07:39:23 UTC (rev 11347)
@@ -1,2 +1,2 @@
#this is needed to point to your version of GWT
-gwt.home=/Applications/gwt-mac
\ No newline at end of file
+gwt.home=/home/michael/apps/gwt-linux-1.3.3
\ No newline at end of file
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-04-26 07:32:02 UTC (rev 11346)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageEditor.java 2007-04-26 07:39:23 UTC (rev 11347)
@@ -9,25 +9,36 @@
import org.drools.brms.client.common.FormStylePopup;
import org.drools.brms.client.common.GenericCallback;
import org.drools.brms.client.common.ImageButton;
+import org.drools.brms.client.common.InfoPopup;
import org.drools.brms.client.common.LoadingPopup;
import org.drools.brms.client.common.StatusChangePopup;
import org.drools.brms.client.common.ValidationMessageWidget;
import org.drools.brms.client.common.YesNoDialog;
+import org.drools.brms.client.rpc.BuilderResult;
import org.drools.brms.client.rpc.PackageConfigData;
import org.drools.brms.client.rpc.RepositoryServiceFactory;
import org.drools.brms.client.rpc.SnapshotInfo;
import org.drools.brms.client.rpc.ValidatedResponse;
import com.google.gwt.user.client.Command;
+import com.google.gwt.user.client.DeferredCommand;
import com.google.gwt.user.client.Timer;
import com.google.gwt.user.client.Window;
+import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.google.gwt.user.client.ui.AbsolutePanel;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.ChangeListener;
import com.google.gwt.user.client.ui.ClickListener;
+import com.google.gwt.user.client.ui.FlexTable;
+import com.google.gwt.user.client.ui.FormHandler;
+import com.google.gwt.user.client.ui.FormPanel;
+import com.google.gwt.user.client.ui.FormSubmitCompleteEvent;
+import com.google.gwt.user.client.ui.FormSubmitEvent;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.Label;
+import com.google.gwt.user.client.ui.Panel;
import com.google.gwt.user.client.ui.RadioButton;
import com.google.gwt.user.client.ui.SimplePanel;
import com.google.gwt.user.client.ui.TextArea;
@@ -52,8 +63,7 @@
this.conf = data;
setStyleName( "package-Editor" );
-
-// setHeight( "100%" );
+
setWidth( "100%" );
refreshWidgets();
@@ -65,8 +75,15 @@
addRow( warnings() );
-
+
+ //build stuff
+ final SimplePanel buildResults = new SimplePanel();
+ buildResults.setStyleName( "build-Results" );
+ addAttribute( "Build binary package", buildButton(buildResults));
+ addRow( buildResults );
+
+
addAttribute( "Description:", description() );
addAttribute( "Header:", header() );
addAttribute( "External URI:", externalURI() );
@@ -93,8 +110,101 @@
addAttribute("Status:", statusBar);
addRow( saveWidgets() );
+ addRow(new HTML("<hr/>"));
+
+
}
+
+ private Widget buildButton(final Panel buildResults) {
+ final Button build = new Button("Build");
+ InfoPopup info = new InfoPopup("Building", "Building the package will collate, " +
+ "validate, and compile all the rules into a binary package, ready for deployment." +
+ "If successful, a package will be downloaded. If not, a list of errors will show what needs to be addressed.");
+ final AbsolutePanel ab = new AbsolutePanel();
+ ab.add( build ); ab.add( info );
+ build.addClickListener( new ClickListener() {
+ public void onClick(Widget w) {
+ build.setEnabled( false );
+ doBuild(buildResults);
+ build.setEnabled( true );
+ }
+ });
+ return ab;
+ }
+ /**
+ * Actually do the building.
+ * @param buildResults The panel to stuff the results in.
+ */
+ private void doBuild(final Panel buildResults) {
+ buildResults.clear();
+
+ final HorizontalPanel busy = new HorizontalPanel();
+ busy.add( new Label("Validating and building package...") );
+ busy.add( new Image("images/spinner.gif") );
+
+ buildResults.add( busy );
+
+ DeferredCommand.add( new Command() {
+ public void execute() {
+ RepositoryServiceFactory.getService().buildPackage( conf.uuid, new AsyncCallback() {
+ public void onSuccess(Object data) {
+ if (data == null) {
+ showSuccessfulBuild(buildResults);
+
+ } else {
+ BuilderResult[] results = (BuilderResult[]) data;
+ showBuilderErrors(results, buildResults);
+ }
+ }
+ public void onFailure(Throwable t) {
+ ErrorPopup.showMessage( t.getMessage() );
+ buildResults.clear();
+ }
+ });
+ }
+ });
+
+
+
+ }
+
+ /**
+ * This is called to display the success (and a download option).
+ * @param buildResults
+ */
+ private void showSuccessfulBuild(Panel buildResults) {
+ buildResults.clear();
+ buildResults.add( new Label("Package build successfully.") );
+ }
+
+ /**
+ * This is called in the unhappy event of there being errors.
+ */
+ private void showBuilderErrors(BuilderResult[] results, Panel buildResults) {
+ buildResults.clear();
+
+ FlexTable errTable = new FlexTable();
+ errTable.setStyleName( "error-List" );
+ errTable.setText( 0, 1, "Format" );
+ errTable.setText( 0, 2, "Name" );
+ errTable.setText( 0, 3, "Message" );
+
+ for ( int i = 0; i < results.length; i++ ) {
+ int row = i+1;
+ BuilderResult res = results[i];
+ errTable.setWidget( row, 0, new Image("images/error.gif"));
+ errTable.setText( row, 1, res.assetFormat );
+ errTable.setText( row, 2, res.assetName );
+ errTable.setText( row, 3, res.message );
+
+ errTable.setWidget( row, 4, new Button("show") );
+ }
+
+ buildResults.add( errTable );
+
+ }
+
private Widget warnings() {
if (this.previousResponse != null && this.previousResponse.hasErrors) {
Image img = new Image("images/warning.gif");
@@ -192,7 +302,7 @@
form.addAttribute( "Choose or create snapshot name:", vert);
final List radioList = new ArrayList();
final TextBox newName = new TextBox();
- final String newSnapshotText = "NEW:";
+ final String newSnapshotText = "NEW: ";
RepositoryServiceFactory.getService().listSnapshots( conf.name, new GenericCallback() {
public void onSuccess(Object data) {
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-04-26 07:32:02 UTC (rev 11346)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryService.java 2007-04-26 07:39:23 UTC (rev 11347)
@@ -213,4 +213,10 @@
*/
public SuggestionCompletionEngine loadSuggestionCompletionEngine(String packageName) throws SerializableException;
+ /**
+ * Build the package (may be a snapshot) and return the result.
+ * This will then store the result in the package as an attachment.
+ */
+ public BuilderResult[] buildPackage(String packageUUID) throws SerializableException;
+
}
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryServiceAsync.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryServiceAsync.java 2007-04-26 07:32:02 UTC (rev 11346)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryServiceAsync.java 2007-04-26 07:39:23 UTC (rev 11347)
@@ -35,7 +35,6 @@
public void listAssets(java.lang.String p0, String[] p1, int p2, int p3, AsyncCallback cb);
public void listStates(AsyncCallback cb);
public void createState(java.lang.String p0, AsyncCallback cb);
- public void changeState(java.lang.String p0, java.lang.String p1, boolean p2, AsyncCallback cb);
public void changeAssetPackage(java.lang.String p0, java.lang.String p1, java.lang.String p2, AsyncCallback cb);
public void copyAsset(java.lang.String p0, java.lang.String p1, java.lang.String p2, AsyncCallback cb);
public void listSnapshots(java.lang.String p0, AsyncCallback cb);
@@ -44,4 +43,6 @@
public void quickFindAsset(java.lang.String p0, int p1, boolean p2, AsyncCallback cb);
public void removeCategory(java.lang.String p0, AsyncCallback cb);
public void loadSuggestionCompletionEngine(java.lang.String p0, AsyncCallback cb);
+ public void buildPackage(java.lang.String p0, AsyncCallback cb);
+ public void changeState(java.lang.String p0, java.lang.String p1, boolean p2, AsyncCallback cb);
}
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-04-26 07:32:02 UTC (rev 11346)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/ServiceImplementation.java 2007-04-26 07:39:23 UTC (rev 11347)
@@ -1,6 +1,11 @@
package org.drools.brms.server;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Calendar;
@@ -18,6 +23,7 @@
import org.apache.log4j.Logger;
import org.drools.brms.client.common.AssetFormats;
import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.brms.client.rpc.BuilderResult;
import org.drools.brms.client.rpc.MetaData;
import org.drools.brms.client.rpc.PackageConfigData;
import org.drools.brms.client.rpc.RepositoryService;
@@ -27,6 +33,8 @@
import org.drools.brms.client.rpc.TableDataResult;
import org.drools.brms.client.rpc.TableDataRow;
import org.drools.brms.client.rpc.ValidatedResponse;
+import org.drools.brms.server.builder.ContentAssemblyError;
+import org.drools.brms.server.builder.ContentPackageAssembler;
import org.drools.brms.server.contenthandler.ContentHandler;
import org.drools.brms.server.util.BRMSSuggestionCompletionLoader;
import org.drools.brms.server.util.MetaDataMapper;
@@ -41,6 +49,7 @@
import org.drools.repository.RulesRepositoryException;
import org.drools.repository.StateItem;
import org.drools.repository.VersionableItem;
+import org.drools.rule.Package;
import org.jboss.seam.annotations.AutoCreate;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
@@ -623,4 +632,41 @@
}
}
+
+ @WebRemote
+ public BuilderResult[] buildPackage(String packageUUID) throws SerializableException {
+ PackageItem item = repository.loadPackageByUUID( packageUUID );
+ ContentPackageAssembler asm = new ContentPackageAssembler(item);
+ if (asm.hasErrors()) {
+ BuilderResult[] result = new BuilderResult[asm.getErrors().size()];
+ for ( int i = 0; i < result.length; i++ ) {
+ ContentAssemblyError err = asm.getErrors().get( i );
+ BuilderResult res = new BuilderResult();
+ res.assetName = err.itemInError.getName();
+ res.assetFormat = err.itemInError.getFormat();
+ res.message = err.errorReport;
+ res.uuid = err.itemInError.getUUID();
+ result[i] = res;
+ }
+ return result;
+ } else {
+ try {
+ ByteArrayOutputStream bout = new ByteArrayOutputStream();
+ ObjectOutputStream out = new ObjectOutputStream(bout);
+ out.writeObject( asm.getBinaryPackage() );
+
+ item.updateCompiledPackage( new ByteArrayInputStream( bout.toByteArray()) );
+ out.flush();
+ out.close();
+
+ repository.save();
+ } catch (IOException e) {
+ log.error( e );
+ throw new SerializableException(e.getMessage());
+ }
+
+ return null;
+
+ }
+ }
}
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/builder/BRMSPackageBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/builder/BRMSPackageBuilder.java 2007-04-26 07:32:02 UTC (rev 11346)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/builder/BRMSPackageBuilder.java 2007-04-26 07:39:23 UTC (rev 11347)
@@ -60,6 +60,7 @@
PackageBuilderConfiguration config = new PackageBuilderConfiguration();
config.setClassLoader( loader );
+ config.setCompiler( PackageBuilderConfiguration.JANINO );
return new BRMSPackageBuilder( config );
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-04-26 07:32:02 UTC (rev 11346)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java 2007-04-26 07:39:23 UTC (rev 11347)
@@ -1,13 +1,20 @@
package org.drools.brms.server;
+import java.io.ByteArrayInputStream;
+import java.io.ObjectInputStream;
import java.util.Calendar;
import java.util.Date;
import junit.framework.TestCase;
+import org.drools.Person;
+import org.drools.RuleBase;
+import org.drools.RuleBaseFactory;
+import org.drools.StatelessSession;
import org.drools.brms.client.common.AssetFormats;
import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
import org.drools.brms.client.modeldriven.brxml.RuleModel;
+import org.drools.brms.client.rpc.BuilderResult;
import org.drools.brms.client.rpc.PackageConfigData;
import org.drools.brms.client.rpc.RepositoryService;
import org.drools.brms.client.rpc.RuleAsset;
@@ -25,6 +32,8 @@
import org.drools.repository.PackageItem;
import org.drools.repository.RulesRepository;
import org.drools.repository.StateItem;
+import org.drools.rule.Package;
+import org.drools.util.BinaryRuleBaseLoader;
import com.google.gwt.user.client.rpc.SerializableException;
@@ -849,7 +858,73 @@
assertNotNull( eng );
}
+
+
+ /**
+ * This will test creating a package, check it compiles, and can exectute rules,
+ * then take a snapshot, and check that it reports errors.
+ */
+ public void testBinaryPackageCompileAndExecute() throws Exception {
+ ServiceImplementation impl = getService();
+ RulesRepository repo = impl.repository;
+
+
+
+ //create our package
+ PackageItem pkg = repo.createPackage( "testBinaryPackageCompile", "" );
+ pkg.updateHeader( "import org.drools.Person" );
+ AssetItem rule1 = pkg.addAsset( "rule_1", "" );
+ rule1.updateFormat( AssetFormats.DRL );
+ rule1.updateContent( "rule 'rule1' \n when p:Person() \n then p.setAge(42); \n end");
+ rule1.checkin( "" );
+ repo.save();
+
+ BuilderResult[] results = impl.buildPackage( pkg.getUUID() );
+ assertNull(results);
+
+ pkg = repo.loadPackage( "testBinaryPackageCompile" );
+ byte[] binPackage = pkg.getCompiledPackageBytes();
+
+ assertNotNull(binPackage);
+
+ ByteArrayInputStream bin = new ByteArrayInputStream(binPackage);
+ ObjectInputStream in = new ObjectInputStream(bin);
+ Package binPkg = (Package) in.readObject();
+
+ assertNotNull(binPkg);
+ assertTrue(binPkg.isValid());
+
+ Person p = new Person();
+
+ BinaryRuleBaseLoader loader = new BinaryRuleBaseLoader();
+ loader.addPackage( new ByteArrayInputStream(binPackage) );
+ RuleBase rb = loader.getRuleBase();
+
+ StatelessSession sess = rb.newStatelessSession();
+ sess.execute( p );
+ assertEquals(42, p.getAge());
+
+ impl.createPackageSnapshot( "testBinaryPackageCompile", "SNAP1", false, "" );
+
+
+ rule1.updateContent( "rule 'rule1' \n when p:PersonX() \n then System.err.println(42); \n end");
+ rule1.checkin( "" );
+
+ results = impl.buildPackage( pkg.getUUID() );
+ assertNotNull(results);
+ assertEquals(1, results.length);
+ assertEquals(rule1.getName(), results[0].assetName);
+ assertEquals(AssetFormats.DRL, results[0].assetFormat);
+ assertNotNull(results[0].message);
+ assertEquals(rule1.getUUID(), results[0].uuid);
+
+ pkg = repo.loadPackageSnapshot( "testBinaryPackageCompile", "SNAP1" );
+ results = impl.buildPackage( pkg.getUUID() );
+ assertNull(results);
+
+ }
+
private ServiceImplementation getService() throws Exception {
ServiceImplementation impl = new ServiceImplementation();
impl.repository = new RulesRepository( TestEnvironmentSessionHelper.getSession() );
More information about the jboss-svn-commits
mailing list