archive/apache-tuscany
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TUSCANY-242 add URI specific processing for binding uris and a couple of others I missed

Browse source 
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@921293 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
slaws 2010-03-10 10:40:26 +00:00
commit f5e3bee1d5
7 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
View file

@ -224,7 +224,7 @@ abstract class BaseAssemblyProcessor extends BaseStAXArtifactProcessor {
* @param reader
*/
protected void readTargets(Reference reference, XMLStreamReader reader) {
String value = getURIString(reader, TARGET);
String value = getString(reader, TARGET);
ComponentService target = null;
if (value != null) {
for (StringTokenizer tokens = new StringTokenizer(value); tokens.hasMoreTokens();) {

2
sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
View file

@ -294,7 +294,7 @@ public class CompositeProcessor extends BaseAssemblyProcessor implements StAXArt
compositeReference.setName(getString(reader, NAME));
readMultiplicity(compositeReference, reader);
readTargets(compositeReference, reader);
String promote = getURIString(reader, Constants.PROMOTE);
String promote = getString(reader, Constants.PROMOTE);
if (promote != null) {
for (StringTokenizer tokens = new StringTokenizer(promote); tokens.hasMoreTokens();) {
String refName = tokens.nextToken();

7
sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
View file

@ -139,7 +139,12 @@ public class DefaultBeanModelProcessor<T> extends BaseAssemblyProcessor implemen
String attributeName = reader.getAttributeLocalName(i);
Method setter = setterMethods.get(attributeName);
if (setter != null) {
String value = reader.getAttributeValue(i);
String value = null;
if (attributeName.equals("uri")){
value = getURIString(reader, "uri");
} else {
value = reader.getAttributeValue(i);
}
setter.invoke(model, value);
}
}

5
sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/SCABindingProcessor.java
View file

@ -28,6 +28,7 @@ import javax.xml.stream.XMLStreamWriter;
import org.apache.tuscany.sca.assembly.SCABinding;
import org.apache.tuscany.sca.assembly.SCABindingFactory;
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.policy.PolicySubject;
* @version $Rev$ $Date$
*/
public class SCABindingProcessor implements StAXArtifactProcessor<SCABinding> {
public class SCABindingProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<SCABinding> {
private static final String NAME = "name";
private static final String URI = "uri";
@ -91,7 +92,7 @@ public class SCABindingProcessor implements StAXArtifactProcessor<SCABinding> {
}
// Read binding URI
String uri = reader.getAttributeValue(null, URI);
String uri = getURIString(reader, URI);
if (uri != null) {
scaBinding.setURI(uri);
}

5
sca-java-2.x/trunk/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
View file

@ -27,6 +27,7 @@ import org.apache.tuscany.sca.assembly.xml.Constants;
import org.apache.tuscany.sca.assembly.xml.PolicySubjectProcessor;
import org.apache.tuscany.sca.binding.ejb.EJBBinding;
import org.apache.tuscany.sca.binding.ejb.EJBBindingFactory;
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;
@ -57,7 +58,7 @@ import org.apache.tuscany.sca.policy.PolicyFactory;
*
* @version $Rev$ $Date$
*/
public class EJBBindingProcessor implements StAXArtifactProcessor<EJBBinding> {
public class EJBBindingProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<EJBBinding> {
private PolicyFactory policyFactory;
private PolicySubjectProcessor policyProcessor;
@ -106,7 +107,7 @@ public class EJBBindingProcessor implements StAXArtifactProcessor<EJBBinding> {
}
// Read binding URI
String uri = reader.getAttributeValue(null, EJBBinding.URI);
String uri = getURIString(reader, EJBBinding.URI);
if (uri != null) {
ejbBinding.setURI(uri);
}

2
sca-java-2.x/trunk/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java
View file

@ -84,7 +84,7 @@ public class HTTPBindingProcessor extends BaseStAXArtifactProcessor implements S
httpBinding.setName(name);
}
String uri = getString(reader, URI);
String uri = getURIString(reader, URI);
if (uri != null) {
httpBinding.setURI(uri);
}

2
sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
View file

@ -128,7 +128,7 @@ public class WebServiceBindingProcessor extends BaseStAXArtifactProcessor implem
}
// Read URI
String uri = reader.getAttributeValue(null, URI);
String uri = getURIString(reader, URI);
if (uri != null) {
wsBinding.setURI(uri);
}