Moving 1.x branches

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

14 files changed, 0 insertions, 1208 deletions

diff --git a/branches/sca-java-20080910/itest/exceptions-cross-binding/pom.xml b/branches/sca-java-20080910/itest/exceptions-cross-binding/pom.xml
deleted file mode 100644
index 3d4a4a3880..0000000000
--- a/branches/sca-java-20080910/itest/exceptions-cross-binding/pom.xml
+++ /dev/null
@@ -1,234 +0,0 @@
-<?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.    
--->
-<project>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>itest-exceptions-cross-binding</artifactId>
-    <name>Apache Tuscany SCA Cross-Binding Exceptions Integration Tests</name>
-
-    <repositories>
-        <repository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </repository>
-    </repositories>
-    
-    <dependencies>
-        <dependency>
-            <groupId>com.sun.xml.ws</groupId>
-            <artifactId>jaxws-rt</artifactId>
-            <version>2.1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.jws</groupId>
-            <artifactId>jsr181-api</artifactId>
-            <version>1.0-MR1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.1</version>
-        </dependency>
-
-       <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-databinding</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    
-    <pluginRepositories>
-        <pluginRepository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </pluginRepository>
-    </pluginRepositories>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                      <id>copy</id>
-                      <phase>generate-sources</phase>
-                      <goals>
-                          <goal>copy</goal>
-                      </goals>
-                      <configuration>
-                         <artifactItems>
-                             <artifactItem>
-                                 <groupId>javax.xml.ws</groupId>
-                                 <artifactId>jaxws-api</artifactId>
-                                 <version>2.1</version>
-                                 <type>jar</type>
-                             </artifactItem>
-                             <artifactItem>
-                                 <groupId>javax.xml.bind</groupId>
-                                 <artifactId>jaxb-api</artifactId>
-                                 <version>2.1</version>
-                                 <type>jar</type>
-                             </artifactItem>
-                         </artifactItems>
-                         <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
-                         <overWriteReleases>false</overWriteReleases>
-                         <overWriteSnapshots>true</overWriteSnapshots>
-                      </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <argLine>-Djava.endorsed.dirs=target/endorsed</argLine>
-                </configuration>
-            </plugin>
-            <!-- JAX-WS Generation -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.9</version>
-                <executions>
-                    <execution>
-                        <id>generate-jaxb</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>wsimport</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <wsdlDirectory>${basedir}/src/main/resources/wsdl</wsdlDirectory>
-                    <verbose>false</verbose>
-                    <xnocompile>true</xnocompile>
-                    <packageName>org.apache.tuscany.sca.test.exceptions.impl.jaxb</packageName>
-                    <keep>true</keep>
-                </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>javax.jws</groupId>
-                        <artifactId>jsr181-api</artifactId>
-                        <version>1.0-MR1</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <!-- SDO Generation -->
-            <plugin>
-                <groupId>org.apache.tuscany.sdo</groupId>
-                <artifactId>tuscany-sdo-plugin</artifactId>
-                <version>1.1.1</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <schemaFile>${basedir}/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl</schemaFile>
-                            <noNotification>true</noNotification>
-                            <noContainer>true</noContainer>
-                            <noUnsettable>true</noUnsettable>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-wsdl2java</artifactId>
-                <version>1.4-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <wsdlFile>${basedir}/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl</wsdlFile>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/branches/sca-java-20080910/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java b/branches/sca-java-20080910/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
deleted file mode 100644
index f5e36db7cd..0000000000
--- a/branches/sca-java-20080910/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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.osoa.sca.annotations.Remotable;
-
-/**
- * 
- */
-@Remotable
-public interface StockExceptionTestJAXB extends StockExceptionTest {
-
-}
diff --git a/branches/sca-java-20080910/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java b/branches/sca-java-20080910/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
deleted file mode 100644
index 65751175fb..0000000000
--- a/branches/sca-java-20080910/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * 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.osoa.sca.annotations.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/branches/sca-java-20080910/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java b/branches/sca-java-20080910/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
deleted file mode 100644
index 5f65d293ea..0000000000
--- a/branches/sca-java-20080910/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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/branches/sca-java-20080910/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java b/branches/sca-java-20080910/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
deleted file mode 100644
index e84ae633e7..0000000000
--- a/branches/sca-java-20080910/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * 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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/branches/sca-java-20080910/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java b/branches/sca-java-20080910/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
deleted file mode 100644
index 74815dc6c1..0000000000
--- a/branches/sca-java-20080910/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * 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/branches/sca-java-20080910/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java b/branches/sca-java-20080910/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
deleted file mode 100644
index 5fe40935ec..0000000000
--- a/branches/sca-java-20080910/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * 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/branches/sca-java-20080910/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java b/branches/sca-java-20080910/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
deleted file mode 100644
index ab65efbb58..0000000000
--- a/branches/sca-java-20080910/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.osoa.sca.annotations.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/branches/sca-java-20080910/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite b/branches/sca-java-20080910/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
deleted file mode 100644
index 872fd721d1..0000000000
--- a/branches/sca-java-20080910/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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/branches/sca-java-20080910/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite b/branches/sca-java-20080910/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
deleted file mode 100644
index 83526cb6a1..0000000000
--- a/branches/sca-java-20080910/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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/branches/sca-java-20080910/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl b/branches/sca-java-20080910/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
deleted file mode 100644
index d70cdad313..0000000000
--- a/branches/sca-java-20080910/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
+++ /dev/null
@@ -1,141 +0,0 @@
-<?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/branches/sca-java-20080910/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl b/branches/sca-java-20080910/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl
deleted file mode 100644
index 33b830c856..0000000000
--- a/branches/sca-java-20080910/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl
+++ /dev/null
@@ -1,148 +0,0 @@
-<?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/branches/sca-java-20080910/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd b/branches/sca-java-20080910/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd
deleted file mode 100644
index 9759647cfe..0000000000
--- a/branches/sca-java-20080910/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd
+++ /dev/null
@@ -1,65 +0,0 @@
-<?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/branches/sca-java-20080910/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java b/branches/sca-java-20080910/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
deleted file mode 100644
index 3371f63e4a..0000000000
--- a/branches/sca-java-20080910/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * 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.osoa.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();
-        }
-    }
-}