You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/07/31 04:10:44 UTC
svn commit: r561210 - in /incubator/tuscany/java/sca/modules:
assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/
assembly/src/test/java/org/apache/tuscany/sca/assembly/
binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/ b...
Author: jsdelfino
Date: Mon Jul 30 19:10:43 2007
New Revision: 561210
URL: http://svn.apache.org/viewvc?view=rev&rev=561210
Log:
Starting to clean up initialization of binding URIs. Also added code to read binding names where I found it was missing.
Modified:
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/SCABindingProcessor.java
incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingProcessor.java
incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingProcessor.java
incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.java
incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingProcessor.java
incubator/tuscany/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
incubator/tuscany/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/NamespaceImportAllModelResolverImpl.java
incubator/tuscany/java/sca/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/binding/resource/impl/HTTPResourceBindingProcessor.java
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/SCABindingProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/SCABindingProcessor.java?view=diff&rev=561210&r1=561209&r2=561210
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/SCABindingProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/SCABindingProcessor.java Mon Jul 30 19:10:43 2007
@@ -68,10 +68,16 @@
// Read policies
readPolicies(scaBinding, reader);
+
+ // Read binding name
+ String name = reader.getAttributeValue(null, NAME);
+ if (name != null) {
+ scaBinding.setName(name);
+ }
// Read binding URI
String uri = reader.getAttributeValue(null, URI);
- if (uri != null && uri.length() > 0) {
+ if (uri != null) {
scaBinding.setURI(uri);
}
Modified: incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java?view=diff&rev=561210&r1=561209&r2=561210
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java Mon Jul 30 19:10:43 2007
@@ -31,7 +31,6 @@
public class TestBinding implements Binding {
public TestBinding(AssemblyFactory factory) {
- setURI("http://test");
}
public String getName() {
Modified: incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingProcessor.java?view=diff&rev=561210&r1=561209&r2=561210
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingProcessor.java Mon Jul 30 19:10:43 2007
@@ -38,7 +38,9 @@
*/
public class AtomBindingProcessor implements StAXArtifactProcessor<AtomBinding> {
- private QName BINDING_ATOM = new QName(SCA_NS, "binding.atom");
+ private static final QName BINDING_ATOM = new QName(SCA_NS, "binding.atom");
+ private final static String NAME = "name";
+ private final static String URI = "uri";
private final AtomBindingFactory factory;
@@ -55,10 +57,14 @@
}
public AtomBinding read(XMLStreamReader reader) throws ContributionReadException {
- String uri = reader.getAttributeValue(null, "uri");
AtomBinding binding = factory.createAtomBinding();
+ String name = reader.getAttributeValue(null, NAME);
+ if (name != null) {
+ binding.setName(name);
+ }
+ String uri = reader.getAttributeValue(null, URI);
if (uri != null) {
- binding.setURI(uri.trim());
+ binding.setURI(uri);
}
return binding;
}
Modified: incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingProcessor.java?view=diff&rev=561210&r1=561209&r2=561210
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingProcessor.java Mon Jul 30 19:10:43 2007
@@ -39,6 +39,8 @@
public class RSSBindingProcessor implements StAXArtifactProcessor<RSSBinding> {
private final static QName BINDING_RSS = new QName(SCA_NS, "binding.rss");
+ private final static String NAME = "name";
+ private final static String URI = "uri";
private final RSSBindingFactory factory;
@@ -62,10 +64,14 @@
public RSSBinding read(XMLStreamReader reader) throws ContributionReadException {
// Read the <binding.rss> element
- String uri = reader.getAttributeValue(null, "uri");
RSSBinding binding = factory.createRSSBinding();
+ String name = reader.getAttributeValue(null, NAME);
+ if (name != null) {
+ binding.setName(name);
+ }
+ String uri = reader.getAttributeValue(null, URI);
if (uri != null) {
- binding.setURI(uri.trim());
+ binding.setURI(uri);
}
return binding;
}
Modified: incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java?view=diff&rev=561210&r1=561209&r2=561210
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java Mon Jul 30 19:10:43 2007
@@ -22,7 +22,6 @@
import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-import java.util.Arrays;
import java.util.List;
import java.util.StringTokenizer;
@@ -133,12 +132,18 @@
try {
JMSBinding jmsBinding = jmsBindingFactory.createJMSBinding();
- //Read policies
+ // Read policies
readPolicies(jmsBinding, reader);
+ // Read binding name
+ String name = reader.getAttributeValue(null, "name");
+ if (name != null) {
+ jmsBinding.setName(name);
+ }
+
// Read binding URI
String uri = reader.getAttributeValue(null, "uri");
- if (uri != null && uri.length() > 0) {
+ if (uri != null) {
jmsBinding.setURI(uri);
System.err.println("JMS Binding doesn't process uri yet");
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.java?view=diff&rev=561210&r1=561209&r2=561210
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.java Mon Jul 30 19:10:43 2007
@@ -63,10 +63,14 @@
public NotificationBinding read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
assert BINDING_NOTIFICATION.equals(reader.getName());
String bindingUri = reader.getAttributeValue(null, "uri");
+ String name = reader.getAttributeValue(null, "name");
String ntm = reader.getAttributeValue(null, "ntm");
String notificationType = reader.getAttributeValue(null, "notificationType");
NotificationBinding binding = bindingFactory.createNotificationBinding();
+ if (name != null) {
+ binding.setName(name);
+ }
if (bindingUri != null) {
binding.setURI(bindingUri);
}
Modified: incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingProcessor.java?view=diff&rev=561210&r1=561209&r2=561210
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingProcessor.java Mon Jul 30 19:10:43 2007
@@ -39,6 +39,8 @@
public class SCABindingProcessor implements StAXArtifactProcessor<SCABinding> {
private static final QName BINDING_SCA = new QName(Constants.SCA10_NS, "binding.sca");
+ private final static String NAME = "name";
+ private final static String URI = "uri";
private final SCABindingFactory factory;
@@ -55,10 +57,14 @@
}
public SCABinding read(XMLStreamReader reader) throws ContributionReadException {
- String uri = reader.getAttributeValue(null, "uri");
SCABinding scaBinding = factory.createSCABinding();
+ String name = reader.getAttributeValue(null, NAME);
+ if (name != null) {
+ scaBinding.setName(name);
+ }
+ String uri = reader.getAttributeValue(null, URI);
if (uri != null) {
- scaBinding.setURI(uri.trim());
+ scaBinding.setURI(uri);
}
return scaBinding;
}
Modified: incubator/tuscany/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java?view=diff&rev=561210&r1=561209&r2=561210
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java Mon Jul 30 19:10:43 2007
@@ -82,9 +82,18 @@
// Read policies
readPolicies(wsBinding, reader);
+
+ // Read the binding name
+ String name = reader.getAttributeValue(null, NAME);
+ if (name != null) {
+ wsBinding.setName(name);
+ }
// Read URI
- wsBinding.setURI(reader.getAttributeValue(null, Constants.URI));
+ String uri = reader.getAttributeValue(null, URI);
+ if (uri != null) {
+ wsBinding.setURI(uri);
+ }
// Read a qname in the form:
// namespace#wsdl.???(name)
@@ -97,42 +106,42 @@
}
String namespace = wsdlElement.substring(0, index);
wsBinding.setNamespace(namespace);
- String name = wsdlElement.substring(index + 1);
- if (name.startsWith("wsdl.service")) {
+ String localName = wsdlElement.substring(index + 1);
+ if (localName.startsWith("wsdl.service")) {
// Read a wsdl.service
- name = name.substring("wsdl.service(".length(), name.length() - 1);
- wsBinding.setServiceName(new QName(namespace, name));
+ localName = localName.substring("wsdl.service(".length(), localName.length() - 1);
+ wsBinding.setServiceName(new QName(namespace, localName));
- } else if (name.startsWith("wsdl.port")) {
+ } else if (localName.startsWith("wsdl.port")) {
// Read a wsdl.port
- name = name.substring("wsdl.port(".length(), name.length() - 1);
- int s = name.indexOf('/');
+ localName = localName.substring("wsdl.port(".length(), localName.length() - 1);
+ int s = localName.indexOf('/');
if (s == -1) {
throw new ContributionReadException(
"Invalid WebService binding wsdlElement attribute: " + wsdlElement);
}
- wsBinding.setServiceName(new QName(namespace, name.substring(0, s)));
- wsBinding.setPortName(name.substring(s + 1));
+ wsBinding.setServiceName(new QName(namespace, localName.substring(0, s)));
+ wsBinding.setPortName(localName.substring(s + 1));
- } else if (name.startsWith("wsdl.endpoint")) {
+ } else if (localName.startsWith("wsdl.endpoint")) {
// Read a wsdl.endpoint
- name = name.substring("wsdl.endpoint(".length(), name.length() - 1);
- int s = name.indexOf('/');
+ localName = localName.substring("wsdl.endpoint(".length(), localName.length() - 1);
+ int s = localName.indexOf('/');
if (s == -1) {
throw new ContributionReadException(
"Invalid WebService binding wsdlElement attribute: " + wsdlElement);
}
- wsBinding.setServiceName(new QName(namespace, name.substring(0, s)));
- wsBinding.setEndpointName(name.substring(s + 1));
+ wsBinding.setServiceName(new QName(namespace, localName.substring(0, s)));
+ wsBinding.setEndpointName(localName.substring(s + 1));
- } else if (name.startsWith("wsdl.binding")) {
+ } else if (localName.startsWith("wsdl.binding")) {
// Read a wsdl.service
- name = name.substring("wsdl.binding(".length(), name.length() - 1);
- wsBinding.setBindingName(new QName(namespace, name));
+ localName = localName.substring("wsdl.binding(".length(), localName.length() - 1);
+ wsBinding.setBindingName(new QName(namespace, localName));
} else {
throw new ContributionReadException(
Modified: incubator/tuscany/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java?view=diff&rev=561210&r1=561209&r2=561210
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java Mon Jul 30 19:10:43 2007
@@ -31,5 +31,8 @@
String WSDL_LOCATION = "wsdlLocation";
String WSDLI_NS = "http://www.w3.org/2004/08/wsdl-instance";
QName WSDL_LOCATION_QNAME = new QName(WSDLI_NS, WSDL_LOCATION);
+ String NAME = "name";
+ String URI = "uri";
+
}
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/NamespaceImportAllModelResolverImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/NamespaceImportAllModelResolverImpl.java?view=diff&rev=561210&r1=561209&r2=561210
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/NamespaceImportAllModelResolverImpl.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/NamespaceImportAllModelResolverImpl.java Mon Jul 30 19:10:43 2007
@@ -19,7 +19,7 @@
package org.apache.tuscany.sca.contribution.resolver.impl;
-import java.util.Collection;
+import java.util.List;
import org.apache.tuscany.sca.contribution.Contribution;
import org.apache.tuscany.sca.contribution.Export;
@@ -35,9 +35,9 @@
public class NamespaceImportAllModelResolverImpl implements ModelResolver {
private NamespaceImport namespaceImport;
- private Collection<Contribution> contributions;
+ private List<Contribution> contributions;
- public NamespaceImportAllModelResolverImpl(NamespaceImport namespaceImport, Collection<Contribution> contributions) {
+ public NamespaceImportAllModelResolverImpl(NamespaceImport namespaceImport, List<Contribution> contributions) {
this.namespaceImport = namespaceImport;
this.contributions = contributions;
}
Modified: incubator/tuscany/java/sca/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/binding/resource/impl/HTTPResourceBindingProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/binding/resource/impl/HTTPResourceBindingProcessor.java?view=diff&rev=561210&r1=561209&r2=561210
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/binding/resource/impl/HTTPResourceBindingProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/binding/resource/impl/HTTPResourceBindingProcessor.java Mon Jul 30 19:10:43 2007
@@ -39,7 +39,9 @@
*/
public class HTTPResourceBindingProcessor implements StAXArtifactProcessor<HTTPResourceBinding> {
- private QName BINDING_RESOURCE = new QName(SCA_NS, "binding.resource");
+ private final static QName BINDING_RESOURCE = new QName(SCA_NS, "binding.resource");
+ private final static String NAME = "name";
+ private final static String URI = "uri";
private final HTTPResourceBindingFactory factory;
@@ -56,10 +58,14 @@
}
public HTTPResourceBinding read(XMLStreamReader reader) throws ContributionReadException {
- String uri = reader.getAttributeValue(null, "uri");
HTTPResourceBinding resourceBinding = factory.createHTTPResourceBinding();
+ String name = reader.getAttributeValue(null, NAME);
+ if (name != null) {
+ resourceBinding.setName(name);
+ }
+ String uri = reader.getAttributeValue(null, URI);
if (uri != null) {
- resourceBinding.setURI(uri.trim());
+ resourceBinding.setURI(uri);
}
return resourceBinding;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org