You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ed...@apache.org on 2010/05/18 11:36:18 UTC
svn commit: r945562 -
/tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
Author: edwardsmj
Date: Tue May 18 09:36:18 2010
New Revision: 945562
URL: http://svn.apache.org/viewvc?rev=945562&view=rev
Log:
Cleaned up comments
Modified:
tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
Modified: tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java?rev=945562&r1=945561&r2=945562&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java Tue May 18 09:36:18 2010
@@ -78,7 +78,7 @@ public class CompositeDocumentProcessor
InputStream scdlStream = null;
try {
- scdlStream = IOHelper.openStream(url);;
+ scdlStream = IOHelper.openStream(url);
} catch (IOException e) {
ContributionReadException ce = new ContributionReadException("Exception reading " + uri, e);
error(context.getMonitor(), "ContributionReadException", url, ce);
@@ -97,19 +97,17 @@ public class CompositeDocumentProcessor
monitor.setArtifactName(uri.toString());
} //end if
- // Set up a StreamSource for the composite file, since this has an associated URL that can be used to
- // by the parser to find references to other files such as DTDs
+ // Set up a StreamSource for the composite file, since this has an associated URL that
+ // can be used by the parser to find references to other files such as DTDs
StreamSource scdlSource = new StreamSource( scdlStream, url.toString() );
XMLStreamReader reader = inputFactory.createXMLStreamReader(scdlSource);
- //XMLStreamReader reader = inputFactory.createXMLStreamReader(scdlStream);
-
// set the monitor on the input factory as the standard XMLInputFactory
// methods used for creating readers don't allow for the context to
// be passed in
ValidatingXMLInputFactory.setMonitor(reader, context.getMonitor());
- //reader.nextTag();
+ // Read the header (i.e. text before the <composite> element, if any
readCompositeFileHeader( reader );
// Read the composite model