Start branch for 1.3.1, the only changes in this commit are for the version

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@684661 13f79535-47bb-0310-9956-ffa450edef68

12 files changed, 1992 insertions, 0 deletions

diff --git a/branches/sca-java-1.3.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELFactory.java b/branches/sca-java-1.3.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELFactory.java
new file mode 100644
index 0000000000..c47888de17
--- /dev/null
+++ b/branches/sca-java-1.3.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELFactory.java
@@ -0,0 +1,41 @@
+/*
+ * 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.implementation.bpel;
+
+/**
+ * A factory for the BPEL implementation model.
+ * 
+ * @version $Rev$ $Date$
+ */
+public interface BPELFactory {
+    
+    /**
+     * Creates a new BPEL implementation.
+     * 
+     * @return
+     */
+    BPELImplementation createBPELImplementation();
+
+    /**
+     * Creates a new BPEL Process Definition
+     * @return
+     */
+    BPELProcessDefinition createBPELProcessDefinition();
+}
diff --git a/branches/sca-java-1.3.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java b/branches/sca-java-1.3.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
new file mode 100644
index 0000000000..53e160dd1c
--- /dev/null
+++ b/branches/sca-java-1.3.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
@@ -0,0 +1,66 @@
+/*
+ * 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.implementation.bpel;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.sca.assembly.ComponentType;
+import org.apache.tuscany.sca.assembly.Implementation;
+
+/**
+ * The model representing the BPEL implementation in an SCA assembly model.
+ * 
+ * @version $Rev$ $Date$
+ */
+public interface BPELImplementation extends Implementation {
+
+    /**
+     * Get the BPEL process Name
+     */
+    QName getProcess();
+    
+    /**
+     * Set the BPEL process Name
+     * @param processName process QName
+     */
+    void setProcess(QName processName);
+    
+    /**
+     * Get the BPEL process definition
+     * @return
+     */
+    BPELProcessDefinition getProcessDefinition();
+    
+    /**
+     * Set the BPEL process definition
+     * @param processDefinition
+     */
+    void setProcessDefinition(BPELProcessDefinition processDefinition);
+    
+    /** 
+     * Returns the componentType for this Spring implementation 
+     */
+    public ComponentType getComponentType(); 
+
+    /**
+     * Sets the componentType for this Spring implementation
+     * @parma componentType the component type to set
+     */
+    public void setComponentType(ComponentType componentType); 
+}
diff --git a/branches/sca-java-1.3.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java b/branches/sca-java-1.3.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java
new file mode 100644
index 0000000000..61656e2533
--- /dev/null
+++ b/branches/sca-java-1.3.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java
@@ -0,0 +1,114 @@
+/*
+ * 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.implementation.bpel;
+
+import java.util.List;
+import java.util.Collection;
+
+import java.net.URI;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.wsdl.PortType;
+
+import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface;
+
+import org.apache.tuscany.sca.assembly.Base;
+import org.apache.tuscany.sca.implementation.bpel.xml.BPELPartnerLinkElement;
+import org.apache.tuscany.sca.implementation.bpel.xml.BPELImportElement;
+
+
+
+/**
+ * The BPEL process definition.
+ *
+ * @version $Rev$ $Date$
+ */
+public interface BPELProcessDefinition extends Base {
+
+    /**
+     * Get the BPEL process Name
+     */
+    QName getName();
+
+    /**
+     * Set the BPEL process Name
+     * @param processName process QName
+     */
+    void setName(QName name);
+
+    /**
+     * Get BPEL process URI
+     * @return URI for the process
+     */
+    URI getURI();
+
+    /**
+     * Set the BPEL process URI
+     * @param uri for the process
+     */
+    void setURI(URI uri);
+
+    /**
+     * Get the URL for the process location
+     * @return
+     */
+    URL getLocation();
+
+    /**
+     * Set the URL for the process location
+     * @param url
+     */
+    void setLocation(URL location);
+    
+    /**
+     * Return the list of PartnerLinks for this process
+     */
+    List<BPELPartnerLinkElement> getPartnerLinks();
+    
+    /**
+     * Return the list of imports for this process
+     */
+    List<BPELImportElement> getImports();
+    
+    /**
+     * Set the associated collection of port types
+     * @param thePortTypes
+     */
+    public void setPortTypes( Collection<PortType> thePortTypes ) ;
+    
+    /**
+     * Return the collection of associated port types
+     * @return
+     */
+    public Collection<PortType> getPortTypes() ;
+    
+    /**
+     * Set the associated collection of WSDL interfaces
+     * @param theInterfaces
+     */
+    public void setInterfaces( Collection<WSDLInterface> theInterfaces ) ;
+    
+    /**
+     * Return the collection of associated WSDL interfaces
+     * @return
+     */
+    public Collection<WSDLInterface> getInterfaces() ;
+}
diff --git a/branches/sca-java-1.3.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/DefaultBPELFactory.java b/branches/sca-java-1.3.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/DefaultBPELFactory.java
new file mode 100644
index 0000000000..d574f6e422
--- /dev/null
+++ b/branches/sca-java-1.3.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/DefaultBPELFactory.java
@@ -0,0 +1,53 @@
+/*
+ * 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.implementation.bpel;
+
+import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.implementation.bpel.impl.BPELImplementationImpl;
+import org.apache.tuscany.sca.implementation.bpel.impl.BPELProcessDefinitionImpl;
+import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory;
+
+/**
+ * A default factory for the BPEL implementation model.
+ * 
+ * @version $Rev$ $Date$
+ */
+public class DefaultBPELFactory implements BPELFactory {
+    
+    private AssemblyFactory assemblyFactory;
+    private WSDLFactory wsdlFactory;
+    
+    public DefaultBPELFactory(ModelFactoryExtensionPoint modelFactories) {
+        this.assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
+        this.wsdlFactory  = modelFactories.getFactory(WSDLFactory.class);
+    }
+
+    public BPELImplementation createBPELImplementation() {
+        return new BPELImplementationImpl(assemblyFactory, wsdlFactory);
+    }
+
+    public BPELProcessDefinition createBPELProcessDefinition() {
+        return new BPELProcessDefinitionImpl();
+    }
+    
+    
+
+}
diff --git a/branches/sca-java-1.3.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELDocumentProcessor.java b/branches/sca-java-1.3.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELDocumentProcessor.java
new file mode 100644
index 0000000000..0079272521
--- /dev/null
+++ b/branches/sca-java-1.3.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELDocumentProcessor.java
@@ -0,0 +1,524 @@
+/*
+ * 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.implementation.bpel.impl;
+
+import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
+import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
+
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.wsdl.Definition;
+import javax.wsdl.PortType;
+import javax.wsdl.extensions.ExtensibilityElement;
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.contribution.service.ContributionReadException;
+import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
+import org.apache.tuscany.sca.implementation.bpel.BPELFactory;
+import org.apache.tuscany.sca.implementation.bpel.BPELProcessDefinition;
+import org.apache.tuscany.sca.implementation.bpel.xml.BPELImportElement;
+import org.apache.tuscany.sca.implementation.bpel.xml.BPELPartnerLinkElement;
+import org.apache.tuscany.sca.implementation.bpel.xml.BPELPartnerLinkTypeElement;
+import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
+import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
+import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory;
+import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface;
+import org.apache.tuscany.sca.interfacedef.wsdl.WSDLObject;
+import org.apache.tuscany.sca.interfacedef.wsdl.xml.BPELPartnerLinkTypeExt;
+import org.apache.tuscany.sca.monitor.Monitor;
+import org.apache.tuscany.sca.monitor.Problem;
+import org.apache.tuscany.sca.monitor.Problem.Severity;
+
+/**
+ * BPEL document processor responsible for reading a BPEL file and producing necessary model info about it
+ * 
+ * TODO: The namespaces for WS-BPEL include 2 versions - only the earlier BPEL 1.1 versions are
+ * supported at present - the BPEL 2.0 namespaces also need support.  This will require inspection
+ * of both BPEL process files and of WSDL files for their BPEL namespaces
+ * @version $Rev$ $Date$
+ */
+public class BPELDocumentProcessor extends BaseStAXArtifactProcessor implements URLArtifactProcessor<BPELProcessDefinition> {
+    public final static QName BPEL_PROCESS_DEFINITION = new QName("http://schemas.xmlsoap.org/ws/2004/03/business-process/", "process");
+    public final static QName BPEL_EXECUTABLE_DEFINITION = new QName("http://docs.oasis-open.org/wsbpel/2.0/process/executable", "process");
+    private static final String SCA_BPEL_NS = "http://docs.oasis-open.org/ns/opencsa/sca-bpel/200801";
+    private static final String BPEL_NS = "http://schemas.xmlsoap.org/ws/2004/03/business-process/";
+    private static final String BPEL_PLINK_NS = "http://schemas.xmlsoap.org/ws/2004/03/partner-link/";
+    private static final QName PROCESS_ELEMENT = new QName(BPEL_NS, "process");
+    private static final QName PARTNERLINK_ELEMENT = new QName(BPEL_NS, "partnerLink");
+    private static final QName ONEVENT_ELEMENT = new QName(BPEL_NS, "onEvent");
+    private static final QName RECEIVE_ELEMENT = new QName(BPEL_NS, "receive");
+    private static final QName ONMESSAGE_ELEMENT = new QName(BPEL_NS, "onMessage");
+    private static final QName INVOKE_ELEMENT = new QName(BPEL_NS, "invoke");
+    private static final QName IMPORT_ELEMENT = new QName(BPEL_NS, "import");
+    private static final String LINKTYPE_NAME = "partnerLinkType";
+    private static final QName LINKTYPE_ELEMENT = new QName(BPEL_PLINK_NS, LINKTYPE_NAME);
+
+    public final static String NAME_ELEMENT = "name";
+    
+    private final static XMLInputFactory inputFactory = XMLInputFactory.newInstance();
+    
+    private final BPELFactory factory;
+    private WSDLFactory WSDLfactory;
+    private Monitor monitor;
+
+    public BPELDocumentProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
+        this.factory     = modelFactories.getFactory(BPELFactory.class);
+        this.WSDLfactory = modelFactories.getFactory(WSDLFactory.class);
+        this.monitor = monitor;
+    }
+    
+    /**
+     * Report a warning.
+     * 
+     * @param problems
+     * @param message
+     * @param model
+     */
+     private void warning(String message, Object model, Object... messageParameters) {
+         if (monitor != null) {
+             Problem problem = new ProblemImpl(this.getClass().getName(), "impl-bpel-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters);
+             monitor.problem(problem);
+         }
+     }
+     
+     /**
+      * Report a error.
+      * 
+      * @param problems
+      * @param message
+      * @param model
+      */
+      private void error(String message, Object model, Object... messageParameters) {
+          if (monitor != null) {
+              Problem problem = new ProblemImpl(this.getClass().getName(), "impl-bpel-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
+              monitor.problem(problem);
+          }
+      }
+    
+    /**
+     * Report a exception.
+     * 
+     * @param problems
+     * @param message
+     * @param model
+     */
+     private void error(String message, Object model, Exception ex) {
+         if (monitor != null) {
+             Problem problem = new ProblemImpl(this.getClass().getName(), "impl-bpel-validation-messages", Severity.ERROR, model, message, ex);
+             monitor.problem(problem);
+         }        
+     }
+            
+    
+    public String getArtifactType() {
+        return "*.bpel";
+    }    
+
+    public Class<BPELProcessDefinition> getModelType() {
+        return BPELProcessDefinition.class;
+    }
+
+    public BPELProcessDefinition read(URL contributionURL, URI artifactURI, URL artifactURL) throws ContributionReadException {
+        BPELProcessDefinition processDefinition = null;
+        try {
+            //for now we are just using process name
+            //and relying on componentType file for service definition
+            //so it's OK to set resolved for now
+            processDefinition = indexRead2(artifactURL);
+            processDefinition.setURI(artifactURI);
+            processDefinition.setUnresolved(false);
+        } catch (Exception e) {
+        	ContributionReadException ce = new ContributionReadException(e);
+        	error("ContributionReadException", artifactURL, ce);
+            //throw ce;
+        }
+        
+        return processDefinition;
+    }
+
+    /**
+     * Resolve the BPEL process
+     * - one of the things that needs doing is to pin down the WSDLs that are being used by
+     * the process, in particular the partnerLinkType and the related PortType definitions
+     */
+    public void resolve(BPELProcessDefinition model, ModelResolver resolver) 
+    	throws ContributionResolveException {
+        // FIXME - serious resolving needs to happen here
+    	
+    	// Step 1 is to resolve the WSDL files referenced from this BPEL process
+    	// - one complexity here is that the WSDL definitions hold BPEL extension elements for
+    	// the partnerLinkType declarations - and these must be used in later steps
+    	//
+    	// Step 2 is to take all the partnerLink definitions and establish the PortType being
+    	// used, by tracing through the related partnerLinkType declarations - the PortType is
+    	// effectively a definition of the interface used by the partnerLink.
+    	// - another consideration here is that each partnerLink can involve 2 interfaces, one
+    	// for the forward calls to the process, the other for calls from the process - depending
+    	// on whether the partnerLink is a reference or a service, one of these interfaces is a
+    	// callback interface.
+    	
+    	List<BPELImportElement> theImports = model.getImports();
+    	for ( BPELImportElement theImport : theImports ) {
+    		// Deal with WSDL imports
+    		if ( theImport.getImportType().equals("http://schemas.xmlsoap.org/wsdl/") ) {
+    			String WSDLLocation = theImport.getLocation();
+    			String WSDLNamespace = theImport.getNamespace();
+    			
+    			// Resolve the WSDL definition
+                WSDLDefinition proxy = WSDLfactory.createWSDLDefinition();
+                proxy.setUnresolved(true);
+                proxy.setNamespace(WSDLNamespace);
+                if ( WSDLLocation != null ) proxy.setLocation(URI.create(WSDLLocation));
+                WSDLDefinition resolved = resolver.resolveModel(WSDLDefinition.class, proxy);
+                if (resolved != null && !resolved.isUnresolved()) {
+                    theImport.setWSDLDefinition( resolved );
+                } else {
+                    error("CannotResolveWSDLReference", resolver, WSDLLocation, WSDLNamespace);
+                    //throw new ContributionResolveException("BPELDocumentProcessor:resolve -" +
+                			//" unable to resolve WSDL referenced by BPEL import" +
+                			//"WSDL location: " + WSDLLocation + " WSDLNamespace: " +
+                			//WSDLNamespace );
+                    return;
+                } // end if	
+    		} // end if
+    	} // end for
+    	
+    	// Fetch the sets of partner links, port types and interfaces
+    	List<BPELPartnerLinkTypeElement> thePLinkTypes = getPartnerLinkTypes( theImports );
+    	Collection<WSDLInterface> theInterfaces = (Collection<WSDLInterface>)new ArrayList<WSDLInterface>();
+    	Collection<PortType> thePortTypes = getAllPortTypes( theImports, theInterfaces, resolver );
+    	
+    	// Store the Port Types and the Interfaces for later calculation of the component type...
+    	model.setPortTypes(thePortTypes);
+    	model.setInterfaces(theInterfaces);
+    	
+    	// Now, for each partnerLink in the BPEL process, find the related partnerLinkType
+    	// element 
+    	List<BPELPartnerLinkElement> thePartnerLinks = model.getPartnerLinks();
+    	for ( BPELPartnerLinkElement thePartnerLink : thePartnerLinks ) {
+    		QName partnerLinkType = thePartnerLink.getPartnerLinkType();
+    		BPELPartnerLinkTypeElement pLinkType = 
+    			findPartnerLinkType( partnerLinkType, thePLinkTypes );
+    		if( pLinkType == null ) {
+    		    error("PartnerLinkNoMatchingType", thePartnerLink, thePartnerLink.getName());
+    		    //throw new ContributionResolveException( "PartnerLink " 
+    		        //+ thePartnerLink.getName() + " has no matching partner link type");
+    		} else    					
+    		    thePartnerLink.setPartnerLinkType(pLinkType);
+    	} // end for
+    	
+    } // end resolve
+    
+    /*
+     * Retrieve all the Partner Link types defined in the imported WSDL files
+     */
+    private List<BPELPartnerLinkTypeElement> getPartnerLinkTypes( List<BPELImportElement> theImports )
+    	throws ContributionResolveException {
+    	
+    	List<BPELPartnerLinkTypeElement> thePLinks = 
+    		new ArrayList<BPELPartnerLinkTypeElement>();
+    		
+    	// We must find the partner link type elements from amongst the imported WSDLs
+    	for ( BPELImportElement theImport : theImports ){
+    		WSDLDefinition theWSDL = theImport.getWSDLDefinition();
+    		Definition WSDLDefinition = theWSDL.getDefinition();
+    		// The BPEL partnerLinkType elements are extension elements within the WSDL
+    		List<ExtensibilityElement> extensibilityElements = WSDLDefinition.getExtensibilityElements();
+    		
+    		for ( ExtensibilityElement theElement : extensibilityElements ) {
+    			QName elementType = theElement.getElementType();
+    			if ( elementType.equals( LINKTYPE_ELEMENT ) ) {
+    				BPELPartnerLinkTypeExt pLinkExt = (BPELPartnerLinkTypeExt)theElement;
+    				// Fetch the name of the partnerLinkType
+    				String name = pLinkExt.getName();
+    				QName qName = new QName( WSDLDefinition.getTargetNamespace(), name );
+    				BPELPartnerLinkTypeElement pLinkElement = new BPELPartnerLinkTypeElement( qName );
+    				
+    				// The partnerLinkType must have one and may have 2 role child elements
+    				int count = 0;
+    				for( int i = 0; i < 2; i++ ) {
+    					if(pLinkExt.getRoleName(i) == null ) continue;
+    					PortType pType = WSDLDefinition.getPortType(pLinkExt.getRolePortType(i));
+    					if ( count == 0 ) {
+    						pLinkElement.setRole1(pLinkExt.getRoleName(i),
+    								              pLinkExt.getRolePortType(i),
+    								              pType );
+    						count++;
+    					} else if (count == 1) {
+    						pLinkElement.setRole2(pLinkExt.getRoleName(i),
+						                          pLinkExt.getRolePortType(i),
+						                          pType );
+    						count++;
+    					} else {
+    						break;
+    					} // end if 
+    				} // end for
+    				if( count == 0 ) {
+    				    error("PartnerLinkTypeNoRoles", theElement, pLinkElement.getName());
+    				    throw new ContributionResolveException( "partnerLinkType " +
+    				        pLinkElement.getName() +" has no Roles defined" );
+    				} else    						                         
+    				    thePLinks.add( pLinkElement );
+    			} // end if
+    			
+    		} // end for
+    	} // end for
+    	return thePLinks;
+    } // end getPartnerLinkTypes
+    
+    protected Collection<PortType> getAllPortTypes( List<BPELImportElement> theImports,
+    												Collection<WSDLInterface> theInterfaces,
+    												ModelResolver resolver) 
+    				throws ContributionResolveException {
+    	
+    	Collection<PortType> thePortTypes = (Collection<PortType>)new ArrayList<PortType>();
+    	for ( BPELImportElement theImport : theImports ){
+    		WSDLDefinition theWSDL = theImport.getWSDLDefinition();
+    		Definition wsdlDefinition = theWSDL.getDefinition();
+    		
+    		Collection<PortType> portTypes = (Collection<PortType>)wsdlDefinition.getPortTypes().values();
+    		thePortTypes.addAll( portTypes );
+    		
+    		// Create WSDLInterface elements for each PortType found
+    		for( PortType portType : portTypes ) {
+    			WSDLObject<PortType> wsdlPortType = theWSDL.getWSDLObject(PortType.class, portType.getQName() );
+    			WSDLInterface wsdlInterface;
+                if (wsdlPortType != null) {      
+                    // Introspect the WSDL portType and add the resulting
+                    // WSDLInterface to the resolver
+                    try {
+                        theWSDL.setDefinition( wsdlPortType.getDefinition() );
+                        wsdlInterface = WSDLfactory.createWSDLInterface(wsdlPortType.getElement(), 
+                        		theWSDL, resolver);
+                        wsdlInterface.setWsdlDefinition(theWSDL);
+                    } catch (InvalidInterfaceException e) {
+                    	ContributionResolveException ce = new ContributionResolveException(e);
+                    	error("ContributionResolveException", resolver, ce);
+                        throw ce;
+                    } // end try
+                    resolver.addModel(wsdlInterface);
+                    theInterfaces.add(wsdlInterface);
+                } // end if
+            } // end for
+      
+    		//-----------------------
+    		
+    	} // end for
+    	
+    	return thePortTypes;
+    } // end getAllPortTypes
+    
+    /**
+     * Returns a QName from a string.  
+     * @param definition - a WSDL Definition
+     * @param value - the String from which to form the QName in the form "pref:localName"
+     * @return
+     */
+    protected QName getQNameValue(Definition definition, String value) {
+        if (value != null && definition != null) {
+            int index = value.indexOf(':');
+            String prefix = index == -1 ? "" : value.substring(0, index);
+            String localName = index == -1 ? value : value.substring(index + 1);
+            String ns = definition.getNamespace(prefix);
+            if (ns == null) {
+                ns = "";
+            }
+            return new QName(ns, localName, prefix);
+        } else {
+            return null;
+        }
+    } // end getQNameValue
+
+    
+    /*
+     * Method which finds a partnerLinkType definition within the WSDLs imported by the BPEL
+     * process.
+     * @param partnerLinkTypeName - the name of the partnerLinkType
+     * @param theImports a list of the WSDL import declarations
+     * @returns a BPELPartnerLinkTypeElement for the partnerLinkType or null if it cannot be
+     * found
+     */
+    private BPELPartnerLinkTypeElement findPartnerLinkType( QName partnerLinkTypeName,
+    										List<BPELPartnerLinkTypeElement> thePLinkTypes) {
+    	// We must find the partner link type element from amongst the imported WSDLs
+    	for ( BPELPartnerLinkTypeElement thePLinkType : thePLinkTypes ){
+    		if( thePLinkType.getName().equals(partnerLinkTypeName) ) return thePLinkType;
+     	} // end for
+    	return null;
+    } // end findPartnerLinkType
+    
+    
+
+    protected BPELProcessDefinition indexRead2(URL doc) throws Exception {
+        BPELProcessDefinition processDefinition = factory.createBPELProcessDefinition();
+        processDefinition.setUnresolved(true);
+        processDefinition.setLocation(doc);
+
+        InputStream is = doc.openStream();
+        XMLStreamReader reader = null;
+        try {
+            reader = inputFactory.createXMLStreamReader(is);
+            /*
+             * The principle here is to look for partnerLink elements, which form either services
+             * or references.  A partnerLink can be EITHER - the algorithm for deciding is:
+             * 1) Explicit marking with sca:reference or sca:service attribute
+             * 2) "first use" of the partnerLink by specific BPEL activity elements:
+             * <onEvent../>, <receive../> or <pick../> elements imply a service
+             * <invoke../> implies a reference
+             */
+            // TODO - need to handle <scope../> elements as kind of "nested" processes
+            // - and scopes introduce the possibility of partnerLinks with the same name at
+            // different levels of scope.... (yuk!!)
+            boolean completed = false;
+            while (!completed) {
+                switch (reader.next()) {
+                    case START_ELEMENT:
+                        QName qname = reader.getName();
+                        //System.out.println("BPEL TypeLoader - found element with name: " + qname.toString());
+                        if (BPEL_PROCESS_DEFINITION.equals(qname) || 
+                        	BPEL_EXECUTABLE_DEFINITION.equals(qname)) {
+                            QName processName = new QName(getString(reader, org.apache.tuscany.sca.assembly.xml.Constants.TARGET_NAMESPACE), 
+                            		                      getString(reader, NAME_ELEMENT));
+                            processDefinition.setName(processName);
+                		} else if (PARTNERLINK_ELEMENT.equals(qname)) { 
+                            processDefinition.getPartnerLinks().add(processPartnerLinkElement( reader ));
+                        } else if (ONEVENT_ELEMENT.equals(qname) || 
+                        		   RECEIVE_ELEMENT.equals(qname) ||
+                        		   ONMESSAGE_ELEMENT.equals(qname) ) {
+                        	processPartnerLinkAsService( reader.getAttributeValue(null, "partnerLink"), processDefinition.getPartnerLinks() );
+                        } else if (INVOKE_ELEMENT.equals(qname)) { 
+                        	processPartnerLinkAsReference( reader.getAttributeValue(null, "partnerLink"), processDefinition.getPartnerLinks() );
+                        } else if (IMPORT_ELEMENT.equals(qname)) {
+                        	processDefinition.getImports().add( processImportElement( reader ) );
+                        } // end if
+                        break;
+                    case END_ELEMENT:
+                        if (PROCESS_ELEMENT.equals(reader.getName())) {
+                            //System.out.println("BPEL TypeLoader - finished read of process file");
+                            completed = true;
+                            break;
+                        } // end if
+                } // end switch
+            } // end while
+        } finally {
+            if(reader != null) reader.close();
+            is.close();
+        } // end try
+        
+        return processDefinition;
+    } // end indexRead2
+
+	/*
+	 * Processes a partnerLink element from the BPEL process and creates a
+	 * BPELPartnerLink object
+	 */
+	private BPELPartnerLinkElement processPartnerLinkElement( XMLStreamReader reader ) 
+					throws ContributionReadException {
+		BPELPartnerLinkElement partnerLink = new BPELPartnerLinkElement(
+	    		reader.getAttributeValue(null, "name"), 
+	    		getQNameValue(reader, reader.getAttributeValue(null, "partnerLinkType") ),
+	    		reader.getAttributeValue(null, "myRole"),
+	    		reader.getAttributeValue(null, "partnerRole"));
+	    // See if there are any SCA extension attributes
+	    String scaService = reader.getAttributeValue( SCA_BPEL_NS, "service");
+	    String scaReference = reader.getAttributeValue( SCA_BPEL_NS, "reference");
+	    if( (scaService != null) && (scaReference != null) ) {
+	    	// It is incorrect to set both service & reference attributes
+	        error("PartnerLinkHasBothAttr", partnerLink, reader.getAttributeValue(null, "name"));
+	    	throw new ContributionReadException( "BPEL PartnerLink " 
+	    			+ reader.getAttributeValue(null, "name") + 
+	    			" has both sca:reference and sca:service attributes set" );
+	    }
+	    // Set the SCA type and the related name, if present
+	    if( scaService != null ) partnerLink.setAsService( scaService );
+	    else if ( scaReference != null ) partnerLink.setAsReference( scaReference );
+	    return partnerLink;
+	} // end processPartnerLinkElement
+
+	/*
+	 * Processes an <import../> element from the BPEL process and creates a 
+	 * BPELImportElement object
+	 */
+	private BPELImportElement processImportElement( XMLStreamReader reader ) {
+		return ( new BPELImportElement( reader.getAttributeValue(null, "location"),
+				                        reader.getAttributeValue(null, "importType"),
+				                        reader.getAttributeValue(null, "namespace") ));
+	} // end processImportElement
+
+	/*
+	 * Mark a named partnerLink as a Service, unless it is already marked as a Reference
+	 */
+	private void processPartnerLinkAsService( String partnerLinkName, 
+										List<BPELPartnerLinkElement> partnerLinks ) {
+		BPELPartnerLinkElement partnerLink = findPartnerLinkByName( partnerLinks, partnerLinkName );
+		if( partnerLink == null ) {
+		    warning("ReferencePartnerLinkNotInList", partnerLinkName, partnerLinkName);
+		} else {
+			// Set the type of the partnerLink to "service" if not already set...
+			if( !partnerLink.isSCATyped() ) partnerLink.setAsService( partnerLinkName );
+		} // endif
+	} // end processPartnerLinkAsReference
+
+	/*
+	 * Mark a named partnerLink as a Reference, unless it is already marked as a Service
+	 */
+	private void processPartnerLinkAsReference( String partnerLinkName, 
+			List<BPELPartnerLinkElement> partnerLinks ) {
+		BPELPartnerLinkElement partnerLink = findPartnerLinkByName( partnerLinks, partnerLinkName );
+		if( partnerLink == null ) {
+		    warning("ReferencePartnerLinkNotInList", partnerLinkName, partnerLinkName);
+		} else {
+			// Set the type of the partnerLink to "service" if not already set...
+			if( !partnerLink.isSCATyped() ) partnerLink.setAsReference( partnerLinkName );
+		} // endif
+	} // end processPartnerLinkAsReference
+
+	/*
+	 * Finds a PartnerLink by name from a List of PartnerLinks
+	 * 
+	 * returns null if there is no partnerLink with a matching name
+	 * - returns the PartnerLink with a matching name
+	 */
+	private BPELPartnerLinkElement findPartnerLinkByName( List<BPELPartnerLinkElement> partnerLinks, 
+														  String partnerLinkName ) {
+		// Scan the list looking for a partner link with the supplied name
+		Iterator<BPELPartnerLinkElement> it = partnerLinks.iterator();
+		while( it.hasNext() ) {
+			BPELPartnerLinkElement thePartnerLink = it.next();
+			if( thePartnerLink.getName().equals(partnerLinkName) ) return thePartnerLink;
+		}
+		return null;
+	} // end method findPartnerLinkByName
+
+
+}
diff --git a/branches/sca-java-1.3.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java b/branches/sca-java-1.3.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
new file mode 100644
index 0000000000..96d8a12a36
--- /dev/null
+++ b/branches/sca-java-1.3.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
@@ -0,0 +1,144 @@
+/*
+ * 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.implementation.bpel.impl;
+
+import java.util.Collections;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.assembly.ComponentType;
+import org.apache.tuscany.sca.assembly.ConstrainingType;
+import org.apache.tuscany.sca.assembly.Property;
+import org.apache.tuscany.sca.assembly.Reference;
+import org.apache.tuscany.sca.assembly.Service;
+import org.apache.tuscany.sca.assembly.impl.ImplementationImpl;
+import org.apache.tuscany.sca.implementation.bpel.BPELImplementation;
+import org.apache.tuscany.sca.implementation.bpel.BPELProcessDefinition;
+import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory;
+
+/**
+ * The model representing a BPEL implementation in an SCA assembly model.
+ * 
+ * @version $Rev$ $Date$
+ */
+public class BPELImplementationImpl extends ImplementationImpl implements BPELImplementation {
+
+    private QName _processName;
+    private BPELProcessDefinition _processDefinition;
+    private ComponentType componentType;
+
+    /**
+     * Constructs a new BPEL implementation.
+     */
+    public BPELImplementationImpl(AssemblyFactory assemblyFactory,
+                              WSDLFactory wsdlFactory) {
+
+    }
+
+    public QName getProcess() {
+        return _processName;
+    }
+    
+    public void setProcess(QName processName) {
+        _processName = processName;
+    }
+
+    public BPELProcessDefinition getProcessDefinition() {
+        return this._processDefinition;
+    }
+
+    public void setProcessDefinition(BPELProcessDefinition processDefinition) {
+        this._processDefinition = processDefinition;
+    }
+
+    @Override
+    public String getURI() {
+        // The sample BPEL implementation does not have a URI
+        return null;
+    }
+
+    @Override
+    public void setURI(String uri) {
+        // The sample BPEL implementation does not have a URI
+    }
+
+    @Override
+    public ConstrainingType getConstrainingType() {
+        // The sample BPEL implementation does not support constrainingTypes
+        return null;
+    }
+
+    @Override
+    public List<Property> getProperties() {
+        // The sample BPEL implementation does not support properties
+        return Collections.emptyList();
+    }
+    
+    /* 
+     * Returns the componentType for this BPEL process implementation 
+     */
+    public ComponentType getComponentType() {
+        return componentType;
+    }
+
+    /*
+     * Sets the componentType for this BPEL process implementation
+     */
+    public void setComponentType(ComponentType componentType) {
+        this.componentType = componentType;
+    }
+    
+    @Override
+    /**
+     * Returns a List of the services for this BPEL process implementation
+     */
+    public List<Service> getServices() {
+        return componentType.getServices();
+    }
+
+    @Override
+    /**
+     * Returns a List of the references for this BPEL process implementation
+     */
+    public List<Reference> getReferences() {
+        return componentType.getReferences();
+    }
+    
+    @Override
+    public int hashCode() {
+        return String.valueOf(this.getProcess()).hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == this) {
+            return true;
+        } else if (obj instanceof BPELImplementation) {
+            if (getProcess() != null) {
+                return getProcess().equals(((BPELImplementation)obj).getProcess());
+            } else {
+                return ((BPELImplementation)obj).getProcess() == null;
+            }
+        } else {
+            return false;
+        }
+    }
+}
diff --git a/branches/sca-java-1.3.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationProcessor.java b/branches/sca-java-1.3.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationProcessor.java
new file mode 100644
index 0000000000..e047ae3cc7
--- /dev/null
+++ b/branches/sca-java-1.3.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationProcessor.java
@@ -0,0 +1,538 @@
+/*
+ * 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.implementation.bpel.impl;
+
+import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.wsdl.PortType;
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+
+import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.assembly.ComponentType;
+import org.apache.tuscany.sca.assembly.Multiplicity;
+import org.apache.tuscany.sca.assembly.Property;
+import org.apache.tuscany.sca.assembly.Reference;
+import org.apache.tuscany.sca.assembly.Service;
+import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
+import org.apache.tuscany.sca.assembly.xml.Constants;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.contribution.service.ContributionReadException;
+import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
+import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
+import org.apache.tuscany.sca.databinding.xml.DOMDataBinding;
+import org.apache.tuscany.sca.implementation.bpel.BPELFactory;
+import org.apache.tuscany.sca.implementation.bpel.BPELImplementation;
+import org.apache.tuscany.sca.implementation.bpel.BPELProcessDefinition;
+import org.apache.tuscany.sca.implementation.bpel.DefaultBPELFactory;
+import org.apache.tuscany.sca.implementation.bpel.xml.BPELPartnerLinkElement;
+import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory;
+import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface;
+import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract;
+import org.apache.tuscany.sca.monitor.Monitor;
+import org.apache.tuscany.sca.monitor.Problem;
+import org.apache.tuscany.sca.monitor.Problem.Severity;
+
+/**
+ * Implements a StAX artifact processor for BPEL implementations.
+ * 
+ * The artifact processor is responsible for processing <implementation.bpel>
+ * elements in SCA assembly XML composite files and populating the BPEL
+ * implementation model, resolving its references to other artifacts in the SCA
+ * contribution, and optionally write the model back to SCA assembly XML.
+ * 
+ *  @version $Rev$ $Date$
+ */
+public class BPELImplementationProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<BPELImplementation> {
+	private static final String PROCESS = "process";
+	private static final String IMPLEMENTATION_BPEL = "implementation.bpel";
+	private static final QName IMPLEMENTATION_BPEL_QNAME = new QName(Constants.SCA10_NS, IMPLEMENTATION_BPEL);
+    
+    private AssemblyFactory assemblyFactory;
+    private BPELFactory bpelFactory;
+    private WSDLFactory wsdlFactory;
+    private Monitor monitor;
+    
+    public BPELImplementationProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
+        this.assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
+        this.wsdlFactory = modelFactories.getFactory(WSDLFactory.class);
+        this.bpelFactory = new DefaultBPELFactory(modelFactories);
+        this.monitor = monitor;
+    }
+
+    /**
+     * Report a error.
+     * 
+     * @param problems
+     * @param message
+     * @param model
+     */
+    private void error(String message, Object model, Object... messageParameters) {
+    	 if (monitor != null) {
+	        Problem problem = new ProblemImpl(this.getClass().getName(), "impl-bpel-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
+	        monitor.problem(problem);
+    	 }
+    }
+     
+    public QName getArtifactType() {
+        // Returns the QName of the XML element processed by this processor
+        return IMPLEMENTATION_BPEL_QNAME;
+    }
+
+    public Class<BPELImplementation> getModelType() {
+        // Returns the type of model processed by this processor
+        return BPELImplementation.class;
+    }
+
+    public BPELImplementation read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
+        assert IMPLEMENTATION_BPEL_QNAME.equals(reader.getName());
+        
+        // Read an <implementation.bpel> element
+        BPELImplementation implementation = null;
+        
+        // Read the process attribute. 
+        QName process = getAttributeValueNS(reader, PROCESS);
+        if (process == null) {
+        	return implementation;
+        }
+
+        // Create and initialize the BPEL implementation model
+        implementation = bpelFactory.createBPELImplementation();
+        implementation.setProcess(process);
+        implementation.setUnresolved(true);
+        
+        // Skip to end element
+        while (reader.hasNext()) {
+            if (reader.next() == END_ELEMENT && IMPLEMENTATION_BPEL_QNAME.equals(reader.getName())) {
+                break;
+            }
+        }
+        
+        return implementation;
+    }
+
+    public void resolve(BPELImplementation impl, ModelResolver resolver) throws ContributionResolveException {
+        
+    	if( impl != null && impl.isUnresolved()) 
+    	{
+            BPELProcessDefinition processDefinition = resolveBPELProcessDefinition(impl, resolver);
+            if(processDefinition.isUnresolved()) {
+            	error("BPELProcessNotFound", impl, processDefinition.getName());
+                //throw new ContributionResolveException("Can't find BPEL Process : " + processDefinition.getName());
+            } else {            
+                impl.setProcessDefinition(processDefinition);
+            
+                // Get the component type from the process definition
+                generateComponentType( impl );
+            
+                //resolve component type
+                mergeComponentType(resolver, impl);
+                        
+                //set current implementation resolved 
+                impl.setUnresolved(false);
+            }
+        }
+        
+    } // end resolve
+
+    /*
+     * Write out the XML representation of the BPEL implementation
+     * <implementation.bpel process="..." />
+     * 
+     * One complexity here is that the value of the process attribute is a QName
+     * In this implementation, the QName is written out in XML Namespaces recommendation format,
+     * as described in the documentation of the getAttributeValueNS method:
+     * 
+     * ie:  {http://example.com/somenamespace}SomeName
+     * 
+     * This may well NOT be the format in which the attribute was originally read from the
+     * composite file.
+     */
+    public void write( BPELImplementation bpelImplementation, 
+    		           XMLStreamWriter writer ) throws ContributionWriteException, XMLStreamException {
+        //FIXME Deal with policy processing...
+        // Write <implementation.bpel process="..."/>
+        // policyProcessor.writePolicyPrefixes(bpelImplementation, writer);
+        writer.writeStartElement(Constants.SCA10_NS, IMPLEMENTATION_BPEL);
+        // policyProcessor.writePolicyAttributes(bpelImplementation, writer);
+        
+        if (bpelImplementation.getProcess() != null) {
+            writer.writeAttribute(PROCESS, bpelImplementation.getProcess().toString() );
+        }
+
+        writer.writeEndElement();
+
+    } // end write
+
+    private BPELProcessDefinition resolveBPELProcessDefinition(BPELImplementation impl, ModelResolver resolver) throws ContributionResolveException {
+        QName processName = impl.getProcess();
+        BPELProcessDefinition processDefinition = this.bpelFactory.createBPELProcessDefinition();
+        processDefinition.setName(processName);
+        processDefinition.setUnresolved(true);
+        
+        return resolver.resolveModel(BPELProcessDefinition.class, processDefinition);
+    } // end resolveBPELProcessDefinition
+    
+    // Calculates the component type of the supplied implementation and attaches it to the
+    // implementation
+    private void generateComponentType(BPELImplementation impl ) 
+    	throws ContributionResolveException {
+        // Create a ComponentType and mark it unresolved
+        ComponentType componentType = assemblyFactory.createComponentType();
+        componentType.setUnresolved(true);
+        impl.setComponentType(componentType);
+        
+        // Each partner link in the process represents either a service or a reference
+        // - or both, in the sense of involving a callback
+        BPELProcessDefinition theProcess = impl.getProcessDefinition();
+        List<BPELPartnerLinkElement> partnerLinks = theProcess.getPartnerLinks();
+        
+        for( BPELPartnerLinkElement pLink : partnerLinks ) {
+        	// check that the partner link has been designated as service or reference in SCA terms
+        	if ( pLink.isSCATyped() ) {
+        		String SCAName = pLink.getSCAName(); 
+        		if( pLink.querySCAType().equals("reference") ) {
+        			componentType.getReferences().add(
+	        			generateReference( SCAName, 
+	        					           pLink.getMyRolePortType(), 
+	        					           pLink.getPartnerRolePortType(),
+		        					       theProcess.getInterfaces() )
+        			);
+        		} else {
+        			componentType.getServices().add(
+	        			generateService( SCAName, 
+	        					         pLink.getMyRolePortType(), 
+	        					         pLink.getPartnerRolePortType(),
+	        					         theProcess.getInterfaces() ) 
+        			);
+        		} // end if
+        	} // end if
+        } // end for
+        
+    	
+    } // end getComponentType
+    
+    /**
+     * Create an SCA reference for a partnerLink
+     * @param name - name of the reference
+     * @param myRolePT - partner link type of myRole
+     * @param partnerRolePT - partner link type of partnerRole
+     * @param theInterfaces - list of WSDL interfaces associated with the BPEL process
+     * @return
+     */
+    private Reference generateReference( String name, PortType myRolePT, 
+    		PortType partnerRolePT, Collection<WSDLInterface> theInterfaces  ) 
+    		throws ContributionResolveException {
+        Reference reference = assemblyFactory.createReference();
+        WSDLInterfaceContract interfaceContract = wsdlFactory.createWSDLInterfaceContract();
+        reference.setInterfaceContract(interfaceContract);
+        
+        // Establish whether there is just a call interface or a call + callback interface
+        PortType callPT = null;
+        PortType callbackPT = null;
+        if( myRolePT != null ) {
+        	callPT = myRolePT;
+        	// If the 2 port types are not the same one, there is a callback...
+        	if( partnerRolePT != null ) {
+        		if( !myRolePT.getQName().equals(partnerRolePT.getQName()) ){
+        			callbackPT = partnerRolePT;
+        		} // end if
+        	} // end if
+        } else if ( partnerRolePT != null ) {
+        	callPT = partnerRolePT;
+        } // end if
+        // No interfaces mean an error - throw an exception
+        if( callPT == null && callbackPT == null ) {
+        	error("MyRolePartnerRoleNull", theInterfaces);
+        	throw new ContributionResolveException("Error: myRole and partnerRole port types are both null");
+        } // end if 
+        
+        // Set the name of the reference to the supplied name and the multiplicity of the reference
+        // to 1..1 
+        // TODO: support other multiplicities 
+        reference.setName(name);
+        reference.setMultiplicity(Multiplicity.ONE_ONE);
+        
+        if ( callPT != null ) {
+            // Set the call interface and, if present, the callback interface
+            WSDLInterface callInterface = null;
+            for( WSDLInterface anInterface : theInterfaces ) {
+        	    if( anInterface.getPortType().getQName().equals(callPT.getQName())) callInterface = anInterface;
+            } // end for
+            // Throw an exception if no interface is found
+            if( callInterface == null ) {
+        	    error("NoInterfaceForPortType", theInterfaces, callPT.getQName().toString());
+        	    throw new ContributionResolveException("Interface not found for port type " +
+        			    callPT.getQName().toString() );
+            } else
+                reference.getInterfaceContract().setInterface(callInterface);
+        }
+ 
+        // There is a callback if the partner role is not null and if the partner role port type
+        // is not the same as the port type for my role
+        if ( callbackPT != null ) {
+            WSDLInterface callbackInterface = null;
+            for( WSDLInterface anInterface : theInterfaces ) {
+            	if( anInterface.getPortType().getQName().equals(callbackPT.getQName())) callbackInterface = anInterface;
+            } // end for
+            // Throw an exception if no interface is found
+            if( callbackInterface == null ) {
+            	error("NoInterfaceForPortType", theInterfaces, callbackPT.getQName().toString());
+            	throw new ContributionResolveException("Interface not found for port type " +
+            			callbackPT.getQName().toString() );
+            } else 
+                reference.getInterfaceContract().setCallbackInterface(callbackInterface);
+        } // end if
+    	
+    	return reference;
+    } // end generateReference
+    
+    /**
+     * Create an SCA service for a partnerLink
+     * @param name - name of the reference
+     * @param myRolePT - partner link type of myRole
+     * @param partnerRolePT - partner link type of partnerRole
+     * @param theInterfaces - list of WSDL interfaces associated with the BPEL process
+     * @return
+     */
+    private Service generateService( String name, PortType myRolePT, 
+    		PortType partnerRolePT, Collection<WSDLInterface> theInterfaces ) 
+    		throws ContributionResolveException {
+        Service service = assemblyFactory.createService();
+        WSDLInterfaceContract interfaceContract = wsdlFactory.createWSDLInterfaceContract();
+        service.setInterfaceContract(interfaceContract);
+        
+        // Set the name of the service to the supplied name 
+        service.setName(name);
+        
+        // Establish whether there is just a call interface or a call + callback interface
+        PortType callPT = null;
+        PortType callbackPT = null;
+        if( myRolePT != null ) {
+        	callPT = myRolePT;
+        	// If the 2 port types are not the same one, there is a callback...
+        	if( partnerRolePT != null ) {
+        		if( !myRolePT.getQName().equals(partnerRolePT.getQName()) ){
+        			callbackPT = partnerRolePT;
+        		} // end if
+        	} // end if
+        } else if ( partnerRolePT != null ) {
+        	callPT = partnerRolePT;
+        } // end if
+        // No interfaces mean an error - throw an exception
+        if( callPT == null && callbackPT == null ) {
+        	error("MyRolePartnerRoleNull", theInterfaces);
+        	throw new ContributionResolveException("Error: myRole and partnerRole port types are both null");
+        } // end if
+
+        if ( callPT != null ) {
+            // Set the call interface and, if present, the callback interface
+            WSDLInterface callInterface = null;
+            for( WSDLInterface anInterface : theInterfaces ) {
+        	    if( anInterface.getPortType().getQName().equals(callPT.getQName())) callInterface = anInterface;
+            } // end for
+            // Throw an exception if no interface is found
+            if( callInterface == null ) {
+        	    error("NoInterfaceForPortType", theInterfaces, callPT.getQName().toString());
+        	    throw new ContributionResolveException("Interface not found for port type " +
+        			    callPT.getQName().toString() );
+            } else
+                service.getInterfaceContract().setInterface(callInterface);
+        } // end if
+        
+        // There is a callback if the partner role is not null and if the partner role port type
+        // is not the same as the port type for my role
+        if ( callbackPT != null ) {
+            WSDLInterface callbackInterface = null;
+            for( WSDLInterface anInterface : theInterfaces ) {
+            	if( anInterface.getPortType().getQName().equals(callbackPT.getQName())) callbackInterface = anInterface;
+            } // end for
+            // Throw an exception if no interface is found
+            if( callbackInterface == null ) {
+            	error("NoInterfaceForPortType", theInterfaces, callbackPT.getQName().toString());
+            	throw new ContributionResolveException("Interface not found for port type " +
+            			callbackPT.getQName().toString() );
+            } else 
+                service.getInterfaceContract().setCallbackInterface(callbackInterface);
+        } // end if
+    	
+    	return service;
+    } // end generateService
+    
+    /**
+     * Merge the componentType from introspection and from external file
+     * 
+     * Note the setting of the DataBinding for both Services and References to DOM, since this is
+     * the data format expected by the ODE BPEL implementation code.
+     * 
+     * @param resolver
+     * @param impl
+     */
+    private void mergeComponentType(ModelResolver resolver, BPELImplementation impl) {
+    	// Load the component type from a component type file, if any
+        ComponentType componentType = getComponentType(resolver, impl);
+        if (componentType != null && !componentType.isUnresolved()) {
+            
+        	// References...
+            Map<String, Reference> refMap = new HashMap<String, Reference>();
+            for (Reference reference : componentType.getReferences()) {
+            	reference.getInterfaceContract().getInterface().resetDataBinding(DOMDataBinding.NAME);
+                refMap.put(reference.getName(), reference);
+            } // end for
+
+            // For the present, overwrite anything arising from the component type sidefile if
+            // equivalent services are defined in the implementation.
+            // TODO - a more careful merge must be done, using the implementation introspection data
+            // as the master but adding any additional and non-conflicting information from the
+            // sidefile
+            for (Reference ref : impl.getReferences()) {
+            	ref.getInterfaceContract().getInterface().resetDataBinding(DOMDataBinding.NAME);
+                refMap.put(ref.getName(), ref);
+            } // end for 
+
+            impl.getReferences().clear();
+            impl.getReferences().addAll(refMap.values());
+
+            // Services.....
+            Map<String, Service> serviceMap = new HashMap<String, Service>();
+            for (Service service : componentType.getServices()) {
+                service.getInterfaceContract().getInterface().resetDataBinding(DOMDataBinding.NAME);               
+                serviceMap.put(service.getName(), service);
+            } // end for
+            
+            // For the present, overwrite anything arising from the component type sidefile if
+            // equivalent services are defined in the implementation.
+            // TODO - a more careful merge must be done, using the implementation introspection data
+            // as the master but adding any additional and non-conflicting information from the
+            // sidefile
+            for (Service svc : impl.getServices()) {
+                svc.getInterfaceContract().getInterface().resetDataBinding(DOMDataBinding.NAME);
+                serviceMap.put(svc.getName(), svc);    
+            } // end for
+
+            impl.getServices().clear();
+            impl.getServices().addAll(serviceMap.values());
+
+            // Properties
+            Map<String, Property> propMap = new HashMap<String, Property>();
+            for (Property property : componentType.getProperties()) {
+            	propMap.put(property.getName(), property);
+            } // end for
+
+            // A simple overwrite of any equivalent properties from the component type sidefile
+            for (Property prop : impl.getProperties()) {
+                propMap.put(prop.getName(), prop);
+            }
+        }
+    }
+
+
+    /**
+     * Find the componentType side file based on the BPEL implementation artifact
+     * @param resolver
+     * @param impl
+     * @return
+     */
+    private ComponentType getComponentType(ModelResolver resolver, BPELImplementation impl) {
+        String bpelProcessURI = impl.getProcessDefinition().getURI().toString();
+        
+        // Get the component type definition contained in the componentType file, if any
+        String componentTypeURI = bpelProcessURI.replace(".bpel", ".componentType");
+        ComponentType componentType = assemblyFactory.createComponentType();
+        componentType.setUnresolved(true);
+        componentType.setURI(componentTypeURI);
+        componentType = resolver.resolveModel(ComponentType.class, componentType);
+        if (!componentType.isUnresolved()) {
+            return componentType;
+        }
+        return null;
+    } // end getComponentType
+
+    /**
+     * Returns a QName from its string representation in a named attribute of an XML element
+     * supplied in an XMLStreamReader
+     * 
+     * QName attributes of an XML element (such as  BPEL process) is presented in one of
+     * two alternative formats:
+     * 1) In the form of a local name with a prefix, with the prefix referencing a namespace
+     * URI declaration elsewhere in the composite (typically on the composite element)
+     * 
+     * ie:   nms:SomeName
+     *       xmlns:nms="http://example.com/somenamespace"
+     *       
+     * 2) In the XML Namespaces recommendation format (see http://jclark.com/xml/xmlns.htm )
+     * where the namespace URI and the local name are encoded into a single string, with the 
+     * namespace URI enclosed between a pair of braces {...}
+     * 
+     *  ie:  {http://example.com/somenamespace}SomeName
+     */
+    private QName getAttributeValueNS(XMLStreamReader reader, String attribute) {
+        String fullValue = reader.getAttributeValue(null, attribute);
+        if (fullValue == null) {
+        	error("AttributeProcessMissing", reader);
+        	return null;
+        }
+        
+        // Deal with the attribute in the XML Namespaces recommendation format
+        // - trim off any leading/trailing spaces and check that the first character is '{'
+        if( fullValue.trim().charAt(0) == '{' ) {
+        	try {
+        		// Attempt conversion to a QName object
+        		QName theProcess = QName.valueOf( fullValue );
+        		return theProcess;
+        	} catch ( IllegalArgumentException e ) {
+        		// This exception happens if the attribute begins with '{' but doesn't conform
+        		// to the XML Namespaces recommendation format
+        		error("AttributeWithoutNamespace", reader, attribute, fullValue);
+        		return null;
+        		//throw new BPELProcessException("Attribute " + attribute + " with value " + fullValue +
+                //" in your composite should be of the form {namespaceURI}localname");
+        	}
+        } // endif
+        
+        // Deal with the attribute in the local name + prefix format
+        if (fullValue.indexOf(":") < 0) {
+        	error("AttributeWithoutPrefix", reader, attribute, fullValue);
+        	return null;
+            //throw new BPELProcessException("Attribute " + attribute + " with value " + fullValue +
+                    //" in your composite should be prefixed (process=\"prefix:name\").");
+        }
+        String prefix = fullValue.substring(0, fullValue.indexOf(":"));
+        String name = fullValue.substring(fullValue.indexOf(":") + 1);
+        String nsUri = reader.getNamespaceContext().getNamespaceURI(prefix);
+        if (nsUri == null) {
+        	error("AttributeUnrecognizedNamespace", reader, attribute, fullValue);
+        	return null;
+            //throw new BPELProcessException("Attribute " + attribute + " with value " + fullValue +
+                    //" in your composite has an unrecognized namespace prefix.");
+        } 
+        return new QName(nsUri, name, prefix);
+    }
+
+}
diff --git a/branches/sca-java-1.3.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java b/branches/sca-java-1.3.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java
new file mode 100644
index 0000000000..83e70ec959
--- /dev/null
+++ b/branches/sca-java-1.3.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java
@@ -0,0 +1,162 @@
+/*
+ * 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.implementation.bpel.impl;
+
+import java.net.URI;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Collection;
+
+import javax.xml.namespace.QName;
+import javax.wsdl.PortType;
+
+import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface;
+
+import org.apache.tuscany.sca.implementation.bpel.BPELProcessDefinition;
+import org.apache.tuscany.sca.implementation.bpel.xml.BPELImportElement;
+import org.apache.tuscany.sca.implementation.bpel.xml.BPELPartnerLinkElement;
+
+/**
+ * The BPEL process definition implementation.
+ * 
+ * @version $Rev$ $Date$
+ */
+public class BPELProcessDefinitionImpl implements BPELProcessDefinition {
+    private QName   name;
+    private URI     uri;
+    private URL     location;
+    private boolean unresolved;
+    private List<BPELPartnerLinkElement> partnerLinks = new ArrayList<BPELPartnerLinkElement>();
+    private List<BPELImportElement> imports = new ArrayList<BPELImportElement>();
+    private Collection<PortType> thePortTypes = null;
+    private Collection<WSDLInterface> theInterfaces = null;
+    
+    public QName getName() {
+        return name;
+    }
+
+    public void setName(QName name) {
+        this.name = name;
+    }
+
+    public URI getURI() {
+        return uri;
+    }
+    
+    public void setURI(URI uri) {
+        this.uri = uri;
+    }
+    
+    public URL getLocation() {
+        return location;
+    }
+
+    public void setLocation(URL location) {
+        this.location = location; 
+    }
+
+    public boolean isUnresolved() {
+        return unresolved;
+    }
+
+    public void setUnresolved(boolean undefined) {
+        this.unresolved = undefined;
+    }  
+    
+    /**
+     * Return the list of PartnerLinks for this process
+     * @return List<BPELPartnerLinkElement> the list of Partner Links
+     */
+    public List<BPELPartnerLinkElement> getPartnerLinks() {
+    	return partnerLinks;
+    }
+    
+    /**
+     * Return the list of imports for this process
+     * @return List<BPELImportElement> the list of Import elements
+     */
+    public List<BPELImportElement> getImports() {
+    	return imports;
+    }
+    
+    public void setPortTypes( Collection<PortType> thePortTypes ) {
+    	this.thePortTypes = thePortTypes;
+    }
+    
+    public Collection<PortType> getPortTypes() {
+    	return thePortTypes;
+    }
+    
+    /**
+     * Set the associated collection of WSDL interfaces
+     * @param theInterfaces
+     */
+    public void setInterfaces( Collection<WSDLInterface> theInterfaces ) {
+    	this.theInterfaces = theInterfaces;
+    } // end setInterfaces
+    
+    /**
+     * Return the collection of associated WSDL interfaces
+     * @return
+     */
+    public Collection<WSDLInterface> getInterfaces() {
+    	return theInterfaces;
+    } // end getInterfaces
+    
+    public void compile() {
+        /*
+        String bpelFile = reader.getAttributeValue(null, "file");  // FIXME: 
+
+        // Resolving the BPEL file and compiling it
+        URL bpelURL = getClass().getClassLoader().getResource(bpelFile);
+        if (bpelURL == null)
+            throw new ODEProcessException("Couldn't find referenced bpel file " + bpelFile);
+        BpelC bpelc = BpelC.newBpelCompiler();
+        ByteArrayOutputStream compiledProcess = new ByteArrayOutputStream();
+        bpelc.setOutputStream(compiledProcess);
+        try {
+            bpelc.compile(new File(bpelURL.getFile()));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        */
+    }
+
+    @Override
+    public int hashCode() {
+        return String.valueOf(getName()).hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == this) {
+            return true;
+        } else if (obj instanceof BPELProcessDefinition) {
+            if (getName() != null) {
+                return getName().equals(((BPELProcessDefinition)obj).getName());
+            } else {
+                return ((BPELProcessDefinition)obj).getName() == null;
+            }
+        } else {
+            return false;
+        }
+    }
+}
diff --git a/branches/sca-java-1.3.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessException.java b/branches/sca-java-1.3.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessException.java
new file mode 100644
index 0000000000..9b9f62a0be
--- /dev/null
+++ b/branches/sca-java-1.3.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessException.java
@@ -0,0 +1,42 @@
+/*
+ * 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.implementation.bpel.impl;
+
+/**
+ * Thrown when a process can't be compiled properly or when its descriptors
+ * are invalid.
+ * 
+ * @version $Rev$ $Date$ 
+ */
+public class BPELProcessException extends RuntimeException {
+    private static final long serialVersionUID = 1047893235216756186L;
+
+    public BPELProcessException(String message) {
+        super(message);
+    }
+
+    public BPELProcessException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public BPELProcessException(Throwable cause) {
+        super(cause);
+    }
+}
diff --git a/branches/sca-java-1.3.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImportElement.java b/branches/sca-java-1.3.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImportElement.java
new file mode 100644
index 0000000000..75a46f9bc3
--- /dev/null
+++ b/branches/sca-java-1.3.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImportElement.java
@@ -0,0 +1,67 @@
+/*

+ * 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.implementation.bpel.xml;

+

+import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;

+

+/**

+ * Represents an <import.../> element in a BPEL process

+ * - this has attributes:

+ *      location

+ *      importType

+ *      namespace

+ *

+ * @version $Rev$ $Date$

+ */

