[jboss-svn-commits] JBL Code SVN: r33893 - in labs/jbossrules/trunk: drools-decisiontables/META-INF and 7 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Thu Jul 15 00:41:13 EDT 2010


Author: mark.proctor at jboss.com
Date: 2010-07-15 00:41:13 -0400 (Thu, 15 Jul 2010)
New Revision: 33893

Modified:
   labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF
   labs/jbossrules/trunk/drools-decisiontables/META-INF/MANIFEST.MF
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/InsertFactWidget.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/TestEnvironmentSessionHelper.java
   labs/jbossrules/trunk/drools-persistence-jpa/META-INF/MANIFEST.MF
   labs/jbossrules/trunk/drools-process/drools-bam/
   labs/jbossrules/trunk/drools-process/drools-bpmn2/
   labs/jbossrules/trunk/drools-process/drools-bpmn2/META-INF/MANIFEST.MF
   labs/jbossrules/trunk/drools-templates/META-INF/MANIFEST.MF
Log:
-one compilation error
-one runtime error, bad path.

Modified: labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF	2010-07-15 02:43:28 UTC (rev 33892)
+++ labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF	2010-07-15 04:41:13 UTC (rev 33893)
@@ -17,7 +17,7 @@
  n="2.0",org.mvel2.optimizers;version="2.0",org.mvel2.templates;versio
  n="2.0",org.mvel2.util;version="2.0",org.osgi.framework;version="1.5"
  ,org.osgi.util.tracker;version="1.4",org.w3c.dom,org.xml.sax
-Bnd-LastModified: 1279156679876
+Bnd-LastModified: 1279160208943
 Export-Package: org.drools.builder.impl;uses:="org.drools.compiler,com
  .sun.tools.xjc";version="5.1.0.SNAPSHOT",org.drools.rule.builder;uses
  :="org.drools.compiler,org.mvel2.compiler,org.mvel2,org.drools.rule.b

Modified: labs/jbossrules/trunk/drools-decisiontables/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-decisiontables/META-INF/MANIFEST.MF	2010-07-15 02:43:28 UTC (rev 33892)
+++ labs/jbossrules/trunk/drools-decisiontables/META-INF/MANIFEST.MF	2010-07-15 04:41:13 UTC (rev 33893)
@@ -3,7 +3,7 @@
 Created-By: 1.5.0_21 (Sun Microsystems Inc.)
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Import-Package: jxl,jxl.read.biff,org.osgi.framework;version="1.5"
-Bnd-LastModified: 1279117747503
+Bnd-LastModified: 1279161829143
 Export-Package: org.drools.decisiontable;uses:="org.drools.decisiontab
  le.parser.csv,org.drools.decisiontable.parser,org.drools.decisiontabl
  e.parser.xls";version="5.1.0.SNAPSHOT",org.drools.decisiontable.parse

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/InsertFactWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/InsertFactWidget.java	2010-07-15 02:43:28 UTC (rev 33892)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/InsertFactWidget.java	2010-07-15 04:41:13 UTC (rev 33893)
@@ -2,6 +2,8 @@
 
 import org.drools.guvnor.client.common.ErrorPopup;
 import org.drools.ide.common.client.modeldriven.testing.ExecutionTrace;
+import org.drools.ide.common.client.modeldriven.testing.FactData;
+import org.drools.ide.common.client.modeldriven.testing.Fixture;
 import org.drools.ide.common.client.modeldriven.testing.FixtureList;
 import org.drools.ide.common.client.modeldriven.testing.Scenario;
 
@@ -29,11 +31,22 @@
     }
 
     public void onDelete() {
-        if ( scenario.isFactNameUsed( definitionList ) ) {
+        boolean used = false;
+    
+        for ( Fixture fixture : definitionList ) {
+            if ( fixture instanceof FactData ) {
+                final FactData factData = (FactData) fixture;
+                if ( scenario.isFactNameUsed( factData ) ) {
+                    used = true;
+                    break;
+                }
+            }
+        }
+        
+        if ( used ) {
             ErrorPopup.showMessage( constants.CantRemoveThisBlockAsOneOfTheNamesIsBeingUsed() );
         } else {
             super.onDelete();
         }
-
     }
 }

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/TestEnvironmentSessionHelper.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/TestEnvironmentSessionHelper.java	2010-07-15 02:43:28 UTC (rev 33892)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/TestEnvironmentSessionHelper.java	2010-07-15 04:41:13 UTC (rev 33893)
@@ -69,7 +69,9 @@
 	                admin.clearRulesRepository( );
 	            }
 	            config.setupRulesRepository( testSession );
