Author: lresende
Date: Tue Feb 10 22:27:23 2009
New Revision: 743135
URL: http://svn.apache.org/viewvc?rev=743135&view=rev
Log:
Merge branch 'bpel-resolver'
Added:
tuscany/branches/sca-java-1.x/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/impl/
tuscany/branches/sca-java-1.x/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/impl/ReadWriteAnyAttributeTestCase.java
(with props)
tuscany/branches/sca-java-1.x/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadWriteAnyAttributeTestCase.java
(with props)
Modified:
tuscany/branches/sca-java-1.x/modules/binding-ejb/pom.xml
tuscany/branches/sca-java-1.x/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
tuscany/branches/sca-java-1.x/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
Modified: tuscany/branches/sca-java-1.x/modules/binding-ejb/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-ejb/pom.xml?rev=743135&r1=743134&r2=743135&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/binding-ejb/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/modules/binding-ejb/pom.xml Tue Feb 10
22:27:23 2009
@@ -54,6 +54,13 @@
<artifactId>tuscany-policy</artifactId>
<version>1.5-SNAPSHOT</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-contribution-xml</artifactId>
+ <version>1.5-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
Modified:
tuscany/branches/sca-java-1.x/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java?rev=743135&r1=743134&r2=743135&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
Tue Feb 10 22:27:23 2009
@@ -19,6 +19,8 @@
package org.apache.tuscany.sca.binding.ejb.impl;
import javax.xml.namespace.QName;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
@@ -33,6 +35,7 @@
import
org.apache.tuscany.sca.contribution.processor.ExtensibleStAXAttributeProcessor;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor;
+import
org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessorExtensionPoint;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import org.apache.tuscany.sca.contribution.service.ContributionReadException;
import
org.apache.tuscany.sca.contribution.service.ContributionResolveException;
@@ -78,7 +81,12 @@
this.policyFactory = modelFactories.getFactory(PolicyFactory.class);
this.extensionFactory =
modelFactories.getFactory(ExtensionFactory.class);
this.policyProcessor = new PolicyAttachPointProcessor(policyFactory);
- this.extensionAttributeProcessor =
extensionPoints.getExtensionPoint(ExtensibleStAXAttributeProcessor.class);
+
+ XMLInputFactory inputFactory =
modelFactories.getFactory(XMLInputFactory.class);
+ XMLOutputFactory outputFactory =
modelFactories.getFactory(XMLOutputFactory.class);
+ StAXAttributeProcessorExtensionPoint attributeExtensionPoint =
extensionPoints.getExtensionPoint(StAXAttributeProcessorExtensionPoint.class);
+ this.extensionAttributeProcessor = new
ExtensibleStAXAttributeProcessor(attributeExtensionPoint ,inputFactory,
outputFactory, this.monitor);
+
UtilityExtensionPoint utilities =
extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
MonitorFactory monitorFactory =
utilities.getUtility(MonitorFactory.class);
Added:
tuscany/branches/sca-java-1.x/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/impl/ReadWriteAnyAttributeTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/impl/ReadWriteAnyAttributeTestCase.java?rev=743135&view=auto
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/impl/ReadWriteAnyAttributeTestCase.java
(added)
+++
tuscany/branches/sca-java-1.x/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/impl/ReadWriteAnyAttributeTestCase.java
Tue Feb 10 22:27:23 2009
@@ -0,0 +1,133 @@
+/*
+ * 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.apache.tuscany.sca.binding.ejb.impl;
+
+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.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.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.ejb 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 staxAttributeProcessors = new
DefaultStAXAttributeProcessorExtensionPoint(extensionPoints);
+ staxAttributeProcessors.addArtifactProcessor(attributeProcessor);
+ extensionPoints.addExtensionPoint(staxAttributeProcessors);
+
+ EJBBindingProcessor wsbp = new EJBBindingProcessor(extensionPoints);
+
+ 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.x/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/impl/ReadWriteAnyAttributeTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/branches/sca-java-1.x/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/impl/ReadWriteAnyAttributeTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
tuscany/branches/sca-java-1.x/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java?rev=743135&r1=743134&r2=743135&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
Tue Feb 10 22:27:23 2009
@@ -57,7 +57,6 @@
import
org.apache.tuscany.sca.contribution.service.ContributionRuntimeException;
import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory;
@@ -65,7 +64,6 @@
import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract;
import org.apache.tuscany.sca.interfacedef.wsdl.WSDLObject;
import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
import org.apache.tuscany.sca.monitor.Problem;
import org.apache.tuscany.sca.monitor.Problem.Severity;
import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
Added:
tuscany/branches/sca-java-1.x/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadWriteAnyAttributeTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadWriteAnyAttributeTestCase.java?rev=743135&view=auto
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadWriteAnyAttributeTestCase.java
(added)
+++
tuscany/branches/sca-java-1.x/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadWriteAnyAttributeTestCase.java
Tue Feb 10 22:27:23 2009
@@ -0,0 +1,133 @@
+/*
+ * 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.apache.tuscany.sca.binding.ws.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.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.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\">" +
+ "<interface.java interface=\"com.ibm.MyInterface\"
xmlns:myPrefix=\"http://myPrefix\"; myPrefix:myJavaInterfaceAnyAttribute=\"Java
Interface Value\" />" +
+ "<binding.ws xmlns:myPrefix=\"http://myPrefix\";
myPrefix:myWSAnyAttribute=\"WS 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 staxAttributeProcessors = new
DefaultStAXAttributeProcessorExtensionPoint(extensionPoints);
+ staxAttributeProcessors.addArtifactProcessor(attributeProcessor);
+ extensionPoints.addExtensionPoint(staxAttributeProcessors);
+
+ WebServiceBindingProcessor wsbp = new
WebServiceBindingProcessor(extensionPoints,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.x/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadWriteAnyAttributeTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/branches/sca-java-1.x/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadWriteAnyAttributeTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
