[jbpm-commits] JBoss JBPM SVN: r5909 - in jbpm4/trunk/modules: pvm/src/main/java/org/jbpm/pvm/internal/repository and 1 other directory.

[do-not-reply at jboss.org]

Author: jbarrez
Date: 2009-12-03 07:08:03 -0500 (Thu, 03 Dec 2009)
New Revision: 5909

Modified:
   jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Jdk14Log.java
   jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Log.java
   jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Log4jLog.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeployerManager.java
Log:
Added warning message when deploying and no deployer could be found to handle the deploymen (eg jpdl deployer configured, but trying to deploy a bpmn2 process)

Modified: jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Jdk14Log.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Jdk14Log.java	2009-12-03 11:28:58 UTC (rev 5908)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Jdk14Log.java	2009-12-03 12:08:03 UTC (rev 5909)
@@ -81,4 +81,17 @@
   public void trace(String msg, Throwable exception) {
     log.log(Level.FINEST, msg, exception);
   }
+  
+  public boolean isWarnEnabled() {
+    return log.isLoggable(Level.WARNING);
+  }
+  
+  public void warn(String msg) {
+    log.warning(msg);
+  }
+  
+  public void warn(String msg, Throwable exception) {
+    log.log(Level.WARNING, msg, exception);
+  }
+  
 }

Modified: jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Log.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Log.java	2009-12-03 11:28:58 UTC (rev 5908)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Log.java	2009-12-03 12:08:03 UTC (rev 5909)
@@ -74,4 +74,9 @@
   public abstract boolean isTraceEnabled();
   public abstract void trace(String msg);
   public abstract void trace(String msg, Throwable exception);
+  
+  public abstract boolean isWarnEnabled();
+  public abstract void warn(String msg);
+  public abstract void warn(String msg, Throwable exception);
+  
 }

Modified: jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Log4jLog.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Log4jLog.java	2009-12-03 11:28:58 UTC (rev 5908)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Log4jLog.java	2009-12-03 12:08:03 UTC (rev 5909)
@@ -21,6 +21,8 @@
  */
 package org.jbpm.internal.log;
 
+import org.apache.log4j.Level;
+
 /**
  * @author Tom Baeyens
  */
@@ -75,4 +77,17 @@
   public void trace(String msg, Throwable exception) {
     log.trace(msg, exception);
   }
+  
+  public boolean isWarnEnabled() {
+    return log.isEnabledFor(Level.WARN);
+  }
+  
+  public void warn(String msg) {
+    log.warn(msg);
+  }
+  
+  public void warn(String msg, Throwable exception) {
+    log.warn(msg, exception);
+  }
+  
 }

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeployerManager.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeployerManager.java	2009-12-03 11:28:58 UTC (rev 5908)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeployerManager.java	2009-12-03 12:08:03 UTC (rev 5909)
@@ -35,7 +35,7 @@
  */
 public class DeployerManager {
   
-  private static Log log = Log.getLog(DeployerManager.class.getName());
+  private static Log LOG = Log.getLog(DeployerManager.class.getName());
   
   List<Deployer> deployers;
   
@@ -48,12 +48,28 @@
     
     if (deployment.hasErrors()) {
       JbpmException jbpmException = deployment.getJbpmException();
-      log.info("errors during deployment of "+deployment+": "+jbpmException.getMessage());
+      LOG.info("errors during deployment of "+deployment+": "+jbpmException.getMessage());
       throw  jbpmException;
     }
     
     RepositoryCache repositoryCache = EnvironmentImpl.getFromCurrent(RepositoryCache.class);
-    repositoryCache.set(deployment.getId(), deployment.getObjects());
+    
+    if (repositoryCache != null) {
+      
+      // If there are no objects after deploying, then there is something wrong
+      if (deployment.getObjects() == null || deployment.getObjects().isEmpty()) {
+        
+        if (LOG.isWarnEnabled()) {
+          LOG.warn("WARNING: no objects were deployed! Check if you have configured a correct deployer " 
+                  +"in your jbpm.cfg.xml file for the type of deployment you want to do.");
+        }
+        
+      } else {
+        
+        repositoryCache.set(deployment.getId(), deployment.getObjects());
+        
+      }
+    }
   }
 
   public void updateResource(DeploymentImpl deployment, String resourceName, byte[] bytes) {