-	            PrintWriter out = new PrintWriter(new FileOutputStream("/tmp/pepe.txt"));
+	            File file = File.createTempFile( "pete", "txt" );
+	            file.deleteOnExit();
+	            PrintWriter out = new PrintWriter(new FileOutputStream(file));
 				//dump(testSession.getRootNode(), out);
 //	            OutputStream out = new FileOutputStream("/tmp/pepe.txt");
 //	            testSession.exportSystemView("/", out, true, false);

Modified: labs/jbossrules/trunk/drools-persistence-jpa/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-persistence-jpa/META-INF/MANIFEST.MF	2010-07-15 02:43:28 UTC (rev 33892)
+++ labs/jbossrules/trunk/drools-persistence-jpa/META-INF/MANIFEST.MF	2010-07-15 04:41:13 UTC (rev 33893)
@@ -4,7 +4,7 @@
 Import-Package: javax.naming,javax.persistence,javax.transaction,org.h
  ibernate.annotations,org.hibernate.ejb,org.osgi.framework;version="1.
  5",org.slf4j;version="1.6"
-Bnd-LastModified: 1279115684329
+Bnd-LastModified: 1279161119824
 Export-Package: org.drools.persistence.processinstance.persisters;uses
  :="org.drools.persistence.processinstance.variabletypes,javax.persist
  ence";version="5.1.0.SNAPSHOT",org.drools.persistence.session;uses:="
@@ -18,8 +18,8 @@
  rools.persistence.processinstance.variabletypes;uses:="javax.persiste
  nce";version="5.1.0.SNAPSHOT",org.drools.persistence.jpa.grid;uses:="
  org.drools.persistence.session,org.drools.persistence.processinstance
- ";version="5.1.0.SNAPSHOT",org.drools.persistence.osgi;uses:="org.osg
- i.framework,org.hibernate.ejb";version="5.1.0.SNAPSHOT"
+ ";version="5.1.0.SNAPSHOT",org.drools.persistence.osgi;uses:="org.hib
+ ernate.ejb,org.osgi.framework";version="5.1.0.SNAPSHOT"
 Bundle-Version: 5.1.0.SNAPSHOT
 Bundle-Name: Drools :: Persistence :: JPA
 Bundle-Description: A rule production system


Property changes on: labs/jbossrules/trunk/drools-process/drools-bam
___________________________________________________________________
Name: svn:ignore
   - target
local

.metadata
.settings
.wtpmodules

nbproject

*.ipr
*.iws
*.iml


bin


.classpath
.project

   + target
local

.metadata
.settings
.wtpmodules

nbproject

*.ipr
*.iws
*.iml


bin


.classpath
.project
*.tlog



Property changes on: labs/jbossrules/trunk/drools-process/drools-bpmn2
___________________________________________________________________
Name: svn:ignore
   - target
local

.metadata
.settings
.wtpmodules

nbproject

*.ipr
*.iws
*.iml



.classpath
.project

   + target
local

.metadata
.settings
.wtpmodules

nbproject

*.ipr
*.iws
*.iml



.classpath
.project
*.db
*.tlog


Modified: labs/jbossrules/trunk/drools-process/drools-bpmn2/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpmn2/META-INF/MANIFEST.MF	2010-07-15 02:43:28 UTC (rev 33892)
+++ labs/jbossrules/trunk/drools-process/drools-bpmn2/META-INF/MANIFEST.MF	2010-07-15 04:41:13 UTC (rev 33893)
@@ -1,33 +1,33 @@
 Manifest-Version: 1.0
