Author: lresende
Date: Thu Feb 12 03:02:55 2009
New Revision: 743606
URL: http://svn.apache.org/viewvc?rev=743606&view=rev
Log:
TUSCANY-2463 - Merging changes from 1.x to enable extended attribute support
for default sca binding
Added:
tuscany/branches/sca-java-1.3.3/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadWriteAnyAttributeTestCase.java
(with props)
Modified:
tuscany/branches/sca-java-1.3.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
tuscany/branches/sca-java-1.3.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
tuscany/branches/sca-java-1.3.3/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
tuscany/branches/sca-java-1.3.3/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/builder/impl/CalculateBindingURITestCase.java
Modified:
tuscany/branches/sca-java-1.3.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java?rev=743606&r1=743605&r2=743606&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.3.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
(original)
+++
tuscany/branches/sca-java-1.3.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
Thu Feb 12 03:02:55 2009
@@ -35,12 +35,14 @@
import org.apache.tuscany.sca.policy.PolicySet;
import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
+import org.apache.tuscany.sca.assembly.impl.ExtensibleImpl;
+
/**
* A test cheel for the SCA binding.
*
* @version $Rev$ $Date$
*/
-public class TestSCABindingImpl implements SCABinding, OptimizableBinding,
PolicySetAttachPoint, OperationsConfigurator {
+public class TestSCABindingImpl extends ExtensibleImpl implements SCABinding,
OptimizableBinding, PolicySetAttachPoint, OperationsConfigurator {
private String name;
private String uri;
private List<Object> extensions = new ArrayList<Object>();
Modified:
tuscany/branches/sca-java-1.3.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java?rev=743606&r1=743605&r2=743606&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.3.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
(original)
+++
tuscany/branches/sca-java-1.3.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
Thu Feb 12 03:02:55 2009
@@ -23,5 +23,5 @@
*
* @version $Rev$ $Date$
*/
-public interface SCABinding extends Binding {
+public interface SCABinding extends Binding, Extensible {
}
Modified:
tuscany/branches/sca-java-1.3.3/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.3/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java?rev=743606&r1=743605&r2=743606&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.3.3/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
(original)
+++
tuscany/branches/sca-java-1.3.3/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
Thu Feb 12 03:02:55 2009
@@ -26,12 +26,15 @@
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
+import org.apache.tuscany.sca.assembly.Extension;
+import org.apache.tuscany.sca.assembly.ExtensionFactory;
import org.apache.tuscany.sca.assembly.SCABinding;
import org.apache.tuscany.sca.assembly.SCABindingFactory;
import org.apache.tuscany.sca.assembly.xml.Constants;
import org.apache.tuscany.sca.assembly.xml.PolicyAttachPointProcessor;
import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import org.apache.tuscany.sca.contribution.service.ContributionReadException;
import
org.apache.tuscany.sca.contribution.service.ContributionResolveException;
@@ -50,20 +53,32 @@
public class SCABindingProcessor implements StAXArtifactProcessor<SCABinding>,
Constants{
- private PolicyFactory policyFactory;
private SCABindingFactory scaBindingFactory;
- private PolicyAttachPointProcessor policyProcessor;
+ private ExtensionFactory extensionFactory;
+ private PolicyFactory policyFactory;
private IntentAttachPointTypeFactory intentAttachPointTypeFactory;
+
+ private PolicyAttachPointProcessor policyProcessor;
+ private StAXAttributeProcessor<Object> extensionAttributeProcessor;
+
private Monitor monitor;
protected static final String BINDING_SCA = "binding.sca";
protected static final QName BINDING_SCA_QNAME = new
QName(Constants.SCA10_NS, BINDING_SCA);
- public SCABindingProcessor(ModelFactoryExtensionPoint modelFactories,
Monitor monitor) {
- this.policyFactory = modelFactories.getFactory(PolicyFactory.class);
+ public SCABindingProcessor(ModelFactoryExtensionPoint modelFactories,
+ StAXArtifactProcessor extensionProcessor,
+ StAXAttributeProcessor extensionAttributeProcessor,
+ Monitor monitor) {
+
this.scaBindingFactory =
modelFactories.getFactory(SCABindingFactory.class);
- policyProcessor = new PolicyAttachPointProcessor(policyFactory);
+ this.extensionFactory =
modelFactories.getFactory(ExtensionFactory.class);
+ this.policyFactory = modelFactories.getFactory(PolicyFactory.class);
this.intentAttachPointTypeFactory =
modelFactories.getFactory(IntentAttachPointTypeFactory.class);
+
+ this.policyProcessor = new PolicyAttachPointProcessor(policyFactory);
+ this.extensionAttributeProcessor = extensionAttributeProcessor;
+
this.monitor = monitor;
}
@@ -97,6 +112,24 @@
scaBinding.setURI(uri);
}
+ // Handle extended attributes
+ for (int a = 0; a < reader.getAttributeCount(); a++) {
+ QName attributeName = reader.getAttributeName(a);
+ if( attributeName.getNamespaceURI() != null &&
attributeName.getNamespaceURI().length() > 0) {
+ if( (!
Constants.SCA10_NS.equals(attributeName.getNamespaceURI()) &&
+ (!
Constants.SCA10_TUSCANY_NS.equals(attributeName.getNamespaceURI()) ))) {
+ Object attributeValue =
extensionAttributeProcessor.read(attributeName, reader);
+ Extension attributeExtension;
+ if (attributeValue instanceof Extension) {
+ attributeExtension = (Extension) attributeValue;
+ } else {
+ attributeExtension =
extensionFactory.createExtension(attributeName, attributeValue, true);
+ }
+
scaBinding.getAttributeExtensions().add(attributeExtension);
+ }
+ }
+ }
+
// Skip to end element
while (reader.hasNext()) {
if (reader.next() == END_ELEMENT &&
BINDING_SCA_QNAME.equals(reader.getName())) {
@@ -127,6 +160,14 @@
writer.writeAttribute(URI, scaBinding.getURI());
}
+ // Write extended attributes
+ for(Extension extension : scaBinding.getAttributeExtensions()) {
+ if(extension.isAttribute()) {
+ extensionAttributeProcessor.write(extension, writer);
+ }
+ }
+
+
writer.writeEndElement();
}
Added:
tuscany/branches/sca-java-1.3.3/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadWriteAnyAttributeTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.3/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadWriteAnyAttributeTestCase.java?rev=743606&view=auto
==============================================================================
---
tuscany/branches/sca-java-1.3.3/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadWriteAnyAttributeTestCase.java
(added)
+++
tuscany/branches/sca-java-1.3.3/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadWriteAnyAttributeTestCase.java
Thu Feb 12 03:02:55 2009
@@ -0,0 +1,140 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apace.tuscany.sca.binding.sca.xml;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.io.ByteArrayOutputStream;
+import java.io.StringReader;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.binding.sca.xml.SCABindingProcessor;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import
org.apache.tuscany.sca.contribution.processor.DefaultStAXAttributeProcessorExtensionPoint;
+import
org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
+import
org.apache.tuscany.sca.contribution.processor.ExtensibleStAXAttributeProcessor;
+import
org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
+import org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor;
+import
org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessorExtensionPoint;
+import org.apache.tuscany.sca.contribution.processor.xml.AnyAttributeProcessor;
+import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Test reading SCA XML assemblies.
+ *
+ * @version $Rev$ $Date$
+ */
+public class ReadWriteAnyAttributeTestCase {
+
+ private static final QName EXTENDED_ATTRIBUTE = new QName("http://test";,
"customAttribute");
+
+ private static final String XML =
+ "<?xml version='1.0' encoding='UTF-8'?>" +
+ "<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\"; " +
+ "xmlns:ns1=\"http://www.osoa.org/xmlns/sca/1.0\"; " +
+ "targetNamespace=\"http://temp\"; " +
+ "name=\"myComposite\">" +
+ "<service name=\"service\">" +
+ "<binding.sca xmlns:myPrefix=\"http://myPrefix\";
myPrefix:myWSAnyAttribute=\"EJB Value\" />" +
+ "<interface.java interface=\"com.ibm.MyInterface\"
xmlns:myPrefix=\"http://myPrefix\"; myPrefix:myJavaInterfaceAnyAttribute=\"Java
Interface Value\" />" +
+ "</service>" +
+ "<component name=\"component\">" +
+ "<implementation.java class=\"com.ibm.test.MyClass\"
xmlns:myPrefix=\"http://myPrefix\"; myPrefix:myJavaImplAnyAttribute=\"Java Impl
Value\" />" +
+ "</component>" +
+ "<component name=\"component1\">" +
+ "<implementation.composite xmlns:ns2=\"http://temp\";
name=\"ns2:myComposite\" xmlns:myPrefix=\"http://myPrefix\";
myPrefix:myCompositeImplAnyAttribute=\"Composite Impl Value\" />" +
+ "</component>" +
+ "<reference name=\"reference\">" +
+ "<interface.wsdl
interface=\"http://www.example.org/SpaceWarGame/#wsdl.interface(SpaceWarGame)\"
xmlns:myPrefix=\"http://myPrefix\"; myPrefix:myWSDLInterfaceAnyAttribute=\"WSDL
Interface Value\" />" +
+ "</reference>" +
+ "</composite>";
+
+ private XMLInputFactory inputFactory;
+ private ExtensibleStAXArtifactProcessor staxProcessor;
+
+
+ /**
+ * Initialize the test environment
+ * This takes care to register attribute processors when provided
+ *
+ * @param attributeProcessor
+ * @throws Exception
+ */
+ @Before
+ public void setUp() throws Exception {
+ ExtensionPointRegistry extensionPoints = new
DefaultExtensionPointRegistry();
+ ModelFactoryExtensionPoint modelFactories =
extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
+
+ inputFactory = XMLInputFactory.newInstance();
+
+ StAXAttributeProcessor attributeProcessor = new
AnyAttributeProcessor(modelFactories,null);
+
+ StAXAttributeProcessorExtensionPoint
staxAttributeProcessorsExtensionPoint = new
DefaultStAXAttributeProcessorExtensionPoint(extensionPoints);
+
staxAttributeProcessorsExtensionPoint.addArtifactProcessor(attributeProcessor);
+
extensionPoints.addExtensionPoint(staxAttributeProcessorsExtensionPoint);
+
+
+ XMLInputFactory inputFactory =
modelFactories.getFactory(XMLInputFactory.class);
+ XMLOutputFactory outputFactory =
modelFactories.getFactory(XMLOutputFactory.class);
+ StAXAttributeProcessor<Object> staxAttributeProcessor = new
ExtensibleStAXAttributeProcessor(staxAttributeProcessorsExtensionPoint
,inputFactory, outputFactory, null);
+
+ SCABindingProcessor wsbp = new SCABindingProcessor(modelFactories,
null, staxAttributeProcessor, null);
+
+ StAXArtifactProcessorExtensionPoint staxProcessors =
extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
+ staxProcessors.addArtifactProcessor(wsbp);
+
+ staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors,
XMLInputFactory.newInstance(), XMLOutputFactory.newInstance(), null);
+ }
+
+ @After
+ public void tearDown() throws Exception {
+
+ }
+
+
+ @Test
+ //@Ignore()
+ public void testReadWriteCompositeWithBindings() throws Exception {
+ XMLStreamReader reader = inputFactory.createXMLStreamReader(new
StringReader(XML));
+ Composite composite = (Composite)staxProcessor.read(reader);
+ assertNotNull(composite);
+ reader.close();
+
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ staxProcessor.write(composite, bos);
+
+ // used for debug comparison
+ // System.out.println(XML);
+ // System.out.println(bos.toString());
+
+ assertEquals(XML, bos.toString());
+ bos.close();
+ }
+}
Propchange:
tuscany/branches/sca-java-1.3.3/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadWriteAnyAttributeTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/branches/sca-java-1.3.3/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadWriteAnyAttributeTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
tuscany/branches/sca-java-1.3.3/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/builder/impl/CalculateBindingURITestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.3/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/builder/impl/CalculateBindingURITestCase.java?rev=743606&r1=743605&r2=743606&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.3.3/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/builder/impl/CalculateBindingURITestCase.java
(original)
+++
tuscany/branches/sca-java-1.3.3/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/builder/impl/CalculateBindingURITestCase.java
Thu Feb 12 03:02:55 2009
@@ -38,6 +38,7 @@
import org.apache.tuscany.sca.assembly.SCABinding;
import org.apache.tuscany.sca.assembly.SCABindingFactory;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
+import org.apache.tuscany.sca.assembly.impl.ExtensibleImpl;
import org.apache.tuscany.sca.implementation.node.NodeImplementation;
import org.apache.tuscany.sca.implementation.node.NodeImplementationFactory;
import
org.apache.tuscany.sca.implementation.node.impl.NodeImplementationFactoryImpl;
@@ -549,7 +550,7 @@
}
}
- public class TestBindingImpl implements SCABinding {
+ public class TestBindingImpl extends ExtensibleImpl implements SCABinding {
private String name;
private String uri;
private boolean unresolved;