+public class BPELImportElement {

+	

+	private String location;

+    private String importType;

+    private String namespace;

+    private WSDLDefinition theWSDL = null;

+    

+    public BPELImportElement( String location, 

+    						  String importType,

+    						  String namespace  ) {

+        this.location = location;

+        this.importType = importType;

+        this.namespace = namespace;

+    }

+

+    public String getImportType() {

+        return importType;

+    }

+

+    public String getLocation() {

+        return location;

+    }

+    

+    public String getNamespace() {

+    	return namespace;

+    }

+    

+    public void setWSDLDefinition( WSDLDefinition theDefinition) {

+    	theWSDL = theDefinition;

+    }

+    

+    public WSDLDefinition getWSDLDefinition() {

+    	return theWSDL;

+    }

+    

+} // end class BPELImportElement

diff --git a/branches/sca-java-1.3.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkElement.java b/branches/sca-java-1.3.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkElement.java
new file mode 100644
index 0000000000..62078f8061
--- /dev/null
+++ b/branches/sca-java-1.3.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkElement.java
@@ -0,0 +1,128 @@
+/*

+ * 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.implementation.bpel.xml;

+

+import javax.xml.namespace.QName;

+

+import javax.wsdl.PortType;

+

+/**

+ * Represents a <partnerLink.../> element in a BPEL process

+ * - this has attributes:

+ *      name

+ *      partnerLinkType

+ *      myRole

+ *      partnerRole

+ * - plus zero or more property elements as children

+ * 

+ * The partnerlink may also be given an SCA Type - either of service or of reference - this must

+ * generally be calculated and set on the partnerLink by inspecting the BPEL process

+ *

+ * @version $Rev$ $Date$

+ */