-Export-Package: org.drools.osgi.bpmn2;uses:="org.drools.bpmn2,org.osgi
- .framework";version="5.1.0.SNAPSHOT",org.drools.bpmn2.legacy.beta1.di
- ;uses:="org.xml.sax,org.drools.bpmn2.legacy.beta1,org.w3c.dom,org.dro
- ols.bpmn2.core";version="5.1.0.SNAPSHOT",org.drools.bpmn2.xpath;versi
- on="5.1.0.SNAPSHOT",org.drools.bpmn2.xml.di;uses:="org.w3c.dom,org.xm
- l.sax,org.drools.bpmn2.core";version="5.1.0.SNAPSHOT",org.drools.bpmn
- 2;uses:="org.drools.bpmn2.legacy.beta1,org.drools.bpmn2.xml";version=
- "5.1.0.SNAPSHOT",org.drools.bpmn2.handler;version="5.1.0.SNAPSHOT",or
- g.drools.bpmn2.legacy.beta1;uses:="org.w3c.dom,org.drools.bpmn2.core,
- org.xml.sax,org.drools.bpmn2.legacy.beta1.di";version="5.1.0.SNAPSHOT
- ",org.drools.bpmn2.xml;uses:="org.w3c.dom,org.drools.bpmn2.core,org.x
- ml.sax,org.drools.bpmn2.xml.di";version="5.1.0.SNAPSHOT",org.drools.b
- pmn2.core;version="5.1.0.SNAPSHOT"
+Bundle-Activator: org.drools.osgi.bpmn2.Activator
+Created-By: 1.5.0_21 (Sun Microsystems Inc.)
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Import-Package: org.osgi.framework;version="1.5",org.w3c.dom,org.xml.s
+ ax
+Bnd-LastModified: 1279163196618
+Export-Package: org.drools.bpmn2.legacy.beta1;uses:="org.drools.bpmn2.
+ core,org.xml.sax,org.w3c.dom,org.drools.bpmn2.legacy.beta1.di";versio
+ n="5.1.0.SNAPSHOT",org.drools.bpmn2;uses:="org.drools.bpmn2.legacy.be
+ ta1,org.drools.bpmn2.xml";version="5.1.0.SNAPSHOT",org.drools.bpmn2.c
+ ore;version="5.1.0.SNAPSHOT",org.drools.bpmn2.legacy.beta1.di;uses:="
+ org.xml.sax,org.drools.bpmn2.core,org.w3c.dom,org.drools.bpmn2.legacy
+ .beta1";version="5.1.0.SNAPSHOT",org.drools.bpmn2.xpath;version="5.1.
+ 0.SNAPSHOT",org.drools.bpmn2.handler;version="5.1.0.SNAPSHOT",org.dro
+ ols.bpmn2.xml;uses:="org.drools.bpmn2.core,org.xml.sax,org.w3c.dom,or
+ g.drools.bpmn2.xml.di";version="5.1.0.SNAPSHOT",org.drools.bpmn2.xml.
+ di;uses:="org.xml.sax,org.w3c.dom,org.drools.bpmn2.core";version="5.1
+ .0.SNAPSHOT",org.drools.osgi.bpmn2;uses:="org.drools.bpmn2,org.osgi.f
+ ramework";version="5.1.0.SNAPSHOT"
+Bundle-Version: 5.1.0.SNAPSHOT
+Bundle-Name: Drools :: Process :: BPMN2
+Bundle-Description: A rule production system
+Bundle-DocURL: http://www.jboss.org/
+Bundle-Vendor: JBoss Inc.
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.drools.bpmn2;singleton:=true
 Tool: Bnd-0.0.357
-Bundle-Name: Drools :: Process :: BPMN2
-Created-By: 1.6.0_20 (Apple Inc.)
 Require-Bundle: org.drools.core;bundle-version="5.1.0.SNAPSHOT", org.d
  rools.compiler;bundle-version="5.1.0.SNAPSHOT", org.drools.persistenc
  e-jpa;optional="true";bundle-version="5.1.0.SNAPSHOT"
-Bundle-Vendor: JBoss Inc.
 DynamicImport-Package: *
-Bundle-Version: 5.1.0.SNAPSHOT
-Bnd-LastModified: 1277898137503
-Bundle-Activator: org.drools.osgi.bpmn2.Activator
-Bundle-ManifestVersion: 2
-Bundle-Description: A rule production system
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Import-Package: org.osgi.framework;version="1.5",org.w3c.dom,org.xml.s
- ax
-Bundle-SymbolicName: org.drools.bpmn2;singleton:=true
-Bundle-DocURL: http://www.jboss.org/
 

Modified: labs/jbossrules/trunk/drools-templates/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-templates/META-INF/MANIFEST.MF	2010-07-15 02:43:28 UTC (rev 33892)
+++ labs/jbossrules/trunk/drools-templates/META-INF/MANIFEST.MF	2010-07-15 04:41:13 UTC (rev 33893)
@@ -2,7 +2,7 @@
 Created-By: 1.5.0_21 (Sun Microsystems Inc.)
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Import-Package: org.mvel2.templates;version="2.0"
-Bnd-LastModified: 1279117720429
+Bnd-LastModified: 1279161811437
 Export-Package: org.drools.template.jdbc;uses:="org.drools.template.pa
  rser";version="5.1.0.SNAPSHOT",org.drools.template;uses:="org.drools.
  template.parser,org.drools.template.objects";version="5.1.0.SNAPSHOT"



More information about the jboss-svn-commits mailing list