From c1e6b31c4aa804e522d07ecc66afcb627f04ce94 Mon Sep 17 00:00:00 2001
From: ramkumar <ramkumar@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 26 May 2009 07:29:26 +0000
Subject: Fixes for TUSCANY-3061

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@778592 13f79535-47bb-0310-9956-ffa450edef68
---
 .../spring/introspect/SpringXMLComponentTypeLoader.java           | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'java/sca/modules/implementation-spring/src/main')

diff --git a/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java b/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java
index fd47e99b02..11176a3841 100644
--- a/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java
+++ b/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java
@@ -146,7 +146,7 @@ public class SpringXMLComponentTypeLoader {
             implementation.setURI(resource.toString());            
             // FIXME - need a better way to handle the XMLInputFactory than allocating a new one every time
             XMLInputFactory xmlFactory = XMLInputFactory.newInstance();
-            reader = xmlFactory.createXMLStreamReader(new FileInputStream(new File(resource.toURI())));
+            reader = xmlFactory.createXMLStreamReader(resource.openStream());
 
             // System.out.println("Spring TypeLoader - starting to read context file");            
             readContextDefinition(reader, beans, services, references, scaproperties);
@@ -155,8 +155,6 @@ public class SpringXMLComponentTypeLoader {
             throw new ContributionReadException(e);
         } catch (XMLStreamException e) {
             throw new ContributionReadException(e);
-        } catch (URISyntaxException e) {
-            throw new ContributionReadException(e);
         }
 
         /* At this point, the complete application-context.xml file has been read and its contents  */
@@ -180,14 +178,12 @@ public class SpringXMLComponentTypeLoader {
             // FIXME - need a better way to handle the XMLInputFactory than allocating a new one every time
             XMLInputFactory xmlFactory = XMLInputFactory.newInstance();
             XMLStreamReader reader = 
-            	xmlFactory.createXMLStreamReader(new FileInputStream(new File(resource.toURI())));
+            	xmlFactory.createXMLStreamReader(resource.openStream());
             return reader;
         } catch (IOException e) {
             throw new ContributionReadException(e);
         } catch (XMLStreamException e) {
             throw new ContributionReadException(e);
-        } catch (URISyntaxException e) {
-            throw new ContributionReadException(e);
         }
     }    
     
-- 
cgit v1.2.3