[jbpm-commits] JBoss JBPM SVN: r6381 - in jbpm4/trunk/modules: jpdl/src/main/java/org/jbpm/jpdl/internal/xml and 2 other directories.

[do-not-reply at jboss.org]

Author: rebody
Date: 2010-05-28 02:19:37 -0400 (Fri, 28 May 2010)
New Revision: 6381

Modified:
   jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/ResourceStreamInput.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/WireParser.java
Log:
JBPM-2875 enhance classloader for OSGi

Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java
===================================================================
--- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java	2010-05-28 06:09:45 UTC (rev 6380)
+++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java	2010-05-28 06:19:37 UTC (rev 6381)
@@ -191,6 +191,10 @@
     Enumeration<URL> resourceUrls;
     try {
       resourceUrls = classLoader.getResources(resourceName);
+
+      if (!resourceUrls.hasMoreElements()) {
+        resourceUrls = BpmnParser.class.getClassLoader().getResources(resourceName);
+      }
     } catch (Exception e) {
       throw new JbpmException("couldn't get resource urls for "+resourceName, e);
     }

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java	2010-05-28 06:09:45 UTC (rev 6380)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java	2010-05-28 06:19:37 UTC (rev 6381)
@@ -140,6 +140,10 @@
     Enumeration<URL> resourceUrls;
     try {
       resourceUrls = classLoader.getResources(resourceName);
+
+      if (!resourceUrls.hasMoreElements()) {
+        resourceUrls = JpdlParser.class.getClassLoader().getResources(resourceName);
+      }
     } catch (Exception e) {
       throw new JbpmException("couldn't get resource urls for "+resourceName, e);
     }

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/ResourceStreamInput.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/ResourceStreamInput.java	2010-05-28 06:09:45 UTC (rev 6380)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/ResourceStreamInput.java	2010-05-28 06:19:37 UTC (rev 6381)
@@ -51,6 +51,11 @@
   public InputStream openStream() {
     ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
     InputStream stream = classLoader.getResourceAsStream(resource);
+
+    if (stream == null) {
+      stream = ResourceStreamInput.class.getClassLoader().getResourceAsStream(resource);
+    }
+
     if (stream==null) {
       throw new JbpmException("resource "+resource+" does not exist");
     }

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/WireParser.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/WireParser.java	2010-05-28 06:09:45 UTC (rev 6380)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/WireParser.java	2010-05-28 06:19:37 UTC (rev 6381)
@@ -276,6 +276,10 @@
       Enumeration<URL> resourceUrls;
       try {
         resourceUrls = classLoader.getResources(wireResource);
+
+        if (!resourceUrls.hasMoreElements()) {
+          resourceUrls = WireParser.class.getClassLoader().getResources(wireResource);
+        }
       } catch (Exception e) {
         throw new JbpmException("couldn't get resource urls for "+wireResource, e);
       }