[jboss-svn-commits] JBL Code SVN: r14107 - in labs/jbossrules/trunk/drools-jbrms: src/main/java/org/drools/brms/client/admin and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Aug 8 19:02:42 EDT 2007
Author: fmeyer
Date: 2007-08-08 19:02:42 -0400 (Wed, 08 Aug 2007)
New Revision: 14107
Modified:
labs/jbossrules/trunk/drools-jbrms/.classpath
labs/jbossrules/trunk/drools-jbrms/.project
labs/jbossrules/trunk/drools-jbrms/JBRMS.mac.launch
labs/jbossrules/trunk/drools-jbrms/build.properties
labs/jbossrules/trunk/drools-jbrms/redeploy_appserver.sh
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/admin/ArchivedAssetManager.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/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:
JBRULES-995 - JBRULES-996
- added remove and unarchive
Modified: labs/jbossrules/trunk/drools-jbrms/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/.classpath 2007-08-08 21:41:22 UTC (rev 14106)
+++ labs/jbossrules/trunk/drools-jbrms/.classpath 2007-08-08 23:02:42 UTC (rev 14107)
@@ -1,57 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar"/>
- <classpathentry kind="src" path="/drools-repository"/>
- <classpathentry kind="src" path="/drools-decisiontables"/>
- <classpathentry kind="src" path="/drools-compiler"/>
- <classpathentry kind="var" path="M2_REPO/javax/el/el-api/1.2/el-api-1.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.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/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0/antlr-runtime-3.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-api/1.3/jackrabbit-api-1.3.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/el/el-ri/1.2/el-ri-1.2.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/javax/jms/jms/1.1/jms-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-jcr-commons/1.3/jackrabbit-jcr-commons-1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.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/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-servlet/1.3.3/gwt-servlet-1.3.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-text-extractors/1.3/jackrabbit-text-extractors-1.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/jboss/javassist/3.4.ga/javassist-3.4.ga.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/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.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/tmatesoft/svnkit/1.1.2/svnkit-1.1.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.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/jboss/seam/jboss-seam/1.2.0.GA/jboss-seam-1.2.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.1/commons-io-1.1.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/javax/jcr/jcr/1.0/jcr-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/ch/ethz/ganymed/ganymed-ssh2/build210/ganymed-ssh2-build210.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar"/>
- <classpathentry kind="src" path="/drools-core"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.3.0/slf4j-api-1.3.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar"/>
- <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
- <classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2rc1rv780/mvel14-1.2rc1rv780.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="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-core/1.3/jackrabbit-core-1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.7/janino-2.5.7.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.3.0/slf4j-log4j12-1.3.0.jar"/>
-</classpath>
\ No newline at end of file
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <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/concurrent/concurrent/1.3.4/concurrent-1.3.4.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/org/apache/jackrabbit/jackrabbit-core/1.3/jackrabbit-core-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-text-extractors/1.3/jackrabbit-text-extractors-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/ch/ethz/ganymed/ganymed-ssh2/build210/ganymed-ssh2-build210.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/jcr/jcr/1.0/jcr-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/el/el-ri/1.2/el-ri-1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/drools-repository"/>
+ <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/asm/asm/1.5.3/asm-1.5.3.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="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/drools/drools-decisiontables/4.0.0.SNAPSHOT/drools-decisiontables-4.0.0.SNAPSHOT.jar" sourcepath="M2_REPO/org/drools/drools-decisiontables/4.0.0.SNAPSHOT/drools-decisiontables-4.0.0.SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.3.0/slf4j-log4j12-1.3.0.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/antlr/antlr-runtime/3.0/antlr-runtime-3.0.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/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/javassist/3.4.ga/javassist-3.4.ga.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/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-servlet/1.3.3/gwt-servlet-1.3.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.7/janino-2.5.7.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/el/el-api/1.2/el-api-1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.1/commons-io-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/drools/drools-core/4.0.0.SNAPSHOT/drools-core-4.0.0.SNAPSHOT.jar" sourcepath="M2_REPO/org/drools/drools-core/4.0.0.SNAPSHOT/drools-core-4.0.0.SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.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/org/slf4j/slf4j-api/1.3.0/slf4j-api-1.3.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-api/1.3/jackrabbit-api-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/drools/drools-compiler/4.0.0.SNAPSHOT/drools-compiler-4.0.0.SNAPSHOT.jar" sourcepath="M2_REPO/org/drools/drools-compiler/4.0.0.SNAPSHOT/drools-compiler-4.0.0.SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-jcr-commons/1.3/jackrabbit-jcr-commons-1.3.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/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/jms/jms/1.1/jms-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2rc1rv780/mvel14-1.2rc1rv780.jar"/>
+ <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/tmatesoft/svnkit/1.1.2/svnkit-1.1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: labs/jbossrules/trunk/drools-jbrms/.project
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/.project 2007-08-08 21:41:22 UTC (rev 14106)
+++ labs/jbossrules/trunk/drools-jbrms/.project 2007-08-08 23:02:42 UTC (rev 14107)
@@ -1,12 +1,7 @@
<projectDescription>
<name>drools-jbrms</name>
<comment>A rule production system</comment>
- <projects>
- <project>drools-repository</project>
- <project>drools-decisiontables</project>
- <project>drools-compiler</project>
- <project>drools-core</project>
- </projects>
+ <projects/>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
Modified: labs/jbossrules/trunk/drools-jbrms/JBRMS.mac.launch
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/JBRMS.mac.launch 2007-08-08 21:41:22 UTC (rev 14106)
+++ labs/jbossrules/trunk/drools-jbrms/JBRMS.mac.launch 2007-08-08 23:02:42 UTC (rev 14107)
@@ -11,7 +11,7 @@
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/src/main/java" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-jbrms/target/classes" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/drools-compiler/src/main/java" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry containerPath="GWT_DEV" path="3" type="3"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry containerPath="GWT_HOME/gwt-dev-mac.jar" path="3" type="3"/> "/>
<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 path="3" projectName="drools-core" type="1"/> "/>
@@ -52,5 +52,5 @@
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.GWTShell"/>
<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"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XstartOnFirstThread"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XstartOnFirstThread -Xmx400m -Xms40m"/>
</launchConfiguration>
Modified: labs/jbossrules/trunk/drools-jbrms/build.properties
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/build.properties 2007-08-08 21:41:22 UTC (rev 14106)
+++ labs/jbossrules/trunk/drools-jbrms/build.properties 2007-08-08 23:02:42 UTC (rev 14107)
@@ -1,2 +1,2 @@
#this is needed to point to your version of GWT
-gwt.home=/usr/local/share/java/gwt/
\ No newline at end of file
+gwt.home=/usr/local/share/gwt/
Modified: labs/jbossrules/trunk/drools-jbrms/redeploy_appserver.sh
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/redeploy_appserver.sh 2007-08-08 21:41:22 UTC (rev 14106)
+++ labs/jbossrules/trunk/drools-jbrms/redeploy_appserver.sh 2007-08-08 23:02:42 UTC (rev 14107)
@@ -1,4 +1,4 @@
mvn -o package -Dmaven.test.skip=true
-cp ./target/drools-jbrms.war /usr/local/share/java/jboss-4.2.0.GA/server/default/deploy
+cp ./target/drools-jbrms.war /usr/local/share/jboss-4.2.0.GA/server/default/deploy
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/admin/ArchivedAssetManager.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/admin/ArchivedAssetManager.java 2007-08-08 21:41:22 UTC (rev 14106)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/admin/ArchivedAssetManager.java 2007-08-08 23:02:42 UTC (rev 14107)
@@ -9,13 +9,12 @@
import org.drools.brms.client.rulelist.EditItemEvent;
import com.google.gwt.user.client.Command;
+import com.google.gwt.user.client.Window;
+import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.ClickListener;
import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.FlexTable;
import com.google.gwt.user.client.ui.HTML;
-import com.google.gwt.user.client.ui.HasHorizontalAlignment;
-import com.google.gwt.user.client.ui.HasVerticalAlignment;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Widget;
@@ -50,7 +49,6 @@
showArchivedAssets().execute();
widtab.addRow( new HTML( "<hr/>" ) );
widtab.addRow( newButtonsActionWiget() );
-
initWidget( widtab );
}
@@ -68,19 +66,40 @@
Button unarchive = new Button( "Unarchive" );
- refresh.addClickListener( new ClickListener() {
+ unarchive.addClickListener( new ClickListener() {
public void onClick(Widget w) {
- showArchivedAssets().execute();
+
+ RepositoryServiceFactory.getService().archiveAsset( listView.getSelectedElementUUID(), false, new AsyncCallback() {
+
+ public void onFailure(Throwable arg0) {
+ Window.alert( "Fail" );
+ }
+
+ public void onSuccess(Object arg0) {
+ showArchivedAssets().execute();
+ Window.alert( "Done!" );
+ }
+ });
}
} );
Button deleteperm = new Button( "Delete" );
- refresh.addClickListener( new ClickListener() {
+ deleteperm.addClickListener( new ClickListener() {
public void onClick(Widget w) {
- showArchivedAssets().execute();
+ RepositoryServiceFactory.getService().removeAsset( listView.getSelectedElementUUID(), new AsyncCallback() {
+
+ public void onFailure(Throwable arg0) {
+ Window.alert( "Fail" );
+ }
+
+ public void onSuccess(Object arg0) {
+ showArchivedAssets().execute();
+ Window.alert( "Done!" );
+
+ }
+ });
}
} );
-
horiz.add( refresh );
horiz.add( unarchive );
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-08-08 21:41:22 UTC (rev 14106)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryService.java 2007-08-08 23:02:42 UTC (rev 14107)
@@ -281,6 +281,18 @@
public String renameAsset(String uuid, String newName);
/**
+ * Archive asset based on uuid
+ * @param uuid
+ */
+ public void archiveAsset(String uuid, boolean value );
+
+ /**
+ * Remove an asset based on uuid
+ * @param uuid
+ */
+ public void removeAsset(String uuid);
+
+ /**
* Rename a package.
*/
public String renamePackage(String uuid, String newName);
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-08-08 21:41:22 UTC (rev 14106)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryServiceAsync.java 2007-08-08 23:02:42 UTC (rev 14107)
@@ -68,6 +68,8 @@
public void buildAssetSource(org.drools.brms.client.rpc.RuleAsset p0, AsyncCallback cb);
public void buildAsset(org.drools.brms.client.rpc.RuleAsset p0, AsyncCallback cb);
public void renameAsset(java.lang.String p0, java.lang.String p1, AsyncCallback cb);
+ public void archiveAsset(java.lang.String p0, boolean p1, AsyncCallback cb);
+ public void removeAsset(java.lang.String p0, AsyncCallback cb);
public void renamePackage(java.lang.String p0, java.lang.String p1, AsyncCallback cb);
-
+
}
\ No newline at end of file
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-08-08 21:41:22 UTC (rev 14106)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/ServiceImplementation.java 2007-08-08 23:02:42 UTC (rev 14107)
@@ -855,9 +855,36 @@
public String renameAsset(String uuid, String newName) {
return repository.renameAsset( uuid, newName );
}
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public void archiveAsset(String uuid, boolean value) {
+ try {
+ AssetItem item = repository.loadAssetByUUID( uuid );
+ item.archiveItem( value );
+ item.checkin( "unarchived" );
+
+ } catch (RulesRepositoryException e) {
+ log.error( e );
+ throw e;
+ }
+ }
@WebRemote
@Restrict("#{identity.loggedIn}")
+ public void removeAsset(String uuid) {
+ try {
+ AssetItem item = repository.loadAssetByUUID( uuid );
+ item.remove();
+ repository.save();
+ } catch (RulesRepositoryException e) {
+ log.error( e );
+ throw e;
+ }
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
public String renamePackage(String uuid, String newName) {
return repository.renamePackage( uuid, newName );
}
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 2007-08-08 21:41:22 UTC (rev 14106)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/webapp/org.drools.brms.JBRMS/org.drools.brms.JBRMS.nocache.html 2007-08-08 23:02:42 UTC (rev 14107)
@@ -69,11 +69,11 @@
var F;
var I = ["true", (F=window["prop$user.agent"],F(1))];
- O(["true","ie6"],"3758F059789A4FD9D8526FFB33B4745E");
- O(["true","opera"],"49A7CDC311988084EA73998A41C75EB5");
- O(["true","gecko"],"5D5A55D9B70CEFF8D5B7AD9FAB0F6A74");
- O(["true","gecko1_8"],"A6F78309AAFB6C438CFBA55D16367BA2");
- O(["true","safari"],"D09F805A4C427C6E7CA7C86F1B31D43A");
+ O(["true","opera"],"96EB53AC94A45BDBD448F9C541134597");
+ O(["true","gecko"],"9968B5A348DE50A5695B610537C01958");
+ O(["true","safari"],"9C045C7F7E8424F5DBFB4D601B838A2C");
+ O(["true","gecko1_8"],"B7645CE761BEBC29872D3BD678860860");
+ O(["true","ie6"],"E614384254EC3A597850B1451CE378EA");
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 2007-08-08 21:41:22 UTC (rev 14106)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java 2007-08-08 23:02:42 UTC (rev 14107)
@@ -1,4 +1,5 @@
package org.drools.brms.server;
+
/*
* Copyright 2005 JBoss Inc
*
@@ -15,8 +16,6 @@
* limitations under the License.
*/
-
-
import java.io.ByteArrayInputStream;
import java.io.ObjectInputStream;
import java.util.Calendar;
@@ -112,17 +111,18 @@
"txt" );
assertNotNull( uuid );
assertFalse( "".equals( uuid ) );
-
- AssetItem localItem = impl.repository.loadAssetByUUID( uuid );
- assertEquals( "test Delete Unversioned", localItem.getName() );
-
+
+ AssetItem localItem = impl.repository.loadAssetByUUID( uuid );
+ assertEquals( "test Delete Unversioned",
+ localItem.getName() );
+
localItem.remove();
impl.repository.save();
-
- try {
+
+ try {
localItem = impl.repository.loadAssetByUUID( uuid );
fail();
- } catch (Exception e ) {
+ } catch ( Exception e ) {
}
}
@@ -167,15 +167,15 @@
// impl.createNewRule( "somerule_" + i, "description",
// "testAddRule", "another", "drl" );
// }
-
+
result = impl.createNewRule( "testDTSample",
"a description",
"testAddRule",
"another",
- AssetFormats.DECISION_SPREADSHEET_XLS );
+ AssetFormats.DECISION_SPREADSHEET_XLS );
AssetItem dtItem = impl.repository.loadAssetByUUID( result );
- assertNotNull(dtItem.getBinaryContentAsBytes());
- assertTrue(dtItem.getBinaryContentAttachmentFileName().endsWith( ".xls" ));
+ assertNotNull( dtItem.getBinaryContentAsBytes() );
+ assertTrue( dtItem.getBinaryContentAttachmentFileName().endsWith( ".xls" ) );
}
public void testAttemptDupeRule() throws Exception {
@@ -242,7 +242,7 @@
public void testDateFormatting() throws Exception {
Calendar cal = Calendar.getInstance();
- TableDisplayHandler handler = new TableDisplayHandler(TableDisplayHandler.DEFAULT_TABLE_TEMPLATE);
+ TableDisplayHandler handler = new TableDisplayHandler( TableDisplayHandler.DEFAULT_TABLE_TEMPLATE );
String fmt = handler.formatDate( cal );
assertNotNull( fmt );
@@ -447,26 +447,25 @@
assertEquals( "testCheckinCategory/deeper",
asset2.metaData.categories[2] );
-
//now lets try a concurrent edit of an asset.
//asset3 will be loaded and edited, and then asset2 will try to clobber, it, which should fail.
//as it is optimistically locked.
RuleAsset asset3 = serv.loadRuleAsset( asset2.uuid );
- asset3.metaData.subject = "new sub";
+ asset3.metaData.subject = "new sub";
serv.checkinVersion( asset3 );
-
+
asset3 = serv.loadRuleAsset( asset2.uuid );
- assertFalse(asset3.metaData.versionNumber == asset2.metaData.versionNumber);
-
+ assertFalse( asset3.metaData.versionNumber == asset2.metaData.versionNumber );
+
try {
serv.checkinVersion( asset2 );
- fail("should have failed optimistic lock.");
- } catch (SerializableException e) {
- assertNotNull(e.getMessage());
- assertEquals(-1, e.getMessage().indexOf( "server" ));
+ fail( "should have failed optimistic lock." );
+ } catch ( SerializableException e ) {
+ assertNotNull( e.getMessage() );
+ assertEquals( -1,
+ e.getMessage().indexOf( "server" ) );
}
-
-
+
}
public void testArchivePackage() throws Exception {
@@ -501,18 +500,19 @@
assertEquals( "this is a new package",
conf.description );
assertNotNull( conf.lastModified );
-
+
pkgs = impl.listPackages();
-
- impl.copyPackage( "testCreatePackage", "testCreatePackage_COPY" );
-
-
-
- assertEquals(pkgs.length + 1, impl.listPackages().length);
+
+ impl.copyPackage( "testCreatePackage",
+ "testCreatePackage_COPY" );
+
+ assertEquals( pkgs.length + 1,
+ impl.listPackages().length );
try {
- impl.copyPackage( "testCreatePackage", "testCreatePackage_COPY" );
- } catch (RulesRepositoryException e) {
- assertNotNull(e.getMessage());
+ impl.copyPackage( "testCreatePackage",
+ "testCreatePackage_COPY" );
+ } catch ( RulesRepositoryException e ) {
+ assertNotNull( e.getMessage() );
}
}
@@ -536,21 +536,27 @@
data.externalURI );
assertNotNull( data.uuid );
- assertFalse(data.isSnapshot);
-
- assertNotNull(data.dateCreated);
+ assertFalse( data.isSnapshot );
+
+ assertNotNull( data.dateCreated );
Date original = data.lastModified;
-
+
Thread.sleep( 100 );
-
- impl.createPackageSnapshot( RulesRepository.DEFAULT_PACKAGE, "TEST SNAP 2.0", false, "ya" );
- PackageItem loaded = impl.repository.loadPackageSnapshot( RulesRepository.DEFAULT_PACKAGE, "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);
- assertEquals("TEST SNAP 2.0", data.snapshotName);
- assertFalse(original.equals( data.lastModified ));
- assertEquals("ya", data.checkinComment);
+ assertTrue( data.isSnapshot );
+ assertEquals( "TEST SNAP 2.0",
+ data.snapshotName );
+ assertFalse( original.equals( data.lastModified ) );
+ assertEquals( "ya",
+ data.checkinComment );
}
public void testPackageConfSave() throws Exception {
@@ -928,6 +934,117 @@
}
+ public void testRemoveAsset() throws Exception {
+ RepositoryService impl = getService();
+ String cat = "testRemoveAsset";
+ impl.createCategory( "/",
+ cat,
+ "ya" );
+ String pkgUUID = impl.createPackage( "testRemoveAsset",
+ "" );
+
+ String uuid = impl.createNewRule( "testRemoveAsset",
+ "x",
+ cat,
+ "testRemoveAsset",
+ "testRemoveAsset" );
+
+ String uuid2 = impl.createNewRule( "testRemoveAsset2",
+ "x",
+ cat,
+ "testRemoveAsset",
+ "testRemoveAsset" );
+
+ String uuid3 = impl.createNewRule( "testRemoveAsset3",
+ "x",
+ cat,
+ "testRemoveAsset",
+ "testRemoveAsset" );
+ String uuid4 = impl.createNewRule( "testRemoveAsset4",
+ "x",
+ cat,
+ "testRemoveAsset",
+ "testRemoveAsset" );
+
+ TableDataResult res = impl.listAssets( pkgUUID,
+ arr( "testRemoveAsset" ),
+ -1,
+ 0 );
+ assertEquals( 4,
+ res.data.length );
+
+ impl.removeAsset( uuid4 );
+
+ res = impl.listAssets( pkgUUID,
+ arr( "testRemoveAsset" ),
+ -1,
+ 0 );
+ assertEquals( 3,
+ res.data.length );
+ }
+
+
+ public void testArchiveAsset() throws Exception {
+ RepositoryService impl = getService();
+ String cat = "testArchiveAsset";
+ impl.createCategory( "/",
+ cat,
+ "ya" );
+ String pkgUUID = impl.createPackage( "testArchiveAsset",
+ "" );
+
+ String uuid = impl.createNewRule( "testArchiveAsset",
+ "x",
+ cat,
+ "testArchiveAsset",
+ "testArchiveAsset" );
+
+ String uuid2 = impl.createNewRule( "testArchiveAsset2",
+ "x",
+ cat,
+ "testArchiveAsset",
+ "testArchiveAsset" );
+
+ String uuid3 = impl.createNewRule( "testArchiveAsset3",
+ "x",
+ cat,
+ "testArchiveAsset",
+ "testArchiveAsset" );
+ String uuid4 = impl.createNewRule( "testArchiveAsset4",
+ "x",
+ cat,
+ "testArchiveAsset",
+ "testArchiveAsset" );
+
+ TableDataResult res = impl.listAssets( pkgUUID,
+ arr( "testArchiveAsset" ),
+ -1,
+ 0 );
+ assertEquals( 4,
+ res.data.length );
+
+ impl.archiveAsset( uuid4, true );
+
+ res = impl.listAssets( pkgUUID,
+ arr( "testArchiveAsset" ),
+ -1,
+ 0 );
+ assertEquals( 3,
+ res.data.length );
+
+ impl.archiveAsset( uuid4, false );
+
+ res = impl.listAssets( pkgUUID,
+ arr( "testArchiveAsset" ),
+ -1,
+ 0 );
+ assertEquals( 4,
+ res.data.length );
+
+ }
+
+
+
public void testLoadSuggestionCompletionEngine() throws Exception {
RepositoryService impl = getService();
String uuid = impl.createPackage( "testSuggestionComp",
@@ -939,9 +1056,7 @@
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.
@@ -949,59 +1064,69 @@
public void testBinaryPackageCompileAndExecute() throws Exception {
ServiceImplementation impl = getService();
RulesRepository repo = impl.repository;
-
+
//create our package
- PackageItem pkg = repo.createPackage( "testBinaryPackageCompile", "" );
+ PackageItem pkg = repo.createPackage( "testBinaryPackageCompile",
+ "" );
pkg.updateHeader( "import org.drools.Person" );
- AssetItem rule1 = pkg.addAsset( "rule_1", "" );
+ AssetItem rule1 = pkg.addAsset( "rule_1",
+ "" );
rule1.updateFormat( AssetFormats.DRL );
- rule1.updateContent( "rule 'rule1' \n when \np : Person() \n then \np.setAge(42); \n end");
+ rule1.updateContent( "rule 'rule1' \n when \np : Person() \n then \np.setAge(42); \n end" );
rule1.checkin( "" );
repo.save();
-
+
BuilderResult[] results = impl.buildPackage( pkg.getUUID() );
- assertNull(results);
-
+ assertNull( results );
+
pkg = repo.loadPackage( "testBinaryPackageCompile" );
byte[] binPackage = pkg.getCompiledPackageBytes();
- assertNotNull(binPackage);
-
- ByteArrayInputStream bin = new ByteArrayInputStream(binPackage);
- ObjectInputStream in = new DroolsObjectInputStream(bin);
+ assertNotNull( binPackage );
+
+ ByteArrayInputStream bin = new ByteArrayInputStream( binPackage );
+ ObjectInputStream in = new DroolsObjectInputStream( bin );
Package binPkg = (Package) in.readObject();
-
- assertNotNull(binPkg);
- assertTrue(binPkg.isValid());
-
+
+ assertNotNull( binPkg );
+ assertTrue( binPkg.isValid() );
+
Person p = new Person();
-
+
BinaryRuleBaseLoader loader = new BinaryRuleBaseLoader();
- loader.addPackage( new ByteArrayInputStream(binPackage) );
+ 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");
+ 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" );
+ 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);
-
+ assertNull( results );
+
}
/**
@@ -1013,102 +1138,113 @@
RulesRepository repo = impl.repository;
//create our package
- PackageItem pkg = repo.createPackage( "testBinaryPackageCompileBRL", "" );
+ PackageItem pkg = repo.createPackage( "testBinaryPackageCompileBRL",
+ "" );
pkg.updateHeader( "import org.drools.Person" );
- AssetItem rule2 = pkg.addAsset( "rule2", "" );
+ AssetItem rule2 = pkg.addAsset( "rule2",
+ "" );
rule2.updateFormat( AssetFormats.BUSINESS_RULE );
-
+
RuleModel model = new RuleModel();
model.name = "rule2";
- FactPattern pattern = new FactPattern("Person");
+ FactPattern pattern = new FactPattern( "Person" );
pattern.boundName = "p";
- ActionSetField action = new ActionSetField("p");
- ActionFieldValue value = new ActionFieldValue("age", "42", SuggestionCompletionEngine.TYPE_NUMERIC );
+ ActionSetField action = new ActionSetField( "p" );
+ ActionFieldValue value = new ActionFieldValue( "age",
+ "42",
+ SuggestionCompletionEngine.TYPE_NUMERIC );
action.addFieldValue( value );
-
+
model.addLhsItem( pattern );
model.addRhsItem( action );
-
+
rule2.updateContent( BRXMLPersistence.getInstance().marshal( model ) );
rule2.checkin( "" );
repo.save();
-
+
BuilderResult[] results = impl.buildPackage( pkg.getUUID() );
- if (results != null) {
+ if ( results != null ) {
for ( int i = 0; i < results.length; i++ ) {
- System.err.println(results[i].message);
+ System.err.println( results[i].message );
}
}
- assertNull(results);
-
+ assertNull( results );
+
pkg = repo.loadPackage( "testBinaryPackageCompileBRL" );
byte[] binPackage = pkg.getCompiledPackageBytes();
//Here is where we write it out if needed... UNCOMMENT if needed for the binary test
-// FileOutputStream out = new FileOutputStream("/home/michael/RepoBinPackage.pkg");
-// out.write( binPackage );
-// out.flush();
-// out.close();
-
- assertNotNull(binPackage);
-
-
- ByteArrayInputStream bin = new ByteArrayInputStream(binPackage);
- ObjectInputStream in = new DroolsObjectInputStream(bin);
+ // FileOutputStream out = new FileOutputStream("/home/michael/RepoBinPackage.pkg");
+ // out.write( binPackage );
+ // out.flush();
+ // out.close();
+
+ assertNotNull( binPackage );
+
+ ByteArrayInputStream bin = new ByteArrayInputStream( binPackage );
+ ObjectInputStream in = new DroolsObjectInputStream( bin );
Package binPkg = (Package) in.readObject();
-
- assertNotNull(binPkg);
- assertTrue(binPkg.isValid());
-
+
+ assertNotNull( binPkg );
+ assertTrue( binPkg.isValid() );
+
Person p = new Person();
-
+
BinaryRuleBaseLoader loader = new BinaryRuleBaseLoader();
- loader.addPackage( new ByteArrayInputStream(binPackage) );
+ loader.addPackage( new ByteArrayInputStream( binPackage ) );
RuleBase rb = loader.getRuleBase();
-
+
StatelessSession sess = rb.newStatelessSession();
sess.execute( p );
- assertEquals(42, p.getAge());
-
- impl.createPackageSnapshot( "testBinaryPackageCompileBRL", "SNAP1", false, "" );
-
+ assertEquals( 42,
+ p.getAge() );
+
+ impl.createPackageSnapshot( "testBinaryPackageCompileBRL",
+ "SNAP1",
+ false,
+ "" );
+
pattern.factType = "PersonX";
rule2.updateContent( BRXMLPersistence.getInstance().marshal( model ) );
rule2.checkin( "" );
-
+
results = impl.buildPackage( pkg.getUUID() );
- assertNotNull(results);
- assertTrue(results.length > 0);
+ assertNotNull( results );
+ assertTrue( results.length > 0 );
//assertEquals(2, results.length);
- assertEquals(rule2.getName(), results[0].assetName);
- assertEquals(AssetFormats.BUSINESS_RULE, results[0].assetFormat);
- assertNotNull(results[0].message);
- assertEquals(rule2.getUUID(), results[0].uuid);
-
- pkg = repo.loadPackageSnapshot( "testBinaryPackageCompileBRL", "SNAP1" );
+ assertEquals( rule2.getName(),
+ results[0].assetName );
+ assertEquals( AssetFormats.BUSINESS_RULE,
+ results[0].assetFormat );
+ assertNotNull( results[0].message );
+ assertEquals( rule2.getUUID(),
+ results[0].uuid );
+
+ pkg = repo.loadPackageSnapshot( "testBinaryPackageCompileBRL",
+ "SNAP1" );
results = impl.buildPackage( pkg.getUUID() );
- assertNull(results);
-
+ assertNull( results );
+
//check that the rule name in the model is being set
- AssetItem asset2 = pkg.addAsset( "testSetRuleName", "" );
+ AssetItem asset2 = pkg.addAsset( "testSetRuleName",
+ "" );
asset2.updateFormat( AssetFormats.BUSINESS_RULE );
asset2.checkin( "" );
RuleModel model2 = new RuleModel();
- assertNull(model2.name);
+ assertNull( model2.name );
RuleAsset asset = impl.loadRuleAsset( asset2.getUUID() );
asset.content = model2;
-
+
impl.checkinVersion( asset );
-
+
asset = impl.loadRuleAsset( asset2.getUUID() );
-
+
model2 = (RuleModel) asset.content;
- assertNotNull(model2);
- assertNotNull(model2.name);
- assertEquals(asset2.getName(), model2.name);
-
-
+ assertNotNull( model2 );
+ assertNotNull( model2.name );
+ assertEquals( asset2.getName(),
+ model2.name );
}
@@ -1123,259 +1259,281 @@
RuleBase rb = loader.getRuleBase();
StatelessSession sess = rb.newStatelessSession();
sess.execute( p );
- assertEquals(42, p.getAge());
+ assertEquals( 42,
+ p.getAge() );
}
-
+
public void testPackageSource() throws Exception {
ServiceImplementation impl = getService();
RulesRepository repo = impl.repository;
-
+
//create our package
- PackageItem pkg = repo.createPackage( "testPackageSource", "" );
+ PackageItem pkg = repo.createPackage( "testPackageSource",
+ "" );
pkg.updateHeader( "import org.goo.Ber" );
- AssetItem rule1 = pkg.addAsset( "rule_1", "" );
+ 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.updateContent( "rule 'rule1' \n when p:Person() \n then p.setAge(42); \n end" );
rule1.checkin( "" );
repo.save();
-
- AssetItem func = pkg.addAsset( "funky", "" );
+
+ AssetItem func = pkg.addAsset( "funky",
+ "" );
func.updateFormat( AssetFormats.FUNCTION );
func.updateContent( "this is a func" );
func.checkin( "" );
-
+
String drl = impl.buildPackageSource( pkg.getUUID() );
- assertNotNull(drl);
-
- assertTrue(drl.indexOf( "import org.goo.Ber" ) > -1);
- assertTrue(drl.indexOf( "package testPackageSource" ) > -1);
- assertTrue(drl.indexOf( "rule 'rule1'" ) > -1);
- assertTrue(drl.indexOf( "this is a func" ) > -1);
- assertTrue(drl.indexOf( "this is a func" ) < drl.indexOf( "rule 'rule1'" ));
- assertTrue(drl.indexOf( "package testPackageSource" ) < drl.indexOf( "this is a func" ));
- assertTrue(drl.indexOf( "package testPackageSource" ) < drl.indexOf( "import org.goo.Ber" ));
-
+ assertNotNull( drl );
- AssetItem dsl = pkg.addAsset( "MyDSL", "" );
+ assertTrue( drl.indexOf( "import org.goo.Ber" ) > -1 );
+ assertTrue( drl.indexOf( "package testPackageSource" ) > -1 );
+ assertTrue( drl.indexOf( "rule 'rule1'" ) > -1 );
+ assertTrue( drl.indexOf( "this is a func" ) > -1 );
+ assertTrue( drl.indexOf( "this is a func" ) < drl.indexOf( "rule 'rule1'" ) );
+ assertTrue( drl.indexOf( "package testPackageSource" ) < drl.indexOf( "this is a func" ) );
+ assertTrue( drl.indexOf( "package testPackageSource" ) < drl.indexOf( "import org.goo.Ber" ) );
+
+ AssetItem dsl = pkg.addAsset( "MyDSL",
+ "" );
dsl.updateFormat( AssetFormats.DSL );
dsl.updateContent( "[when]This is foo=bar()\n[then]do something=yeahMan();" );
dsl.checkin( "" );
-
- AssetItem asset = pkg.addAsset( "MyDSLRule", "" );
+
+ AssetItem asset = pkg.addAsset( "MyDSLRule",
+ "" );
asset.updateFormat( AssetFormats.DSL_TEMPLATE_RULE );
asset.updateContent( "when \n This is foo \n then \n do something" );
asset.checkin( "" );
-
+
drl = impl.buildPackageSource( pkg.getUUID() );
- assertNotNull(drl);
-
- assertTrue(drl.indexOf( "import org.goo.Ber" ) > -1);
- assertTrue(drl.indexOf( "This is foo" ) == -1);
- assertTrue(drl.indexOf( "do something" ) == -1);
- assertTrue(drl.indexOf( "bar()" ) > 0);
- assertTrue(drl.indexOf( "yeahMan();" ) > 0);
-
-
+ assertNotNull( drl );
+
+ assertTrue( drl.indexOf( "import org.goo.Ber" ) > -1 );
+ assertTrue( drl.indexOf( "This is foo" ) == -1 );
+ assertTrue( drl.indexOf( "do something" ) == -1 );
+ assertTrue( drl.indexOf( "bar()" ) > 0 );
+ assertTrue( drl.indexOf( "yeahMan();" ) > 0 );
+
}
-
+
public void testAssetSource() throws Exception {
ServiceImplementation impl = getService();
RulesRepository repo = impl.repository;
-
+
//create our package
- PackageItem pkg = repo.createPackage( "testAssetSource", "" );
- AssetItem asset = pkg.addAsset( "testRule", "" );
+ PackageItem pkg = repo.createPackage( "testAssetSource",
+ "" );
+ AssetItem asset = pkg.addAsset( "testRule",
+ "" );
asset.updateFormat( AssetFormats.DRL );
- asset.updateContent( "rule 'n' \n when Foo() then bar(); \n end");
+ asset.updateContent( "rule 'n' \n when Foo() then bar(); \n end" );
asset.checkin( "" );
repo.save();
RuleAsset rule = impl.loadRuleAsset( asset.getUUID() );
String drl = impl.buildAssetSource( rule );
- assertEquals("rule 'n' \n when Foo() then bar(); \n end", drl);
-
- asset = pkg.addAsset( "DT", "" );
+ assertEquals( "rule 'n' \n when Foo() then bar(); \n end",
+ drl );
+
+ asset = pkg.addAsset( "DT",
+ "" );
asset.updateFormat( AssetFormats.DECISION_SPREADSHEET_XLS );
asset.updateBinaryContentAttachment( this.getClass().getResourceAsStream( "/SampleDecisionTable.xls" ) );
asset.checkin( "" );
-
+
rule = impl.loadRuleAsset( asset.getUUID() );
drl = impl.buildAssetSource( rule );
- assertNotNull(drl);
- assertTrue(drl.indexOf( "rule" ) > -1);
- assertTrue(drl.indexOf( "policy: Policy" ) > -1);
-
- AssetItem dsl = pkg.addAsset( "MyDSL", "" );
+ assertNotNull( drl );
+ assertTrue( drl.indexOf( "rule" ) > -1 );
+ assertTrue( drl.indexOf( "policy: Policy" ) > -1 );
+
+ AssetItem dsl = pkg.addAsset( "MyDSL",
+ "" );
dsl.updateFormat( AssetFormats.DSL );
dsl.updateContent( "[when]This is foo=bar()\n[then]do something=yeahMan();" );
dsl.checkin( "" );
-
- asset = pkg.addAsset( "MyDSLRule", "" );
+
+ asset = pkg.addAsset( "MyDSLRule",
+ "" );
asset.updateFormat( AssetFormats.DSL_TEMPLATE_RULE );
asset.updateContent( "when \n This is foo \n then \n do something" );
asset.checkin( "" );
-
-
+
rule = impl.loadRuleAsset( asset.getUUID() );
drl = impl.buildAssetSource( rule );
- assertNotNull(drl);
- assertTrue(drl.indexOf( "This is foo" ) == -1);
- assertTrue(drl.indexOf( "do something" ) == -1);
- assertTrue(drl.indexOf( "bar()" ) > -1);
- assertTrue(drl.indexOf( "yeahMan();" ) > -1);
-
+ assertNotNull( drl );
+ assertTrue( drl.indexOf( "This is foo" ) == -1 );
+ assertTrue( drl.indexOf( "do something" ) == -1 );
+ assertTrue( drl.indexOf( "bar()" ) > -1 );
+ assertTrue( drl.indexOf( "yeahMan();" ) > -1 );
+
}
-
+
public void testBuildAsset() throws Exception {
ServiceImplementation impl = getService();
RulesRepository repo = impl.repository;
-
+
//create our package
- PackageItem pkg = repo.createPackage( "testBuildAsset", "" );
- AssetItem model = pkg.addAsset( "MyModel", "" );
+ PackageItem pkg = repo.createPackage( "testBuildAsset",
+ "" );
+ AssetItem model = pkg.addAsset( "MyModel",
+ "" );
model.updateFormat( AssetFormats.MODEL );
model.updateBinaryContentAttachment( this.getClass().getResourceAsStream( "/billasurf.jar" ) );
model.checkin( "" );
-
+
pkg.updateHeader( "import com.billasurf.Person" );
-
-
- AssetItem asset = pkg.addAsset( "testRule", "" );
+
+ AssetItem asset = pkg.addAsset( "testRule",
+ "" );
asset.updateFormat( AssetFormats.DRL );
- asset.updateContent( "rule 'MyGoodRule' \n when Person() then System.err.println(42); \n end");
+ asset.updateContent( "rule 'MyGoodRule' \n when Person() then System.err.println(42); \n end" );
asset.checkin( "" );
repo.save();
-
+
RuleAsset rule = impl.loadRuleAsset( asset.getUUID() );
//check its all OK
BuilderResult[] result = impl.buildAsset( rule );
- assertNull(result);
+ assertNull( result );
//try it with a bad rule
RuleContentText text = new RuleContentText();
text.content = "rule 'MyBadRule' \n when Personx() then System.err.println(42); \n end";
rule.content = text;
-
+
result = impl.buildAsset( rule );
- assertNotNull(result);
- assertNotNull(result[0].message);
- assertEquals(AssetFormats.DRL, result[0].assetFormat);
-
+ assertNotNull( result );
+ assertNotNull( result[0].message );
+ assertEquals( AssetFormats.DRL,
+ result[0].assetFormat );
//now mix in a DSL
- AssetItem dsl = pkg.addAsset( "MyDSL", "" );
+ AssetItem dsl = pkg.addAsset( "MyDSL",
+ "" );
dsl.updateFormat( AssetFormats.DSL );
dsl.updateContent( "[when]There is a person=Person()\n[then]print out 42=System.err.println(42);" );
dsl.checkin( "" );
- AssetItem dslRule = pkg.addAsset( "dslRule", "" );
+ AssetItem dslRule = pkg.addAsset( "dslRule",
+ "" );
dslRule.updateFormat( AssetFormats.DSL_TEMPLATE_RULE );
dslRule.updateContent( "when \n There is a person \n then \n print out 42" );
dslRule.checkin( "" );
-
+
rule = impl.loadRuleAsset( dslRule.getUUID() );
-
+
result = impl.buildAsset( rule );
- assertNull(result);
-
+ assertNull( result );
+
}
-
+
public void testBuildAssetBRXML() throws Exception {
ServiceImplementation impl = getService();
RulesRepository repo = impl.repository;
-
+
//create our package
- PackageItem pkg = repo.createPackage( "testBuildAssetBRL", "" );
- AssetItem model = pkg.addAsset( "MyModel", "" );
+ PackageItem pkg = repo.createPackage( "testBuildAssetBRL",
+ "" );
+ AssetItem model = pkg.addAsset( "MyModel",
+ "" );
model.updateFormat( AssetFormats.MODEL );
model.updateBinaryContentAttachment( this.getClass().getResourceAsStream( "/billasurf.jar" ) );
model.checkin( "" );
-
+
pkg.updateHeader( "import com.billasurf.Person" );
- impl.createCategory( "/", "brl", "" );
+ impl.createCategory( "/",
+ "brl",
+ "" );
- String uuid = impl.createNewRule( "testBRL", "", "brl", "testBuildAssetBRL", AssetFormats.BUSINESS_RULE );
-
-
+ String uuid = impl.createNewRule( "testBRL",
+ "",
+ "brl",
+ "testBuildAssetBRL",
+ AssetFormats.BUSINESS_RULE );
+
RuleAsset rule = impl.loadRuleAsset( uuid );
-
+
RuleModel m = (RuleModel) rule.content;
- assertNotNull(m);
+ assertNotNull( m );
m.name = "testBRL";
-
- FactPattern p = new FactPattern("Person");
+
+ FactPattern p = new FactPattern( "Person" );
p.boundName = "p";
SingleFieldConstraint con = new SingleFieldConstraint();
con.fieldName = "name";
con.value = "mark";
con.operator = "==";
con.constraintValueType = SingleFieldConstraint.TYPE_LITERAL;
-
+
p.addConstraint( con );
-
+
m.addLhsItem( p );
-
- ActionSetField set = new ActionSetField("p");
- ActionFieldValue f = new ActionFieldValue("name", "42-ngoo", SuggestionCompletionEngine.TYPE_STRING);
+
+ ActionSetField set = new ActionSetField( "p" );
+ ActionFieldValue f = new ActionFieldValue( "name",
+ "42-ngoo",
+ SuggestionCompletionEngine.TYPE_STRING );
set.addFieldValue( f );
-
+
m.addRhsItem( set );
-
+
impl.checkinVersion( rule );
-
+
//check its all OK
BuilderResult[] result = impl.buildAsset( rule );
- if (result != null) {
+ if ( result != null ) {
for ( int i = 0; i < result.length; i++ ) {
- System.err.println(result[i].message);
+ System.err.println( result[i].message );
}
}
- assertNull(result);
+ assertNull( result );
}
-
+
public void testBuildAssetWithPackageConfigError() throws Exception {
ServiceImplementation impl = getService();
RulesRepository repo = impl.repository;
-
- PackageItem pkg = repo.createPackage( "testBuildAssetWithPackageConfigError", "" );
-// AssetItem model = pkg.addAsset( "MyModel", "" );
-// model.updateFormat( AssetFormats.MODEL );
-// model.updateBinaryContentAttachment( this.getClass().getResourceAsStream( "/billasurf.jar" ) );
-// model.checkin( "" );
-
-// pkg.updateHeader( "import com.billasurf.Person" );
-
-
- AssetItem asset = pkg.addAsset( "testRule", "" );
+
+ PackageItem pkg = repo.createPackage( "testBuildAssetWithPackageConfigError",
+ "" );
+ // AssetItem model = pkg.addAsset( "MyModel", "" );
+ // model.updateFormat( AssetFormats.MODEL );
+ // model.updateBinaryContentAttachment( this.getClass().getResourceAsStream( "/billasurf.jar" ) );
+ // model.checkin( "" );
+
+ // pkg.updateHeader( "import com.billasurf.Person" );
+
+ AssetItem asset = pkg.addAsset( "testRule",
+ "" );
asset.updateFormat( AssetFormats.DRL );
- asset.updateContent( "rule 'MyGoodRule' \n when \n then \n end");
+ asset.updateContent( "rule 'MyGoodRule' \n when \n then \n end" );
asset.checkin( "" );
repo.save();
-
+
RuleAsset rule = impl.loadRuleAsset( asset.getUUID() );
//check its all OK
BuilderResult[] result = impl.buildAsset( rule );
- if (!(result == null)) {
- System.err.println(result[0].assetName + " " + result[0].message);
+ if ( !(result == null) ) {
+ System.err.println( result[0].assetName + " " + result[0].message );
}
- assertNull(result);
-
+ assertNull( result );
+
pkg.updateHeader( "importxxxx" );
repo.save();
result = impl.buildAsset( rule );
- assertNotNull(result);
-
- assertEquals(1, result.length);
- assertEquals("package", result[0].assetFormat);
- assertNotNull(result[0].message);
-
-
+ assertNotNull( result );
+
+ assertEquals( 1,
+ result.length );
+ assertEquals( "package",
+ result[0].assetFormat );
+ assertNotNull( result[0].message );
+
}
-
-
private ServiceImplementation getService() throws Exception {
ServiceImplementation impl = new ServiceImplementation();
impl.repository = new RulesRepository( TestEnvironmentSessionHelper.getSession() );
More information about the jboss-svn-commits
mailing list