Author: antelder
Date: Tue May 12 07:20:00 2009
New Revision: 773808
URL: http://svn.apache.org/viewvc?rev=773808&view=rev
Log:
TUSCANY-3015: Fix scanner determination for when contribution file path
contains a space (was tempted to just delete ContributionInfoProcessor as it
doesn't appear to ever get used in a full build so how do we know if it works
if it doesn't have any test at all?)
Modified:
tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/ContributionInfoProcessor.java
Modified:
tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/ContributionInfoProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/ContributionInfoProcessor.java?rev=773808&r1=773807&r2=773808&view=diff
==============================================================================
---
tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/ContributionInfoProcessor.java
(original)
+++
tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/ContributionInfoProcessor.java
Tue May 12 07:20:00 2009
@@ -22,6 +22,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
+import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLConnection;
import java.util.List;
@@ -104,11 +105,17 @@
contribution.setUnresolved(true);
// Create a contribution scanner
- ContributionScanner scanner;
- if ("file".equals(contributionURL.getProtocol()) && new
File(contributionURL.getFile()).isDirectory()) {
- scanner = new DirectoryContributionScanner();
- } else {
- scanner = new JarContributionScanner();
+ ContributionScanner scanner = null;
+ if (scanner == null) {
+ try {
+ if ("file".equals(contributionURL.getProtocol()) && new
File(contributionURL.toURI()).isDirectory()) {
+ scanner = new DirectoryContributionScanner();
+ } else {
+ scanner = new JarContributionScanner();
+ }
+ } catch (URISyntaxException e) {
+ throw new ContributionReadException(e);
+ }
}
// Read generated and user sca-contribution.xml files
