Merge branch 'master' of https://github.com/Activiti/Activiti

modules/activiti-osgi/pom.xml

@@ -73,6 +73,10 @@
       <artifactId>org.apache.felix.fileinstall</artifactId>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.ops4j.pax.exam</groupId>
       <artifactId>pax-exam-junit4</artifactId>
@@ -117,6 +121,11 @@
       <artifactId>h2</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <properties>

modules/activiti-osgi/src/test/java/org/activiti/osgi/blueprint/BlueprintBasicTest.java

@@ -96,10 +96,11 @@ public class BlueprintBasicTest {
         mavenBundle().groupId("org.apache.aries.proxy").artifactId("org.apache.aries.proxy").version("1.0.0"),
         mavenBundle().groupId("org.apache.aries").artifactId("org.apache.aries.util").version("1.0.0"),
         bundle("reference:file:target/classes"));
-    return OptionUtils.combine(coreBundles, CoreOptions.junitBundles(),
+    Option[] optionArray = OptionUtils.combine(coreBundles, CoreOptions.junitBundles(),
         provision(createTestBundleWithProcessEngineConfiguration(), 
             createTestBundleWithProcessDefinition(), 
             createTestBundleWithTask()));
+    return optionArray;
   }
   
   
@@ -112,7 +113,7 @@ public class BlueprintBasicTest {
           .set(Constants.DYNAMICIMPORT_PACKAGE, "*")
           .build();
     } catch (FileNotFoundException fnfe) {
-      fail(fnfe.toString());
+      fail("Failure in createTestBundleWithProcessEngineConfiguration " + fnfe.toString());
       return null;
     }
   }
@@ -124,7 +125,7 @@ public class BlueprintBasicTest {
           .add("OSGI-INF/activiti/example.bpmn20.xml", new FileInputStream(new File("src/test/resources/processes/example.bpmn20.xml")))
           .set(Constants.BUNDLE_SYMBOLICNAME, "org.activiti.osgi.example").build();
     } catch (FileNotFoundException fnfe) {
-      fail(fnfe.toString());
+      fail("Failure in createTestBundleWithProcessDefinition " + fnfe.toString());
       return null;
     }
   }
@@ -139,7 +140,7 @@ public class BlueprintBasicTest {
           .set(Constants.DYNAMICIMPORT_PACKAGE, "*")
           .build();
     } catch (FileNotFoundException fnfe) {
-      fail(fnfe.toString());
+      fail("Failure in createTestBundleWithTask " + fnfe.toString());
       return null;
     }
   }