[jbpm-commits] JBoss JBPM SVN: r3582 - in jbpm4/trunk/modules: jpdl/src/test/java/org/jbpm/jpdl/parsing and 5 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Mon Dec 29 08:10:52 EST 2008


Author: tom.baeyens at jboss.com
Date: 2008-12-29 08:10:52 -0500 (Mon, 29 Dec 2008)
New Revision: 3582

Modified:
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java
   jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlSchemaTest.java
   jbpm4/trunk/modules/pvm/pom.xml
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ClassDescriptor.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectWireTest.java
   jbpm4/trunk/modules/task/pom.xml
Log:
further cleanup

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java	2008-12-29 12:27:04 UTC (rev 3581)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java	2008-12-29 13:10:52 UTC (rev 3582)
@@ -163,7 +163,7 @@
     
 
     if (startNodes.size()==0) {
-      parse.addProblem("no start event in process");
+      parse.addProblem("no start activity in process");
     } else if (startNodes.size()>1) {
       parse.addProblem("multiple start events not yet supported");
       // TODO verify that all start events have conditions

Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlSchemaTest.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlSchemaTest.java	2008-12-29 12:27:04 UTC (rev 3581)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlSchemaTest.java	2008-12-29 13:10:52 UTC (rev 3582)
@@ -33,9 +33,9 @@
 
   public void testSimplestValidProcess() {
     List<Problem> problems = parseProblems(
-      "<jpdl:process xmlns:jpdl='http://jbpm.org/jpdl4' " +
-      "              name='p' initial='n'>" +
-      "  <jpdl:state name='n' />" +
+      "<jpdl:process xmlns:jpdl='http://jbpm.org/4/jpdl' " +
+      "              name='p' >" +
+      "  <jpdl:start name='n' />" +
       "</jpdl:process>"
     );
     assertEquals("", problems.toString());

Modified: jbpm4/trunk/modules/pvm/pom.xml
===================================================================
--- jbpm4/trunk/modules/pvm/pom.xml	2008-12-29 12:27:04 UTC (rev 3581)
+++ jbpm4/trunk/modules/pvm/pom.xml	2008-12-29 13:10:52 UTC (rev 3582)
@@ -105,16 +105,6 @@
         <configuration>
           <excludes>
             <exclude>**/*TestCase.java</exclude>
-            <exclude>**/ExecutionServiceTest.java</exclude>
-            <exclude>**/AutomaticDecisionDbTest.java</exclude>
-            <exclude>**/PersistentExecutionModeTest.java</exclude>
-            <exclude>**/BasicProcessPersistenceTest.java</exclude>
-            <exclude>**/ProcessServiceTest.java</exclude>
-            <exclude>**/JobExecutorTest.java</exclude>
-            <exclude>**/ContinuationTest.java</exclude>
-            <exclude>**/LanguageExtensionsDbTest.java</exclude>
-            <exclude>**/ObjectWireTest.java</exclude>
-            <exclude>**/ClassWireTest.java</exclude>
           </excludes>
         </configuration>
       </plugin>

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java	2008-12-29 12:27:04 UTC (rev 3581)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java	2008-12-29 13:10:52 UTC (rev 3582)
@@ -58,7 +58,7 @@
     } catch (ClassNotFoundException e) {
       log.trace("couldn't load class "+className+" with pvm lib classloader "+classLoader);
     }
-    throw new JbpmException("couldn't find class "+className);
+    throw new JbpmException("couldn't load class "+className);
   }
   
   public static InputStream getResourceAsStream(ClassLoader classLoader, String resource) {

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ClassDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ClassDescriptor.java	2008-12-29 12:27:04 UTC (rev 3581)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ClassDescriptor.java	2008-12-29 13:10:52 UTC (rev 3582)
@@ -26,7 +26,7 @@
     try {
       return ReflectUtil.loadClass(classLoader, text);
     } catch (JbpmException e) {
-      Throwable cause = e.getCause();
+      Throwable cause = (e.getCause()!=null ? e.getCause() : e);
       throw new WireException("couldn't load class '"+text+"': "+cause.getMessage(), cause);
     }
   }

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectWireTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectWireTest.java	2008-12-29 12:27:04 UTC (rev 3581)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectWireTest.java	2008-12-29 13:10:52 UTC (rev 3582)
@@ -994,6 +994,8 @@
     assertTextPresent("attributes 'class' and 'method' indicate static method and also a 'constructor' element is specified for element 'object': ", problems.get(0).getMsg());
   }
 
+  /* this error message has been removed because object binding is reused in 
+   * the context of jpdl parsing, in which case other elements are allowed. 
   public void testBadOperation(){
     List<Problem> problems = parseProblems(
         "<objects>" +
@@ -1008,6 +1010,7 @@
     assertTextPresent("element 'object' can only have 'factory', 'arg', 'constructor' elements or an operation element", problems.get(1).getMsg());
     assertTextPresent("Invalid element 'bad-operation' in: ", problems.get(1).getMsg());
   }
+  */
 
   public void testConstructorAndFactoryAttribute(){
     List<Problem> problems = parseProblems(

Modified: jbpm4/trunk/modules/task/pom.xml
===================================================================
--- jbpm4/trunk/modules/task/pom.xml	2008-12-29 12:27:04 UTC (rev 3581)
+++ jbpm4/trunk/modules/task/pom.xml	2008-12-29 13:10:52 UTC (rev 3582)
@@ -91,20 +91,4 @@
     </plugins>
   </build>
 
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <quiet>true</quiet>
-          <source>1.5</source>
-          <verbose>false</verbose>
-          <noqualifier>all</noqualifier>
-          <excludePackageNames>*.internal:*.test</excludePackageNames>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
-
 </project>
\ No newline at end of file




More information about the jbpm-commits mailing list