Moving 2.x contribs

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

13 files changed, 974 insertions, 0 deletions

diff --git a/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
new file mode 100644
index 0000000000..456cf07116
--- /dev/null
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
@@ -0,0 +1,31 @@
+/*
+ * 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.test.exceptions.impl;
+
+import org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockExceptionTest;
+import org.oasisopen.sca.annotation.Remotable;
+
+/**
+ * 
+ */
+@Remotable
+public interface StockExceptionTestJAXB extends StockExceptionTest {
+
+}
diff --git a/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
new file mode 100644
index 0000000000..ed2a287bcc
--- /dev/null
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
@@ -0,0 +1,76 @@
+/*
+ * 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.test.exceptions.impl;
+
+import org.apache.tuscany.sca.test.exceptions.impl.jaxb.InvalidSymbolFault;
+import org.apache.tuscany.sca.test.exceptions.impl.jaxb.InvalidSymbolFault_Exception;
+import org.apache.tuscany.sca.test.exceptions.impl.jaxb.MarketClosedFault;
+import org.apache.tuscany.sca.test.exceptions.impl.jaxb.ObjectFactory;
+import org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockOffer;
+import org.apache.tuscany.sca.test.exceptions.impl.jaxb.TestNotDeclaredAtSourceFault;
+import org.oasisopen.sca.annotation.Service;
+
+/**
+ * 
+ */
+@Service(StockExceptionTestJAXB.class)
+public class StockExchangeJaxB implements StockExceptionTestJAXB {
+
+    /**
+     * 
+     */
+    public StockExchangeJaxB() {
+
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockExceptionTest#stockQuoteOffer(org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockOffer)
+     */
+    public StockOffer stockQuoteOffer(StockOffer input) throws InvalidSymbolFault_Exception, MarketClosedFault, TestNotDeclaredAtSourceFault{
+
+        System.out.println("stockQuoteOffer '" + input + "'");
+
+        String symbol = input.getSymbol();
+        if ("IBM".equals(symbol)) {
+            input.setPrice(99.00F);
+            return input;
+
+        }
+        else if ("CLOSED".equals(input.getName())) {
+            throw new MarketClosedFault("TO LATE!", 3);
+            
+        } else if( "testNotDeclaredAtSourceTest".equals(input.getName())){
+            
+            throw new TestNotDeclaredAtSourceFault("not declared", "fault info");
+            
+        }
+        ObjectFactory jaxbOjectFactory = new ObjectFactory();
+
+        InvalidSymbolFault faultinfo = jaxbOjectFactory.createInvalidSymbolFault();
+        
+        faultinfo.setOffer(input);
+
+        throw new InvalidSymbolFault_Exception("bad symbol", faultinfo);
+
+    }
+
+}
diff --git a/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
new file mode 100644
index 0000000000..5f65d293ea
--- /dev/null
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
@@ -0,0 +1,37 @@
+/*
+ * 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.test.exceptions.impl;
+
+import java.rmi.RemoteException;
+
+import org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException;
+import org.apache.tuscany.sca.test.exceptions.sdohandgen.MarketClosedSDOException;
+
+import stockexceptiontestservice.scatesttool.StockOffer;
+
+public interface StockTraderSDO {
+
+    StockOffer testTrading() throws RemoteException, InvalidSymbolSDOException, MarketClosedSDOException;
+
+    void testInvalidSymbolSDOException() throws RemoteException, InvalidSymbolSDOException, MarketClosedSDOException;
+
+    Object testNotDeclaredAtSourceTest();
+
+}
diff --git a/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
new file mode 100644
index 0000000000..32ba65bd6b
--- /dev/null
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
@@ -0,0 +1,119 @@
+/*
+ * 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.test.exceptions.impl;
+
+import java.rmi.RemoteException;
+
+import org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException;
+import org.apache.tuscany.sca.test.exceptions.sdohandgen.MarketClosedSDOException;
+import org.apache.tuscany.sca.test.exceptions.sdohandgen.StockExceptionTest;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
+
+import stockexceptiontestservice.scatesttool.ScatesttoolFactory;
+import stockexceptiontestservice.scatesttool.StockOffer;
+
+/**
+ * 
+ */
+@Service(StockTraderSDO.class)
+public class StockTraderSDOImpl implements StockTraderSDO {
+
+    private StockExceptionTest exchangeJaxb;
+
+    /**
+     * 
+     */
+
+    public StockTraderSDOImpl() {
+        // TODO Auto-generated constructor stub
+    }
+
+    @Reference
+    public void setExchangeJaxb(StockExceptionTest exchangeJaxb) {
+        this.exchangeJaxb = exchangeJaxb;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDO#tradingTest()
+     */
+    public StockOffer testTrading() throws RemoteException, InvalidSymbolSDOException, MarketClosedSDOException {
+        StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
+        stockOffer.setName("IBM");
+        stockOffer.setSymbol("IBM");
+        stockOffer.setPrice(100.00F); // offer to buy at max $100.00
+
+        StockOffer stockOfferAccepted = exchangeJaxb.stockQuoteOffer(stockOffer);
+
+        return stockOfferAccepted;
+
+    }
+
+    public void testInvalidSymbolSDOException() throws RemoteException, InvalidSymbolSDOException,
+        MarketClosedSDOException {
+        StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
+        // set up for a InvalidSymbolSDOException
+        stockOffer.setName("");
+        stockOffer.setSymbol("IBM0");
+
+        stockOffer.setPrice(11.0F); // offer to buy at max $100.00
+        exchangeJaxb.stockQuoteOffer(stockOffer);
+
+    }
+
+    public void marketClosedSDOExceptionTest() {
+        StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
+
+        // set up for a MarketClosedSDOException
+        stockOffer.setName("CLOSED");
+        stockOffer.setSymbol("MBI");
+        stockOffer.setPrice(Float.NaN); // offer to buy at max $100.00
+        try {
+            StockOffer stockOfferAccepted = exchangeJaxb.stockQuoteOffer(stockOffer);
+            stockOfferAccepted.getPrice(); // the price actually bought.
+        } catch (InvalidSymbolSDOException e) {
+
+            e.printStackTrace();
+        } catch (MarketClosedSDOException e) {
+
+            e.printStackTrace();
+        }
+    }
+
+    public Object  testNotDeclaredAtSourceTest() {
+        StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
+
+        // set up for a MarketClosedSDOException
+        stockOffer.setName("testNotDeclaredAtSourceTest");
+        stockOffer.setSymbol("TNDAS");
+        stockOffer.setPrice(Float.NaN); // offer to buy at max $100.00
+        try {
+            return  exchangeJaxb.stockQuoteOffer(stockOffer);
+            
+        } catch (Exception e) {
+            return e;
+           
+        }
+
+    }
+
+}
diff --git a/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
new file mode 100644
index 0000000000..74815dc6c1
--- /dev/null
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
@@ -0,0 +1,84 @@
+/*
+ * 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.test.exceptions.sdohandgen;
+
+import javax.xml.ws.WebFault;
+
+import stockexceptiontestservice.scatesttool.InvalidSymbolFault;
+
+/**
+ * 
+ */
+@WebFault(name="InvalidSymbolFault", targetNamespace="http://scatesttool.stockexceptiontestservice")
+public class InvalidSymbolSDOException extends Exception {
+    private static final long serialVersionUID = -3824848763300476741L;
+    
+    /**
+     * 
+     */
+    public InvalidSymbolSDOException() {
+       
+    }
+
+    /**
+     * @param message
+     * @param faultInfo
+     */
+    public InvalidSymbolSDOException(String message, InvalidSymbolFault faultInfo) {
+        super(message);
+        this.faultInfo = faultInfo;
+
+    }
+
+    /**
+     * @param cause
+     */
+    public InvalidSymbolSDOException(InvalidSymbolFault faultInfo, Throwable cause) {
+        super(cause);
+        this.faultInfo = faultInfo;
+
+    }
+
+    /**
+     * @param message
+     * @param cause
+     */
+    public InvalidSymbolSDOException(String message, InvalidSymbolFault faultInfo, Throwable cause) {
+        super(message, cause);
+        this.faultInfo = faultInfo;
+
+    }
+
+    // *** Below was hand added ... tooling needs to do this ***/
+
+    /**
+     * Java type that goes as soapenv:Fault detail element.
+     */
+    private InvalidSymbolFault faultInfo;
+
+    /**
+     * @return returns fault bean:
+     *         org.apache.tuscany.sca.test.exceptions.impl.jaxb.InvalidSymbolFault
+     */
+    public InvalidSymbolFault getFaultInfo() {
+        return faultInfo;
+    }
+
+}
diff --git a/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
new file mode 100644
index 0000000000..5fe40935ec
--- /dev/null
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
@@ -0,0 +1,75 @@
+/*
+ * 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.test.exceptions.sdohandgen;
+
+import javax.xml.ws.WebFault;
+
+/**
+ * 
+ */
+@WebFault(name="MarketClosedFault", targetNamespace="http://scatesttool.stockexceptiontestservice")
+public class MarketClosedSDOException extends Exception {
+    private static final long serialVersionUID = 7652466275656958031L;
+
+    /**
+     * Java type that goes as soapenv:Fault detail element.
+     */
+    private int faultInfo;
+
+    /**
+     * 
+     */
+    public MarketClosedSDOException() {
+
+    }
+
+    /**
+     * @param message
+     */
+    public MarketClosedSDOException(String message, int faultInfo) {
+        super(message);
+        this.faultInfo = faultInfo;
+    }
+
+    /**
+     * @param cause
+     */
+    public MarketClosedSDOException(int faultInfo, Throwable cause) {
+        super(cause);
+        this.faultInfo = faultInfo;
+    }
+
+    /**
+     * @param message
+     * @param cause
+     */
+    public MarketClosedSDOException(String message, int faultInfo, Throwable cause) {
+        super(message, cause);
+        this.faultInfo = faultInfo;
+    }
+
+    /**
+     * @return returns fault bean: int
+     */
+    public int getFaultInfo() {
+        return faultInfo;
+    }
+
+}
diff --git a/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
new file mode 100644
index 0000000000..4ee01fa303
--- /dev/null
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
@@ -0,0 +1,45 @@
+/*
+ * 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.    
+ */
+/**
+ * StockExceptionTest.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: #axisVersion# #today#
+ */
+package org.apache.tuscany.sca.test.exceptions.sdohandgen;
+
+import org.oasisopen.sca.annotation.Remotable;
+
+import stockexceptiontestservice.scatesttool.StockOffer;
+
+/*
+ * StockExceptionTest java interface
+ */
+
+@Remotable
+public interface StockExceptionTest {
+
+    /**
+     * Auto generated method signatures
+     * 
+     * @param param0
+     */
+    StockOffer stockQuoteOffer(StockOffer param0) throws InvalidSymbolSDOException, MarketClosedSDOException;
+
+}
diff --git a/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
new file mode 100644
index 0000000000..872fd721d1
--- /dev/null
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * 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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:foo="http://foo" targetNamespace="http://foo"
+    name="ExceptionTest">
+
+    <include name="foo:intracomposite" />
+
+</composite>
diff --git a/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
new file mode 100644
index 0000000000..83526cb6a1
--- /dev/null
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * 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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://foo" xmlns:foo="http://foo"
+    xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0" name="intracomposite">
+
+    <component name="stockTraderSDOComponent">
+        <implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDOImpl" />
+        <reference name="exchangeJaxb" target="exchangeJaxbComponent"></reference>
+    </component>
+
+    <component name="exchangeJaxbComponent">
+        <implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.StockExchangeJaxB" />
+    </component>
+
+    <!-- Move to the end to verify the fix for TUSCANY-1165 -->
+    <!-- dbsdo:import.sdo factory="stockexceptiontestservice.scatesttool.ScatesttoolFactory" / -->
+
+</composite>
diff --git a/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
new file mode 100644
index 0000000000..d70cdad313
--- /dev/null
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!-- 

+ * 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.    

+ -->

+<wsdl:definitions targetNamespace="http://scatesttool.stockexceptiontestservice" xmlns:impl="http://scatesttool.stockexceptiontestservice"

+    xmlns:tns="http://scatesttool.stockexceptiontestservice" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"

+    xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsi="http://ws-i.org/profiles/basic/1.1/xsd"

+    xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="StockExceptionTest">

+    <wsdl:types>

+        <schema targetNamespace="http://scatesttool.stockexceptiontestservice" xmlns="http://www.w3.org/2001/XMLSchema"

+            xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

+            <complexType name="StockOffer">

+                    <sequence>

+                        <element name="symbol" minOccurs="1" type="xsd:string" />

+                        <element name="price" minOccurs="1" type="xsd:float" nillable="true" /> <!-- max price reqested, actual response -->

+                        <element name="name" minOccurs="0" type="xsd:string" />

+                    </sequence>

+            </complexType>

+            

+            <element name="stockQuoteOffer">

+                <complexType>

+                    <sequence>

+                        <element name="input" minOccurs="0" type="tns:StockOffer" />

+                    </sequence>

+                </complexType>

+            </element>

+            <element name="stockQuoteOfferResponse">

+                <complexType>

+                    <sequence>

+                        <element name="stockQuoteOfferReturn" minOccurs="0" type="tns:StockOffer" />

+                    </sequence>

+                </complexType>

+            </element>

+            

+            <!-- Faults -->

+            <element name="InvalidSymbolFault">

+                <complexType>

+                    <sequence>

+                        <element name="message"  minOccurs="1" type="xsd:string" />

+                        <element name="offer" minOccurs="1" type="tns:StockOffer" />

+                    </sequence>

+                </complexType>

+            </element>

+            

+            <element name="MarketClosedFault">

+                <complexType>

+                    <sequence>

+                        <element name="message"  minOccurs="1" type="xsd:string" />

+                    </sequence>

+                </complexType>

+            </element>

+            

+        </schema>

+    </wsdl:types>

+

+

+    <wsdl:message name="stockQuoteOfferRequest">

+        <wsdl:part element="tns:stockQuoteOffer" name="parameters" />

+    </wsdl:message>

+

+    <wsdl:message name="stockQuoteOfferResponse">

+        <wsdl:part element="tns:stockQuoteOfferResponse" name="parameters" />

+    </wsdl:message>

+

+    <wsdl:message name="InvalidSymbolFault">

+        <wsdl:part element="tns:InvalidSymbolFault" name="fault" />

+    </wsdl:message>

+

+    <wsdl:message name="MarketClosedFault">

+        <wsdl:part element="tns:MarketClosedFault" name="fault" />

+    </wsdl:message>

+

+

+    <wsdl:portType name="StockExceptionTest">

+        <wsdl:operation name="stockQuoteOffer">

+            <wsdl:input message="tns:stockQuoteOfferRequest" name="stockQuoteOfferRequest" />

+

+            <wsdl:output message="tns:stockQuoteOfferResponse" name="stockQuoteOfferResponse" />

+<!--            

+            <wsdl:fault message="tns:InvalidSymbolFault" name="InvalidSymbolException" />

+             

+            <wsdl:fault message="tns:MarketClosedFault" name="MarketClosedException" />           

+-->

+        </wsdl:operation>

+

+ 

+    </wsdl:portType>

+

+    <wsdl:binding name="StockExceptionTestServiceSoapBinding" type="tns:StockExceptionTest">

+        <!-- <wsaw:UsingAddressing wsdl:required="false" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"/> -->

+

+        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />

+

+        <wsdl:operation name="stockQuoteOffer">

+            <wsdlsoap:operation soapAction="" />

+

+            <wsdl:input name="stockQuoteOfferRequest">

+                <wsdlsoap:body use="literal" />

+            </wsdl:input>

+

+            <wsdl:output name="stockQuoteOfferResponse">

+                <wsdlsoap:body use="literal" />

+            </wsdl:output>

+<!--            

+            <wsdl:fault name="InvalidSymbolException"> 

+            	<wsdlsoap:fault name="InvalidSymbolException" use="literal" />

+            </wsdl:fault>

+            

+            <wsdl:fault name="MarketClosedException"> 

+            	<wsdlsoap:fault name="MarketClosedException" use="literal" />

+            </wsdl:fault>

+-->

+        </wsdl:operation>

+

+

+    </wsdl:binding>

+

+    <wsdl:service name="StockExceptionTestService">

+        <wsdl:port binding="tns:StockExceptionTestServiceSoapBinding" name="StockExceptionTestServiceSoapPort">

+            <wsdlsoap:address location="http://localhost:8085/StockExceptionTestService/services/StockExceptionTestService" />

+

+        </wsdl:port>

+

+    </wsdl:service>

+

+</wsdl:definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl
new file mode 100644
index 0000000000..33b830c856
--- /dev/null
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!-- 

+ * 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.    

+ -->

+<wsdl:definitions targetNamespace="http://scatesttool.stockexceptiontestservice" xmlns:impl="http://scatesttool.stockexceptiontestservice"

+    xmlns:tns="http://scatesttool.stockexceptiontestservice" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"

+    xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsi="http://ws-i.org/profiles/basic/1.1/xsd"

+    xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="StockExceptionTest">

+    <wsdl:types>

+        <schema targetNamespace="http://scatesttool.stockexceptiontestservice" xmlns="http://www.w3.org/2001/XMLSchema"

+            xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

+            <complexType name="StockOffer">

+                    <sequence>

+                        <element name="symbol" minOccurs="1" type="xsd:string" />

+                        <element name="price" minOccurs="1" type="xsd:float" nillable="true" /> <!-- max price reqested, actual response -->

+                        <element name="name" minOccurs="0" type="xsd:string" />

+                    </sequence>

+            </complexType>

+            

+            <element name="stockQuoteOffer">

+                <complexType>

+                    <sequence>

+                        <element name="input" minOccurs="0" type="tns:StockOffer" />

+                    </sequence>

+                </complexType>

+            </element>

+            <element name="stockQuoteOfferResponse">

+                <complexType>

+                    <sequence>

+                        <element name="stockQuoteOfferReturn" minOccurs="0" type="tns:StockOffer" />

+                    </sequence>

+                </complexType>

+            </element>

+            

+            <!-- Faults -->

+            <element name="InvalidSymbolFault">

+                <complexType>

+                    <sequence>

+                        <element name="message"  minOccurs="1" type="xsd:string" />

+                        <element name="offer" minOccurs="1" type="tns:StockOffer" />

+                    </sequence>

+                </complexType>

+            </element>

+            

+            <element name="MarketClosedFault"   type="xsd:int" />

+			

+			<element name="TestNotDeclaredAtSourceFault" type="xsd:string" />

+     

+        </schema>

+    </wsdl:types>

+

+

+    <wsdl:message name="stockQuoteOfferRequest">

+        <wsdl:part element="tns:stockQuoteOffer" name="parameters" />

+    </wsdl:message>

+

+    <wsdl:message name="stockQuoteOfferResponse">

+        <wsdl:part element="tns:stockQuoteOfferResponse" name="parameters" />

+    </wsdl:message>

+

+    <wsdl:message name="InvalidSymbolFault">

+        <wsdl:part element="tns:InvalidSymbolFault" name="fault" />

+    </wsdl:message>

+

+    <wsdl:message name="MarketClosedFault">

+        <wsdl:part element="tns:MarketClosedFault" name="fault" />

+    </wsdl:message>

+

+   <wsdl:message name="TestNotDeclaredAtSourceFault">

+        <wsdl:part element="tns:TestNotDeclaredAtSourceFault" name="fault" />

+    </wsdl:message>

+

+

+    <wsdl:portType name="StockExceptionTest">

+        <wsdl:operation name="stockQuoteOffer">

+            <wsdl:input message="tns:stockQuoteOfferRequest" name="stockQuoteOfferRequest" />

+

+            <wsdl:output message="tns:stockQuoteOfferResponse" name="stockQuoteOfferResponse" />

+            

+            <wsdl:fault message="tns:InvalidSymbolFault" name="InvalidSymbolException" />

+             

+            <wsdl:fault message="tns:MarketClosedFault" name="MarketClosedException" />

+            

+            <wsdl:fault message="tns:TestNotDeclaredAtSourceFault" name="TestNotDeclaredAtSourceException" />

+        </wsdl:operation>

+

+ 

+    </wsdl:portType>

+

+    <wsdl:binding name="StockExceptionTestServiceSoapBinding" type="tns:StockExceptionTest">

+        <!-- <wsaw:UsingAddressing wsdl:required="false" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"/> -->

+

+        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />

+

+        <wsdl:operation name="stockQuoteOffer">

+            <wsdlsoap:operation soapAction="" />

+

+            <wsdl:input name="stockQuoteOfferRequest">

+                <wsdlsoap:body use="literal" />

+            </wsdl:input>

+

+            <wsdl:output name="stockQuoteOfferResponse">

+                <wsdlsoap:body use="literal" />

+            </wsdl:output>

+            

+            <wsdl:fault name="InvalidSymbolException"> 

+            	<wsdlsoap:fault name="InvalidSymbolException" use="literal" />

+            </wsdl:fault>

+            

+            <wsdl:fault name="MarketClosedException"> 

+            	<wsdlsoap:fault name="MarketClosedException" use="literal" />

+            </wsdl:fault>

+            

+            <wsdl:fault name="TestNotDeclaredAtSourceException"> 

+            	<wsdlsoap:fault name="TestNotDeclaredAtSourceException" use="literal" />

+            </wsdl:fault>

+

+

+

+        </wsdl:operation>

+

+

+    </wsdl:binding>

+

+    <wsdl:service name="StockExceptionTestService">

+        <wsdl:port binding="tns:StockExceptionTestServiceSoapBinding" name="StockExceptionTestServiceSoapPort">

+            <wsdlsoap:address location="http://localhost:8085/StockExceptionTestService/services/StockExceptionTestService" />

+

+        </wsdl:port>

+

+    </wsdl:service>

+

+</wsdl:definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd
new file mode 100644
index 0000000000..9759647cfe
--- /dev/null
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ * 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.    
+ -->
+        <schema targetNamespace="http://scatesttool.stockexceptiontestservice" xmlns="http://www.w3.org/2001/XMLSchema"
+            xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:tns="http://scatesttool.stockexceptiontestservice"
+            >
+            <complexType name="StockOffer">
+                    <sequence>
+                        <element name="symbol" minOccurs="1" type="xsd:string" />
+                        <element name="price" minOccurs="1" type="xsd:float" nillable="true" /> <!-- max price reqested, actual response -->
+                        <element name="name" minOccurs="0" type="xsd:string" />
+                    </sequence>
+            </complexType>
+            
+            <element name="stockQuoteOffer">
+                <complexType>
+                    <sequence>
+                        <element name="input" minOccurs="0" type="tns:StockOffer" />
+                    </sequence>
+                </complexType>
+            </element>
+            <element name="stockQuoteOfferResponse">
+                <complexType>
+                    <sequence>
+                        <element name="stockQuoteOfferReturn" minOccurs="0" type="tns:StockOffer" />
+                    </sequence>
+                </complexType>
+            </element>
+            
+            <!-- Faults -->
+            <element name="InvalidSymbolFault">
+                <complexType>
+                    <sequence>
+                        <element name="message"  minOccurs="1" type="xsd:string" />
+                        <element name="offer" minOccurs="1" type="tns:StockOffer" />
+                    </sequence>
+                </complexType>
+            </element>
+            
+            <element name="MarketClosedFault">
+                <complexType>
+                    <sequence>
+                        <element name="message"  minOccurs="1" type="xsd:string" />
+                    </sequence>
+                </complexType>
+            </element>
+            
+        </schema>
\ No newline at end of file
diff --git a/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
new file mode 100644
index 0000000000..e65a1d4b64
--- /dev/null
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
@@ -0,0 +1,93 @@
+/*
+ * 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.test.exceptions;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDO;
+import org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException;
+import org.oasisopen.sca.ServiceRuntimeException;
+
+import stockexceptiontestservice.scatesttool.InvalidSymbolFault;
+import stockexceptiontestservice.scatesttool.StockOffer;
+
+public class IntraCompositeTestCase extends TestCase {
+    private SCADomain domain;
+
+    private StockTraderSDO stockTrader;
+
+    public void testTrading() {
+        try {
+            StockOffer sp = stockTrader.testTrading();
+            assertNotNull(sp);
+            assertEquals(99.00F, sp.getPrice());
+            assertEquals("IBM", sp.getSymbol());
+        } catch (Exception e) {
+
+            e.printStackTrace();
+            fail(e + "");
+
+        }
+
+    }
+
+    public void testInvalidSymbolSDOException() {
+        try {
+            stockTrader.testInvalidSymbolSDOException();
+            fail("Expected InvalidSymbolSDOException");
+        } catch (InvalidSymbolSDOException e) {
+            InvalidSymbolFault isf = e.getFaultInfo();
+
+            assertNotNull(isf);
+            StockOffer sp = isf.getOffer();
+            assertEquals(11.00F, sp.getPrice());
+            assertEquals("IBM0", sp.getSymbol());
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            fail("Expected InvalidSymbolSDOException" + e);
+
+        }
+    }
+
+    public void testNotDeclaredAtSourceException() {
+
+        Object ret = stockTrader.testNotDeclaredAtSourceTest();
+
+        assertNotNull(ret);
+
+        assertEquals(ServiceRuntimeException.class, ret.getClass());
+
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        domain = SCADomain.newInstance("ExceptionTest.composite");
+        stockTrader = domain.getService(StockTraderSDO.class, "stockTraderSDOComponent");
+        assertNotNull(stockTrader);
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        if (domain != null) {
+            domain.close();
+        }
+    }
+}