+public class BPELPartnerLinkElement {

+

+    private String 	REFERENCE_TYPE = "reference";

+    private String 	SERVICE_TYPE = "service";

+	private String 	name;

+	private QName	partnerLinkType;

+    private BPELPartnerLinkTypeElement 	pLinkType = null;

+    private String 	myRole;

+    private String 	partnerRole;

+    private String 	scaName;			// Holds the SCA reference or service name

+    private String 	scaType = null; 	// Holds the SCA type = null | service | reference

+    

+    public BPELPartnerLinkElement(String name, 

+    							  QName partnerLinkType,

+    							  String myRole, 

+    							  String partnerRole ) {

+        this.name = name;

+        this.partnerLinkType = partnerLinkType;

+        this.myRole = myRole;

+        this.partnerRole = partnerRole;

+        

+        scaName = null;

+    }

+

+    public QName getPartnerLinkType() {

+        return partnerLinkType;

+    }

+    

+    public void setPartnerLinkType( BPELPartnerLinkTypeElement pLinkType ) {

+    	this.pLinkType = pLinkType;

+    }

+    

+    

+    public PortType getMyRolePortType() {

+    	return getRolePortType( myRole );

+    }

+    

+    public PortType getPartnerRolePortType() {

+    	return getRolePortType( partnerRole );

+    }

+    

+    private PortType getRolePortType( String theRole ) {

+    	if( theRole == null ) return null;

+    	if ( theRole.equals( pLinkType.getRole1Name() ) ) {

+    		return pLinkType.getRole1pType();

+    	} else if ( theRole.equals( pLinkType.getRole2Name() ) ) {

+    		return pLinkType.getRole2pType();

+    	} // end if 

+    	return null;

+    } // end getRolePortType

+

+    public String getName() {

+        return name;

+    }

+    

+    public String getMyRole() {

+    	return myRole;

+    }

+    

+    public String getPartnerRole() {

+    	return partnerRole;

+    }

+    

+    public void setSCAName( String name ) {

+    	scaName = name;

+    }

+    

+    public String getSCAName() {

+    	return scaName;

+    }

+    

+    public boolean isSCATyped() {

+    	return ( !(scaType == null) );

+    }

+    

+    public void setAsReference( String name ) {

+    	scaType = REFERENCE_TYPE;

+    	scaName = name;

+    }

+    

+    public void setAsService( String name ) {

+    	scaType = SERVICE_TYPE;

+    	scaName = name;

+    }

+    

+    public String querySCAType() {

+    	return scaType;

+    }

+

+} // end class BPELPartnerLinkElement

