SWITCHYARD-2061 Not possible to deploy WAR SwitchYard application whe…

…n BPEL component is included
jboss-switchyard · Jul 17, 2015 · a7127f4 · a7127f4
1 parent a392be4
commit a7127f4
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/.../bpel/src/main/java/org/switchyard/component/bpel/riftsaw/RiftsawBPELExchangeHandler.java b/.../bpel/src/main/java/org/switchyard/component/bpel/riftsaw/RiftsawBPELExchangeHandler.java
@@ -161,10 +161,17 @@ protected java.io.File getDeployment() throws Exception {
 
         java.net.URL url = Thread.currentThread().
                 getContextClassLoader().getResource(DEPLOY_XML);
-        int index = url.toString().indexOf(".jar");
-
+        int jarIndex = url.toString().indexOf(".jar");
+        int warIndex = url.toString().indexOf(".war");
+
+        boolean approvedDeployment = (
+        			(url.toString().indexOf(".ear") != -1)
+        		|| (url.toString().indexOf(".war") != -1)
+        		|| (url.toString().indexOf(".jar") != -1)
+        		);
+
         // Check if url contains a jar
-        if (index != -1) {
+        if (approvedDeployment) {
 
             if (url.getProtocol().equals(VFS_SCHEME)) {
                 // AS7 deployment