From 99c8b101cbd081de731c1e9409c0d127acf55cf0 Mon Sep 17 00:00:00 2001
From: rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 16 Jul 2009 23:51:45 +0000
Subject: Fix the root location for non file/jar protocols

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@794909 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/tuscany/sca/node/ContributionLocationHelper.java     | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'java/sca/modules/node-api')

diff --git a/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/ContributionLocationHelper.java b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/ContributionLocationHelper.java
index f891f1e329..2e73322917 100644
--- a/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/ContributionLocationHelper.java
+++ b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/ContributionLocationHelper.java
@@ -127,6 +127,12 @@ public class ContributionLocationHelper {
         } else if ("jar".equals(protocol) || "wsjar".equals(protocol) || "zip".equals(protocol)) {
             // jar contribution
             location = url.substring(protocol.length() + 1, url.lastIndexOf("!/"));
+        } else if (url.endsWith(resourceName)) {
+            location = url.substring(0, url.lastIndexOf(resourceName));
+        } else {
+            throw new IllegalArgumentException("The root of the resource cannot be determined: " + resourceURL
+                + ","
+                + resourceName);
         }
         return location;
     }
-- 
cgit v1.2.3