TUSCANY-2862 - Fixing URI issues when processing jar contributions that had artifacts with space on it's name

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@763524 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 6 insertions, 1 deletions

diff --git a/branches/sca-java-1.x/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java b/branches/sca-java-1.x/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java
index 3ceb8c2b69..47a0f95687 100644
--- a/branches/sca-java-1.x/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java
+++ b/branches/sca-java-1.x/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java
@@ -23,6 +23,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -114,7 +115,11 @@ public class JarContributionProcessor implements PackageProcessor {
             // Return list of URIs
             List<URI> artifacts = new ArrayList<URI>();
             for (String name: names) {
-                artifacts.add(URI.create(name));
+                try {
+                    artifacts.add(new URI(null, name, null));
+                } catch (URISyntaxException e) {
+                    throw new IllegalArgumentException("Invalid artifact uri:" + name);
+                }
             }
             return artifacts;
             
diff --git a/branches/sca-java-1.x/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar b/branches/sca-java-1.x/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar
index 9c46c679d2..7c042e64f1 100644
--- a/branches/sca-java-1.x/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar
+++ b/branches/sca-java-1.x/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar