SWITCHYARD-2397: Upgrade Drools/jBPM to 6.2.0.BetaX and RuntimeEngine refactoring

config/src/main/java/org/switchyard/config/model/Namespace.java

@@ -13,12 +13,14 @@
  */
 package org.switchyard.config.model;
 
+import java.io.Serializable;
+
 /**
  * Represents config model namespace.
  *
  * @author David Ward &lt;<a href="mailto:dward@jboss.org">dward@jboss.org</a>&gt; &copy; 2013 Red Hat Inc.
  */
-public interface Namespace {
+public interface Namespace extends Serializable {
 
     /**
      * The namespace section.
@@ -61,6 +63,7 @@ public interface Namespace {
     /**
      * A utility class for Namespace enums, since enums can't have extend base classes.
      */
+    @SuppressWarnings("serial")
     public static abstract class Util implements Namespace {
 
         private final String _section;

config/src/main/java/org/switchyard/config/model/composite/SCANamespace.java

@@ -95,6 +95,7 @@ public static SCANamespace fromUri(String uri) {
         return Util.fromUri(SCANamespace.class, uri);
     }
 
+    @SuppressWarnings("serial")
     private static final class Util extends Namespace.Util {
         // static final since we only want to do the somewhat expensive work of instantiating this once!
         private static final Descriptor DESCRIPTOR = new Descriptor(SCANamespace.class);

config/src/main/java/org/switchyard/config/model/switchyard/SwitchYardNamespace.java

@@ -99,6 +99,7 @@ public static SwitchYardNamespace fromUri(String uri) {
         return Util.fromUri(SwitchYardNamespace.class, uri);
     }
 
+    @SuppressWarnings("serial")
     private static final class Util extends Namespace.Util {
         // static final since we only want to do the somewhat expensive work of instantiating this once!
         private static final Descriptor DESCRIPTOR = new Descriptor(SwitchYardNamespace.class);

security/base/src/main/java/org/switchyard/security/login/CertificateLoginModule.java

@@ -28,6 +28,7 @@
 import javax.security.auth.login.LoginException;
 
 import org.switchyard.common.io.pull.PropertiesPuller;
+import org.switchyard.common.io.pull.PropertiesPuller.PropertiesType;
 import org.switchyard.common.io.pull.Puller.PathType;
 import org.switchyard.common.lang.Strings;
 import org.switchyard.security.BaseSecurityMessages;
@@ -158,7 +159,8 @@ private KeyStore getKeyStore() throws LoginException {
     private Properties getRolesProperties() {
         String rolesPropertiesFile = getOption("rolesProperties", false);
         if (rolesPropertiesFile != null) {
-            return new PropertiesPuller().pullPath(rolesPropertiesFile, getClass(), PathType.values());
+            PropertiesType propertiesType = rolesPropertiesFile.endsWith(".xml") ? PropertiesType.XML : PropertiesType.PROPERTIES;
+            return new PropertiesPuller(propertiesType).pullPath(rolesPropertiesFile, getClass(), PathType.values());
         }
         return null;
     }

transform/src/main/java/org/switchyard/transform/config/model/TransformNamespace.java

@@ -99,6 +99,7 @@ public static TransformNamespace fromUri(String uri) {
         return Util.fromUri(TransformNamespace.class, uri);
     }
 
+    @SuppressWarnings("serial")
     private static final class Util extends Namespace.Util {
         // static final since we only want to do the somewhat expensive work of instantiating this once!
         private static final Descriptor DESCRIPTOR = new Descriptor(TransformNamespace.class);

validate/src/main/java/org/switchyard/validate/config/model/ValidateNamespace.java

@@ -99,6 +99,7 @@ public static ValidateNamespace fromUri(String uri) {
         return Util.fromUri(ValidateNamespace.class, uri);
     }
 
+    @SuppressWarnings("serial")
     private static final class Util extends Namespace.Util {
         // static final since we only want to do the somewhat expensive work of instantiating this once!
         private static final Descriptor DESCRIPTOR = new Descriptor(ValidateNamespace.class);