You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2007/05/04 14:45:44 UTC
svn commit: r535217 -
/incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptArtifactProcessor.java
Author: antelder
Date: Fri May 4 05:45:43 2007
New Revision: 535217
URL: http://svn.apache.org/viewvc?view=rev&rev=535217
Log:
Update forStAXArtifactProcessor now taking XMLStreamException
Modified:
incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptArtifactProcessor.java
Modified: incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptArtifactProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptArtifactProcessor.java?view=diff&rev=535217&r1=535216&r2=535217
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptArtifactProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptArtifactProcessor.java Fri May 4 05:45:43 2007
@@ -36,7 +36,6 @@
import org.apache.tuscany.contribution.resolver.ArtifactResolver;
import org.apache.tuscany.contribution.service.ContributionReadException;
import org.apache.tuscany.contribution.service.ContributionResolveException;
-import org.apache.tuscany.contribution.service.ContributionWriteException;
import org.apache.tuscany.implementation.spi.PropertyValueObjectFactory;
import org.apache.tuscany.implementation.spi.ResourceHelper;
@@ -60,51 +59,39 @@
return ScriptImplementation.class;
}
- public ScriptImplementation read(XMLStreamReader reader) throws ContributionReadException {
+ public ScriptImplementation read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
+ String scriptName = reader.getAttributeValue(null, "script");
- try {
-
- String scriptName = reader.getAttributeValue(null, "script");
-
- String scriptLanguage = reader.getAttributeValue(null, "language");
- if (scriptLanguage == null || scriptLanguage.length() < 1) {
- int i = scriptName.lastIndexOf('.');
- scriptLanguage = scriptName.substring(i+1);
- }
+ String scriptLanguage = reader.getAttributeValue(null, "language");
+ if (scriptLanguage == null || scriptLanguage.length() < 1) {
+ int i = scriptName.lastIndexOf('.');
+ scriptLanguage = scriptName.substring(i+1);
+ }
- while (reader.hasNext()) {
- if (reader.next() == END_ELEMENT && IMPLEMENTATION_SCRIPT_QNAME.equals(reader.getName())) {
- break;
- }
+ while (reader.hasNext()) {
+ if (reader.next() == END_ELEMENT && IMPLEMENTATION_SCRIPT_QNAME.equals(reader.getName())) {
+ break;
}
-
- String scriptSrc = ResourceHelper.readResource(scriptName);
-
- return new ScriptImplementation(scriptName, scriptLanguage, scriptSrc, propertyFactory);
-
- } catch (XMLStreamException e) {
- throw new ContributionReadException(e);
}
- }
- public void write(ScriptImplementation scriptImplementation, XMLStreamWriter writer) throws ContributionWriteException {
- try {
+ String scriptSrc = ResourceHelper.readResource(scriptName);
- writer.writeStartElement(Constants.SCA10_NS, "implementation.script");
+ return new ScriptImplementation(scriptName, scriptLanguage, scriptSrc, propertyFactory);
+ }
- if (scriptImplementation.getScriptName() != null) {
- writer.writeAttribute("script", scriptImplementation.getScriptName());
- }
+ public void write(ScriptImplementation scriptImplementation, XMLStreamWriter writer) throws XMLStreamException {
- if (scriptImplementation.getScriptLanguage() != null) {
- writer.writeAttribute("language", scriptImplementation.getScriptLanguage());
- }
+ writer.writeStartElement(Constants.SCA10_NS, "implementation.script");
- writer.writeEndElement();
+ if (scriptImplementation.getScriptName() != null) {
+ writer.writeAttribute("script", scriptImplementation.getScriptName());
+ }
- } catch (XMLStreamException e) {
- throw new ContributionWriteException(e);
+ if (scriptImplementation.getScriptLanguage() != null) {
+ writer.writeAttribute("language", scriptImplementation.getScriptLanguage());
}
+
+ writer.writeEndElement();
}
// TODO: I hate all the following, why has this to mess about with the .componentType side file,
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org