Author: slaws
Date: Tue Mar 9 14:18:03 2010
New Revision: 920885
URL: http://svn.apache.org/viewvc?rev=920885&view=rev
Log:
TUSCANY-242 add URI processing wherever we read an anyURI attribute
Modified:
tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java
tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java
tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
tuscany/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
tuscany/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
tuscany/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java
tuscany/sca-java-2.x/trunk/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java
tuscany/sca-java-2.x/trunk/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
Modified:
tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.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/BaseAssemblyProcessor.java?rev=920885&r1=920884&r2=920885&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
Tue Mar 9 14:18:03 2010
@@ -224,7 +224,7 @@ abstract class BaseAssemblyProcessor ext
* @param reader
*/
protected void readTargets(Reference reference, XMLStreamReader reader) {
- String value = reader.getAttributeValue(null, TARGET);
+ String value = getURIString(reader, TARGET);
ComponentService target = null;
if (value != null) {
for (StringTokenizer tokens = new StringTokenizer(value);
tokens.hasMoreTokens();) {
Modified:
tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.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/CompositeProcessor.java?rev=920885&r1=920884&r2=920885&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
Tue Mar 9 14:18:03 2010
@@ -182,7 +182,7 @@ public class CompositeProcessor extends
composite = assemblyFactory.createComposite();
composite.setSpecVersion(Constants.SCA11_NS);
- composite.setName(new QName(getString(reader,
TARGET_NAMESPACE), getString(reader, NAME)));
+ composite.setName(new QName(getURIString(reader,
TARGET_NAMESPACE), getString(reader, NAME)));
if (!isSet(reader, TARGET_NAMESPACE)) {
// spec says that a composite must have a
namespace
@@ -204,7 +204,7 @@ public class CompositeProcessor extends
// Read an <include>
include = assemblyFactory.createComposite();
include.setName(getQName(reader, NAME));
- include.setURI(getString(reader, URI));
+ include.setURI(getURIString(reader, URI));
include.setUnresolved(true);
composite.getIncludes().add(include);
@@ -294,7 +294,7 @@ public class CompositeProcessor extends
compositeReference.setName(getString(reader,
NAME));
readMultiplicity(compositeReference, reader);
readTargets(compositeReference, reader);
- String promote =
reader.getAttributeValue(null, Constants.PROMOTE);
+ String promote = getURIString(reader,
Constants.PROMOTE);
if (promote != null) {
for (StringTokenizer tokens = new
StringTokenizer(promote); tokens.hasMoreTokens();) {
String refName = tokens.nextToken();
@@ -332,7 +332,7 @@ public class CompositeProcessor extends
// Read a <component><property>
componentProperty =
assemblyFactory.createComponentProperty();
property = componentProperty;
- String source = getString(reader, SOURCE);
+ String source = getURIString(reader, SOURCE);
if (source != null) {
source = source.trim();
}
@@ -361,7 +361,7 @@ public class CompositeProcessor extends
//throw ce;
}
}
- componentProperty.setFile(getString(reader,
FILE));
+ componentProperty.setFile(getURIString(reader,
FILE));
//handle extension attributes
this.readExtendedAttributes(reader,
@@ -411,7 +411,7 @@ public class CompositeProcessor extends
component.setAutowire(getBoolean(reader,
AUTOWIRE));
}
if (isSet(reader, URI)) {
- component.setURI(getString(reader, URI));
+ component.setURI(getURIString(reader, URI));
}
//handle extension attributes
@@ -426,12 +426,12 @@ public class CompositeProcessor extends
wire = assemblyFactory.createWire();
ComponentReference source =
assemblyFactory.createComponentReference();
source.setUnresolved(true);
- source.setName(getString(reader, SOURCE));
+ source.setName(getURIString(reader, SOURCE));
wire.setSource(source);
ComponentService target =
assemblyFactory.createComponentService();
target.setUnresolved(true);
- target.setName(getString(reader, TARGET));
+ target.setName(getURIString(reader, TARGET));
wire.setTarget(target);
// Read @replace
Modified:
tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java?rev=920885&r1=920884&r2=920885&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java
Tue Mar 9 14:18:03 2010
@@ -95,7 +95,7 @@ public class DefinitionsProcessor extend
name = reader.getName();
if (DEFINITIONS_QNAME.equals(name)) {
definitions = definitionsFactory.createDefinitions();
- targetNamespace = reader.getAttributeValue(null,
TARGET_NAMESPACE);
+ targetNamespace = getURIString(reader,
TARGET_NAMESPACE);
definitions.setTargetNamespace(targetNamespace);
} else {
Object extension = extensionProcessor.read(reader,
context);
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java?rev=920885&r1=920884&r2=920885&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java
Tue Mar 9 14:18:03 2010
@@ -218,13 +218,13 @@ public class JMSBindingProcessor extends
}
// Read initial context factory
- String initialContextFactory = reader.getAttributeValue(null,
"initialContextFactory");
+ String initialContextFactory = getURIString(reader,
"initialContextFactory");
if (initialContextFactory != null && initialContextFactory.length() >
0) {
jmsBinding.setInitialContextFactoryName(initialContextFactory);
}
// Read JNDI URL
- String jndiURL = reader.getAttributeValue(null, "jndiURL");
+ String jndiURL = getURIString(reader, "jndiURL");
if (jndiURL != null && jndiURL.length() > 0) {
jmsBinding.setJndiURL(jndiURL);
}
@@ -407,7 +407,7 @@ public class JMSBindingProcessor extends
}
private void parseDestination(XMLStreamReader reader, JMSBinding
jmsBinding, Monitor monitor) throws XMLStreamException {
- String name = reader.getAttributeValue(null, "jndiName");
+ String name = getURIString(reader, "jndiName");
if (name != null && name.length() > 0) {
jmsBinding.setDestinationName(name);
}
@@ -433,7 +433,7 @@ public class JMSBindingProcessor extends
}
private void parseConnectionFactory(XMLStreamReader reader, JMSBinding
jmsBinding, Monitor monitor) throws XMLStreamException {
- String name = reader.getAttributeValue(null, "jndiName");
+ String name = getURIString(reader, "jndiName");
if (name != null && name.length() > 0) {
jmsBinding.setConnectionFactoryName(name);
} else {
@@ -453,7 +453,7 @@ public class JMSBindingProcessor extends
}
private void parseResponseDestination(XMLStreamReader reader, JMSBinding
jmsBinding, Monitor monitor) throws XMLStreamException {
- String name = reader.getAttributeValue(null, "jndiName");
+ String name = getURIString(reader, "jndiName");
if (name != null && name.length() > 0) {
jmsBinding.setResponseDestinationName(name);
}
@@ -479,7 +479,7 @@ public class JMSBindingProcessor extends
}
private void parseResponseConnectionFactory(XMLStreamReader reader,
JMSBinding jmsBinding, Monitor monitor) throws XMLStreamException {
- String name = reader.getAttributeValue(null, "jndiName");
+ String name = getURIString(reader, "jndiName");
if (name != null && name.length() > 0) {
jmsBinding.setResponseConnectionFactoryName(name);
} else {
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java?rev=920885&r1=920884&r2=920885&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
Tue Mar 9 14:18:03 2010
@@ -36,6 +36,7 @@ import javax.xml.stream.XMLStreamWriter;
import org.apache.tuscany.sca.assembly.xml.PolicySubjectProcessor;
import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory;
+import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
import
org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
import
org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
@@ -60,7 +61,7 @@ import org.apache.tuscany.sca.policy.Pol
*
* @version $Rev$ $Date$
*/
-public class WebServiceBindingProcessor implements
StAXArtifactProcessor<WebServiceBinding>, WebServiceConstants {
+public class WebServiceBindingProcessor extends BaseStAXArtifactProcessor
implements StAXArtifactProcessor<WebServiceBinding>, WebServiceConstants {
private ExtensionPointRegistry extensionPoints;
private WSDLFactory wsdlFactory;
@@ -135,7 +136,7 @@ public class WebServiceBindingProcessor
// Read a qname in the form:
// namespace#wsdl.???(name)
Boolean wsdlElementIsBinding = null;
- String wsdlElement = reader.getAttributeValue(null, WSDL_ELEMENT);
+ String wsdlElement = getURIString(reader, WSDL_ELEMENT);
if (wsdlElement != null) {
int index = wsdlElement.indexOf('#');
if (index == -1) {
Modified:
tuscany/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java?rev=920885&r1=920884&r2=920885&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
Tue Mar 9 14:18:03 2010
@@ -29,6 +29,7 @@ import javax.xml.stream.XMLStreamWriter;
import org.apache.tuscany.sca.contribution.java.JavaImport;
import org.apache.tuscany.sca.contribution.java.JavaImportExportFactory;
+import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
import
org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
import
org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
@@ -45,7 +46,7 @@ import org.apache.tuscany.sca.monitor.Pr
*
* @version $Rev$ $Date$
*/
-public class JavaImportProcessor implements StAXArtifactProcessor<JavaImport>
{
+public class JavaImportProcessor extends BaseStAXArtifactProcessor implements
StAXArtifactProcessor<JavaImport> {
private static final String SCA11_NS =
"http://docs.oasis-open.org/ns/opencsa/sca/200912";;
private static final QName IMPORT_JAVA = new QName(SCA11_NS,
"import.java");
@@ -105,7 +106,7 @@ public class JavaImportProcessor implem
} else
javaImport.setPackage(packageName);
- String location = reader.getAttributeValue(null,
LOCATION);
+ String location = getURIString(reader, LOCATION);
javaImport.setLocation(location);
}
break;
Modified:
tuscany/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java?rev=920885&r1=920884&r2=920885&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
Tue Mar 9 14:18:03 2010
@@ -116,7 +116,7 @@ public class NamespaceImportProcessor ex
namespaceImport.setNamespace(ns);
}
- String location = reader.getAttributeValue(null,
LOCATION);
+ String location = getURIString(reader, LOCATION);
if (location != null) {
namespaceImport.setLocation(location);
}
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java?rev=920885&r1=920884&r2=920885&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java
Tue Mar 9 14:18:03 2010
@@ -30,6 +30,7 @@ import org.apache.tuscany.sca.assembly.A
import org.apache.tuscany.sca.assembly.ComponentType;
import org.apache.tuscany.sca.assembly.xml.Constants;
import org.apache.tuscany.sca.assembly.xml.PolicySubjectProcessor;
+import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
import
org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
import
org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
@@ -50,7 +51,7 @@ import org.apache.tuscany.sca.monitor.Pr
*
* @version $Rev$ $Date$
*/
-public class SpringImplementationProcessor implements
StAXArtifactProcessor<SpringImplementation> {
+public class SpringImplementationProcessor extends BaseStAXArtifactProcessor
implements StAXArtifactProcessor<SpringImplementation> {
private static final String LOCATION = "location";
private static final String IMPLEMENTATION_SPRING =
"implementation.spring";
@@ -124,7 +125,7 @@ public class SpringImplementationProcess
SpringImplementation springImplementation = null;
// Read the location attribute for the spring implementation
- String springLocation = reader.getAttributeValue(null, LOCATION);
+ String springLocation = getURIString(reader, LOCATION);
if (springLocation != null) {
springImplementation = new SpringImplementation();
springImplementation.setLocation(springLocation);
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java?rev=920885&r1=920884&r2=920885&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java
Tue Mar 9 14:18:03 2010
@@ -80,7 +80,7 @@ public class WidgetImplementationProcess
WidgetImplementation implementation = null;
// Read the location attribute specifying the location of the resources
- String location = reader.getAttributeValue(null, "location");
+ String location = getURIString(reader, "location");
if (location != null) {
implementation =
implementationFactory.createWidgetImplementation();
implementation.setLocation(location);
Modified:
tuscany/sca-java-2.x/trunk/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java?rev=920885&r1=920884&r2=920885&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
Tue Mar 9 14:18:03 2010
@@ -28,6 +28,7 @@ import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
import org.apache.tuscany.sca.assembly.xml.PolicySubjectProcessor;
+import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
import
org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
import
org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
@@ -53,7 +54,7 @@ import org.apache.tuscany.sca.policy.Pol
* Handles a <interface.wsdl ... /> element in a SCDL file
* @version $Rev$ $Date$
*/
-public class WSDLInterfaceProcessor implements
StAXArtifactProcessor<WSDLInterfaceContract>, WSDLConstants {
+public class WSDLInterfaceProcessor extends BaseStAXArtifactProcessor
implements StAXArtifactProcessor<WSDLInterfaceContract>, WSDLConstants {
private WSDLFactory wsdlFactory;
private InterfaceContractMapper interfaceContractMapper;
@@ -177,14 +178,14 @@ public class WSDLInterfaceProcessor impl
String location = reader.getAttributeValue(WSDLI_NS, WSDL_LOCATION);
wsdlInterfaceContract.setLocation(location);
- String uri = reader.getAttributeValue(null, INTERFACE);
+ String uri = getURIString(reader, INTERFACE);
if (uri != null) {
WSDLInterface wsdlInterface = createWSDLInterface(uri, monitor);
if (wsdlInterface != null)
wsdlInterfaceContract.setInterface(wsdlInterface);
}
- uri = reader.getAttributeValue(null, CALLBACK_INTERFACE);
+ uri = getURIString(reader, CALLBACK_INTERFACE);
if (uri != null) {
WSDLInterface wsdlCallbackInterface = createWSDLInterface(uri,
monitor);
if (wsdlCallbackInterface != null)
