Author: lresende
Date: Thu Apr 9 06:24:32 2009
New Revision: 763525
URL: http://svn.apache.org/viewvc?rev=763525&view=rev
Log:
TUSCANY-2862 - Further changes to handled folder contributions that have
artifacts with space in the name
Modified:
tuscany/branches/sca-java-1.x/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java
tuscany/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
Modified:
tuscany/branches/sca-java-1.x/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java?rev=763525&r1=763524&r2=763525&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java
Thu Apr 9 06:24:32 2009
@@ -89,7 +89,11 @@
if (uri.endsWith("/")) {
uri = uri.substring(0, uri.length() - 1);
}
- fileList.add(URI.create(uri));
+ try {
+ fileList.add(new URI(null, uri, null));
+ } catch (URISyntaxException e) {
+ throw new IllegalArgumentException("Invalid artifact uri:"
+ uri);
+ }
// Allow privileged access to list files. Requires
FilePermission in security
// policy.
Modified:
tuscany/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java?rev=763525&r1=763524&r2=763525&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
Thu Apr 9 06:24:32 2009
@@ -177,7 +177,12 @@
if (compositeURI != null) {
//URI uri = URI.create(compositeURI);
- URI uri = createURI(compositeURI);
+ URI uri;
+ try {
+ uri = new URI(null, compositeURI, null);
+ } catch (URISyntaxException e) {
+ throw new IllegalArgumentException("Invalid Composite URI: " +
compositeURI, e);
+ }
if (uri.isAbsolute()) {
throw new IllegalArgumentException("Composite URI must be a
resource name: " + compositeURI);