diff --git a/branches/sca-java-1.3.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkTypeElement.java b/branches/sca-java-1.3.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkTypeElement.java
new file mode 100644
index 0000000000..e013215f5e
--- /dev/null
+++ b/branches/sca-java-1.3.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkTypeElement.java
@@ -0,0 +1,113 @@
+/*

+ * 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.implementation.bpel.xml;

+

+ import javax.xml.namespace.QName; 

+ 

+ import javax.wsdl.extensions.ExtensibilityElement;

+ import javax.wsdl.PortType;

+ 

+/**

+ * Represents a <partnerLinkType.../> element related to a BPEL process

+ * - this has attributes:

+ *      name

+ *      Role1 name

+ *      Role1 portType

+ *      Role2 name

+ *         Role2 portType

+ *

+ * - in the XML the 2 roles are child elements of the partnerLinkType element, but there

+ * seems little point in reflecting this back into this model - it is simpler to include

+ * both roles within the representation of the partnerLinkType itself

+ *

+ * @version $Rev$ $Date$

+ */

+public class BPELPartnerLinkTypeElement implements ExtensibilityElement {

+	

+	private QName name;

+	private String Role1name = null;

+	private QName  Role1porttype = null;

+	private PortType	Role1pType = null;

+	private String Role2name = null;

+	private QName  Role2porttype = null;

+	private PortType	Role2pType = null;

+

+	

+	private QName  elementType = null;

+	private Boolean required = false;

+	

+	public BPELPartnerLinkTypeElement( QName name ) {

+		this.name = name;

+	}

+	

+	public QName getName(){

+		return name;

+	}

+	

+	public void setRole1( String name, QName portType, PortType pType ) {

+		Role1name = name;

+		Role1porttype = portType;

+		Role1pType = pType;

+	}

+	

+	public void setRole2( String name, QName portType, PortType pType ) {

+		Role2name = name;

+		Role2porttype = portType;

+		Role2pType = pType;

+	}

+	

+	public String getRole1Name() {

+		return Role1name;

+	}

+	public String getRole2Name() {

+		return Role2name;

+	}

+	

+	public QName getRole1PortType() {

+		return Role1porttype;

+	}

+	

+	public QName getRole2PortType() {

+		return Role2porttype;

+	}

+	

+	public PortType getRole1pType() {

+		return Role1pType;

+	}

+	

+	public PortType getRole2pType() {

+		return Role2pType;

+	}

+	

+	public QName getElementType() {

+		return elementType;

+	}

+	

+    public Boolean getRequired() {

+    	return required;

+    }

+    

+    public void setElementType(QName elementType) {

+    	this.elementType = elementType;

+    }

+    

+    public void setRequired(java.lang.Boolean required) {

+    	this.required = required;

+    }

+    

+} // end BPELPartnerLinkType