Moving 1.x branches

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

18 files changed, 0 insertions, 1056 deletions

diff --git a/branches/sca-java-integration/samples/sca/echo-databinding/.ruleset b/branches/sca-java-integration/samples/sca/echo-databinding/.ruleset
deleted file mode 100644
index 42a6f1be38..0000000000
--- a/branches/sca-java-integration/samples/sca/echo-databinding/.ruleset
+++ /dev/null
@@ -1,190 +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.

--->

-<ruleset name="pmd-eclipse">

-  <description>PMD Plugin preferences rule set</description>

-  

-  

-  <rule ref="rulesets/basic.xml/BooleanInstantiation"/>

-  <rule ref="rulesets/basic.xml/CollapsibleIfStatements"/>

-  <rule ref="rulesets/basic.xml/DoubleCheckedLocking"/>

-<!--<rule ref="rulesets/basic.xml/EmptyCatchBlock"/>-->

-<!--<rule ref="rulesets/basic.xml/EmptyFinallyBlock"/>-->

-<!--<rule ref="rulesets/basic.xml/EmptyIfStmt"/>-->

-  <rule ref="rulesets/basic.xml/EmptyStatementNotInLoop"/>

-<!--<rule ref="rulesets/basic.xml/EmptyStaticInitializer"/>-->

-<!--<rule ref="rulesets/basic.xml/EmptySwitchStatements"/>-->

-<!--<rule ref="rulesets/basic.xml/EmptySynchronizedBlock"/>-->

-<!--<rule ref="rulesets/basic.xml/EmptyTryBlock"/>-->

-<!--<rule ref="rulesets/basic.xml/EmptyWhileStmt"/>-->

-  <rule ref="rulesets/basic.xml/ForLoopShouldBeWhileLoop"/>

-  <rule ref="rulesets/basic.xml/JumbledIncrementer"/>

-<!--<rule ref="rulesets/basic.xml/OverrideBothEqualsAndHashcode"/>-->

-  <rule ref="rulesets/basic.xml/ReturnFromFinallyBlock"/>

-  <rule ref="rulesets/basic.xml/UnconditionalIfStatement"/>

-  <rule ref="rulesets/basic.xml/UnnecessaryConversionTemporary"/>

-  <rule ref="rulesets/basic.xml/UnnecessaryFinalModifier"/>

-  <rule ref="rulesets/basic.xml/UnnecessaryReturn"/>

-<!--<rule ref="rulesets/basic.xml/UselessOverridingMethod"/>-->

-  

-<!--<rule ref="rulesets/braces.xml/ForLoopsMustUseBraces"/>-->

-<!--<rule ref="rulesets/braces.xml/IfElseStmtsMustUseBraces"/>-->

-<!--<rule ref="rulesets/braces.xml/IfStmtsMustUseBraces"/>-->

-<!--<rule ref="rulesets/braces.xml/WhileLoopsMustUseBraces"/>-->

-

-<!--<rule ref="rulesets/clone.xml/CloneMethodMustImplementCloneable"/>-->

-<!--<rule ref="rulesets/clone.xml/CloneThrowsCloneNotSupportedException"/>-->

-<!--<rule ref="rulesets/clone.xml/ProperCloneImplementation"/>-->

-  

-<!--<rule ref="rulesets/codesize.xml/CyclomaticComplexity"/>-->

-<!--<rule ref="rulesets/codesize.xml/ExcessiveClassLength"/>-->

-<!--<rule ref="rulesets/codesize.xml/ExcessiveMethodLength"/>-->

-<!--<rule ref="rulesets/codesize.xml/ExcessiveParameterList"/>-->

-<!--<rule ref="rulesets/codesize.xml/ExcessivePublicCount"/>-->

-<!--<rule ref="rulesets/codesize.xml/TooManyFields"/>-->

-

-<!--<rule ref="rulesets/controversial.xml/AssignmentInOperand"/>-->

-<!--<rule ref="rulesets/controversial.xml/AtLeastOneConstructor"/>-->

-<!--<rule ref="rulesets/controversial.xml/CallSuperInConstructor"/>-->

-<!--<rule ref="rulesets/controversial.xml/DontImportSun"/>-->

-<!--<rule ref="rulesets/controversial.xml/NullAssignment"/>-->

-<!--<rule ref="rulesets/controversial.xml/OnlyOneReturn"/>-->

-<!--<rule ref="rulesets/controversial.xml/SingularField"/>-->

-<!--<rule ref="rulesets/controversial.xml/SuspiciousOctalEscape"/>-->

-<!--<rule ref="rulesets/controversial.xml/UnnecessaryConstructor"/>-->

-<rule ref="rulesets/controversial.xml/UnnecessaryParentheses"/>

-<!--<rule ref="rulesets/controversial.xml/UnusedModifier"/>-->

-

-<!--<rule ref="rulesets/coupling.xml/CouplingBetweenObjects"/>-->

-<!--<rule ref="rulesets/coupling.xml/ExcessiveImports"/>-->

-<!--<rule ref="rulesets/coupling.xml/LooseCoupling"/>-->

-

-<!--<rule ref="rulesets/design.xml/AbstractClassWithoutAbstractMethod"/>-->

-<!--<rule ref="rulesets/design.xml/AccessorClassGeneration"/>-->

-<!--<rule ref="rulesets/design.xml/AssignmentToNonFinalStatic"/>-->

-<!--<rule ref="rulesets/design.xml/AvoidDeeplyNestedIfStmts"/>-->

-<!--<rule ref="rulesets/design.xml/AvoidInstanceofChecksInCatchClause"/>-->

-<rule ref="rulesets/design.xml/AvoidProtectedFieldInFinalClass"/>

-<!--<rule ref="rulesets/design.xml/AvoidReassigningParameters"/>-->

-<!--<rule ref="rulesets/design.xml/AvoidSynchronizedAtMethodLevel"/>-->

-<!--<rule ref="rulesets/design.xml/BadComparison"/>-->

-<!--<rule ref="rulesets/design.xml/CloseConnection"/>-->

-<!--<rule ref="rulesets/design.xml/CompareObjectsWithEquals"/>-->

-<!--<rule ref="rulesets/design.xml/ConfusingTernary"/>-->

-<rule ref="rulesets/design.xml/ConstructorCallsOverridableMethod"/>

-<!--<rule ref="rulesets/design.xml/DefaultLabelNotLastInSwitchStmt"/>-->

-<!--<rule ref="rulesets/design.xml/FinalFieldCouldBeStatic"/>-->

-<rule ref="rulesets/design.xml/IdempotentOperations"/>

-<!--<rule ref="rulesets/design.xml/ImmutableField"/>-->

-<!--<rule ref="rulesets/design.xml/InstantiationToGetClass"/>-->

-<!--<rule ref="rulesets/design.xml/MissingBreakInSwitch"/>-->

-<!--<rule ref="rulesets/design.xml/MissingStaticMethodInNonInstantiatableClass"/>-->

-<!--<rule ref="rulesets/design.xml/NonCaseLabelInSwitchStatement"/>-->

-<!--<rule ref="rulesets/design.xml/NonStaticInitializer"/>-->

-<rule ref="rulesets/design.xml/OptimizableToArrayCall"/>

-<rule ref="rulesets/design.xml/PositionLiteralsFirstInComparisons"/>

-<rule ref="rulesets/design.xml/SimplifyBooleanExpressions"/>

-<rule ref="rulesets/design.xml/SimplifyBooleanReturns"/>

-<rule ref="rulesets/design.xml/SimplifyConditional"/>

-<!--<rule ref="rulesets/design.xml/SwitchDensity"/>-->

-<!--<rule ref="rulesets/design.xml/SwitchStmtsShouldHaveDefault"/>-->

-<rule ref="rulesets/design.xml/UnnecessaryLocalBeforeReturn"/>

-<!--<rule ref="rulesets/design.xml/UseLocaleWithCaseConversions"/>-->

-<!--<rule ref="rulesets/design.xml/UseNotifyAllInsteadOfNotify"/>-->

-<!--<rule ref="rulesets/design.xml/UseSingleton"/>-->

-

-<!--<rule ref="rulesets/finalizers.xml/EmptyFinalizer"/>-->

-<!--<rule ref="rulesets/finalizers.xml/FinalizeOnlyCallsSuperFinalize"/>-->

-<!--<rule ref="rulesets/finalizers.xml/FinalizeOverloaded"/>-->

-<!--<rule ref="rulesets/finalizers.xml/FinalizeDoesNotCallSuperFinalize"/>-->

-<!--<rule ref="rulesets/finalizers.xml/FinalizeShouldBeProtected"/>-->

-<!--<rule ref="rulesets/finalizers.xml/AvoidCallingFinalize"/>-->

-

-<!--<rule ref="rulesets/imports.xml/DuplicateImports"/>-->

-<!--<rule ref="rulesets/imports.xml/DontImportJavaLang"/>-->

-<!--<rule ref="rulesets/imports.xml/UnusedImports"/>-->

-<!--<rule ref="rulesets/imports.xml/ImportFromSamePackage"/>-->

-

-<!--<rule ref="rulesets/javabeans.xml/BeanMembersShouldSerialize"/>-->

-<!--<rule ref="rulesets/javabeans.xml/MissingSerialVersionUID"/>-->

-

-<!--<rule ref="rulesets/junit.xml/JUnitStaticSuite"/>-->

-<!--<rule ref="rulesets/junit.xml/JUnitSpelling"/>-->

-<!--<rule ref="rulesets/junit.xml/JUnitAssertionsShouldIncludeMessage"/>-->

-<!--<rule ref="rulesets/junit.xml/JUnitTestsShouldIncludeAssert"/>-->

-<!--<rule ref="rulesets/junit.xml/TestClassWithoutTestCases"/>-->

-<!--<rule ref="rulesets/junit.xml/UnnecessaryBooleanAssertion"/>-->

-<!--<rule ref="rulesets/junit.xml/UseAssertEqualsInsteadOfAssertTrue"/>-->

-<!--<rule ref="rulesets/junit.xml/UseAssertSameInsteadOfAssertTrue"/>-->

-

-  <!--<rule ref="rulesets/logging-java.xml/AvoidPrintStackTrace"/>-->

-  <!--<rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"/>-->

-  <!--<rule ref="rulesets/logging-java.xml/MoreThanOneLogger"/>-->

-  <!--<rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"/>-->

-  <!--<rule ref="rulesets/logging-java.xml/LogBlockWithoutIf"/>-->

-  <!--<rule ref="rulesets/logging-java.xml/SystemPrintln"/>-->

-  <!--<rule ref="rulesets/logging-jakarta-commons.xml/UseCorrectExceptionLogging"/>-->

-  <!--<rule ref="rulesets/logging-jakarta-commons.xml/ProperLogger"/>-->

-  

-  <!--<rule ref="rulesets/naming.xml/ShortVariable"/>-->

-  <!--<rule ref="rulesets/naming.xml/LongVariable"/>-->

-  <!--<rule ref="rulesets/naming.xml/ShortMethodName"/>-->

-  <!--<rule ref="rulesets/naming.xml/VariableNamingConventions"/>-->

-  <!--<rule ref="rulesets/naming.xml/MethodNamingConventions"/>-->

-  <!--<rule ref="rulesets/naming.xml/ClassNamingConventions"/>-->

-  <!--<rule ref="rulesets/naming.xml/AbstractNaming"/>-->

-  <!--<rule ref="rulesets/naming.xml/AvoidDollarSigns"/>-->

-  <!--<rule ref="rulesets/naming.xml/MethodWithSameNameAsEnclosingClass"/>-->

-  <!--<rule ref="rulesets/naming.xml/SuspiciousHashcodeMethodName"/>-->

-  <!--<rule ref="rulesets/naming.xml/SuspiciousConstantFieldName"/>-->

-  <!--<rule ref="rulesets/naming.xml/AvoidFieldNameMatchingTypeName"/>-->

-  <!--<rule ref="rulesets/naming.xml/AvoidFieldNameMatchingMethodName"/>-->

-  <!--<rule ref="rulesets/naming.xml/AvoidNonConstructorMethodsWithClassName"/>-->

-  <!--<rule ref="rulesets/naming.xml/NoPackage"/>-->

-  <!--<rule ref="rulesets/naming.xml/PackageCase"/>-->

-

-  <!--<rule ref="rulesets/optimizations.xml/LocalVariableCouldBeFinal"/>-->

-  <!--<rule ref="rulesets/optimizations.xml/MethodArgumentCouldBeFinal"/>-->

-  <!--<rule ref="rulesets/optimizations.xml/AvoidInstantiatingObjectsInLoops"/>-->

-  <!--<rule ref="rulesets/optimizations.xml/UseArrayListInsteadOfVector"/>-->

-  <!--<rule ref="rulesets/optimizations.xml/SimplifyStartsWith"/>-->

-  <!--<rule ref="rulesets/optimizations.xml/UseStringBufferForStringAppends"/>-->

-

-  <!--<rule ref="rulesets/strictexception.xml/AvoidCatchingThrowable"/>-->

-  <!--<rule ref="rulesets/strictexception.xml/SignatureDeclareThrowsException"/>-->

-  <!--<rule ref="rulesets/strictexception.xml/ExceptionAsFlowControl"/>-->

-  <!--<rule ref="rulesets/strictexception.xml/AvoidCatchingNPE"/>-->

-  <!--<rule ref="rulesets/strictexception.xml/AvoidThrowingRawExceptionTypes"/>-->

-  <!--<rule ref="rulesets/strictexception.xml/AvoidThrowingNullPointerException"/>-->

- 

-  <!--<rule ref="rulesets/strings.xml/AvoidDuplicateLiterals"/>-->

-  <!--<rule ref="rulesets/strings.xml/StringInstantiation"/>-->

-  <!--<rule ref="rulesets/strings.xml/StringToString"/>-->

-  <!--<rule ref="rulesets/strings.xml/AvoidConcatenatingNonLiteralsInStringBuffer"/>-->

-  <!--<rule ref="rulesets/strings.xml/UnnecessaryCaseChange"/>-->

-  

-  <!--<rule ref="rulesets/sunsecure.xml/MethodReturnsInternalArray"/>-->

-  <!--<rule ref="rulesets/sunsecure.xml/ArrayIsStoredDirectly"/>-->

-  

-  <rule ref="rulesets/unusedcode.xml/UnusedLocalVariable"/>

-  <rule ref="rulesets/unusedcode.xml/UnusedPrivateField"/>

-  <rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod"/>

-  <!--<rule ref="rulesets/unusedcode.xml/UnusedFormalParameter"/>-->

-  

-</ruleset>

diff --git a/branches/sca-java-integration/samples/sca/echo-databinding/NOTICE.txt b/branches/sca-java-integration/samples/sca/echo-databinding/NOTICE.txt
deleted file mode 100644
index d83ebbe236..0000000000
--- a/branches/sca-java-integration/samples/sca/echo-databinding/NOTICE.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2006 The Apache Software Foundation
-
-Apache Tuscany is an effort undergoing incubation at The Apache Software
-Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is
-required of all newly accepted projects until a further review indicates that
-the infrastructure, communications, and decision making process have stabilized
-in a manner consistent with other successful ASF projects. While incubation
-status is not necessarily a reflection of the completeness or stability of the
-code, it does indicate that the project has yet to be fully endorsed by the ASF.
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/branches/sca-java-integration/samples/sca/echo-databinding/pom.xml b/branches/sca-java-integration/samples/sca/echo-databinding/pom.xml
deleted file mode 100644
index 9303a7d1b0..0000000000
--- a/branches/sca-java-integration/samples/sca/echo-databinding/pom.xml
+++ /dev/null
@@ -1,104 +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.samples.sca</groupId>
-        <artifactId>parent</artifactId>
-        <version>0.1-integration-incubating-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>tuscany-sample-echo-databinding</artifactId>
-    <name>Apache Tuscany Echo DataBinding Sample</name>
-    <description>A DataBinding Sample</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca.kernel</groupId>
-            <artifactId>tuscany-api</artifactId>
-            <version>0.1-integration-incubating-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca.kernel</groupId>
-            <artifactId>tuscany-spi</artifactId>
-            <version>0.1-integration-incubating-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca.kernel</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>0.1-integration-incubating-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca.extensions.axis2</groupId>
-            <artifactId>databinding-axiom</artifactId>
-            <version>0.1-integration-incubating-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca.services.idl</groupId>
-            <artifactId>tuscany-wsdl</artifactId>
-            <version>0.1-integration-incubating-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-api</artifactId>
-            <version>SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-impl</artifactId>
-            <version>SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-            <version>3.2.0</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.1</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/branches/sca-java-integration/samples/sca/echo-databinding/src/main/java/echo/EchoBinding.java b/branches/sca-java-integration/samples/sca/echo-databinding/src/main/java/echo/EchoBinding.java
deleted file mode 100644
index da44906cf6..0000000000
--- a/branches/sca-java-integration/samples/sca/echo-databinding/src/main/java/echo/EchoBinding.java
+++ /dev/null
@@ -1,32 +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 echo;
-
-import org.apache.tuscany.spi.model.BindingDefinition;
-
-/**
- * @version $Rev$ $Date$
- */
-public class EchoBinding extends BindingDefinition {
-
-    public Object clone() {
-        return this;
-    }
-
-}
diff --git a/branches/sca-java-integration/samples/sca/echo-databinding/src/main/java/echo/EchoBindingLoader.java b/branches/sca-java-integration/samples/sca/echo-databinding/src/main/java/echo/EchoBindingLoader.java
deleted file mode 100644
index b77dcca3b9..0000000000
--- a/branches/sca-java-integration/samples/sca/echo-databinding/src/main/java/echo/EchoBindingLoader.java
+++ /dev/null
@@ -1,58 +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 echo;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import static org.osoa.sca.Constants.SCA_NS;
-import org.osoa.sca.annotations.Constructor;
-
-import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.deployer.DeploymentContext;
-import org.apache.tuscany.spi.extension.LoaderExtension;
-import org.apache.tuscany.spi.loader.LoaderException;
-import org.apache.tuscany.spi.loader.LoaderRegistry;
-import org.apache.tuscany.spi.model.ModelObject;
-
-/**
- * @version $Rev$ $Date$
- */
-public class EchoBindingLoader extends LoaderExtension<EchoBinding> {
-
-    public static final QName BINDING_ECHO = new QName(SCA_NS, "binding.echo");
-
-    @Constructor
-    public EchoBindingLoader(@Autowire LoaderRegistry registry) {
-        super(registry);
-    }
-
-    public QName getXMLType() {
-        return BINDING_ECHO;
-    }
-
-    public EchoBinding load(CompositeComponent parent,
-                            ModelObject object,
-                            XMLStreamReader reader,
-                            DeploymentContext context) throws XMLStreamException, LoaderException {
-        return new EchoBinding();
-    }
-}
diff --git a/branches/sca-java-integration/samples/sca/echo-databinding/src/main/java/echo/EchoBuilder.java b/branches/sca-java-integration/samples/sca/echo-databinding/src/main/java/echo/EchoBuilder.java
deleted file mode 100644
index 7cf1b35617..0000000000
--- a/branches/sca-java-integration/samples/sca/echo-databinding/src/main/java/echo/EchoBuilder.java
+++ /dev/null
@@ -1,52 +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 echo;
-
-import org.apache.tuscany.spi.builder.BuilderException;
-import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.ReferenceBinding;
-import org.apache.tuscany.spi.component.ServiceBinding;
-import org.apache.tuscany.spi.deployer.DeploymentContext;
-import org.apache.tuscany.spi.extension.BindingBuilderExtension;
-import org.apache.tuscany.spi.model.AbstractReferenceDefinition;
-import org.apache.tuscany.spi.model.ServiceDefinition;
-
-/**
- * @version $Rev$ $Date$
- */
-public class EchoBuilder extends BindingBuilderExtension<EchoBinding> {
-
-    public ServiceBinding build(CompositeComponent parent,
-                                ServiceDefinition boundServiceDefinition,
-                                EchoBinding bindingDefinition,
-                                DeploymentContext deploymentContext) throws BuilderException {
-        return new EchoService(boundServiceDefinition.getName(), parent);
-    }
-
-    public ReferenceBinding build(CompositeComponent parent,
-                                  AbstractReferenceDefinition boundReferenceDefinition,
-                                  EchoBinding bindingDefinition,
-                                  DeploymentContext deploymentContext) throws BuilderException {
-        return new EchoReference(boundReferenceDefinition.getName(), parent);
-    }
-
-    protected Class<EchoBinding> getBindingType() {
-        return EchoBinding.class;
-    }
-}
diff --git a/branches/sca-java-integration/samples/sca/echo-databinding/src/main/java/echo/EchoInvoker.java b/branches/sca-java-integration/samples/sca/echo-databinding/src/main/java/echo/EchoInvoker.java
deleted file mode 100644
index 972dae843f..0000000000
--- a/branches/sca-java-integration/samples/sca/echo-databinding/src/main/java/echo/EchoInvoker.java
+++ /dev/null
@@ -1,68 +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 echo;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.apache.tuscany.spi.wire.InvocationRuntimeException;
-import org.apache.tuscany.spi.wire.Message;
-import org.apache.tuscany.spi.wire.TargetInvoker;
-
-/**
- * @version $Rev$ $Date$
- */
-public class EchoInvoker implements TargetInvoker {
-
-    private boolean cacheable;
-
-    public boolean isCacheable() {
-        return cacheable;
-    }
-
-    public void setCacheable(boolean cacheable) {
-        this.cacheable = cacheable;
-    }
-
-    public boolean isOptimizable() {
-        return isCacheable();
-    }
-
-    public Object invokeTarget(final Object payload, final short sequence) throws InvocationTargetException {
-        // echo back the result, a real binding would invoke some API for flowing the request
-        Object result = ((Object[]) payload)[0];
-        System.out.println("Echo: " + result);
-        return result;
-    }
-
-    public Message invoke(Message msg) throws InvocationRuntimeException {
-        try {
-            Object resp = invokeTarget(msg.getBody(), NONE);
-            msg.setBody(resp);
-        } catch (InvocationTargetException e) {
-            msg.setBodyWithFault(e.getCause());
-        } catch (Throwable e) {
-            msg.setBodyWithFault(e);
-        }
-        return msg;
-    }
-
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-}
diff --git a/branches/sca-java-integration/samples/sca/echo-databinding/src/main/java/echo/EchoReference.java b/branches/sca-java-integration/samples/sca/echo-databinding/src/main/java/echo/EchoReference.java
deleted file mode 100644
index 9eaf0914cc..0000000000
--- a/branches/sca-java-integration/samples/sca/echo-databinding/src/main/java/echo/EchoReference.java
+++ /dev/null
@@ -1,55 +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 echo;
-
-import static org.osoa.sca.Constants.SCA_NS;
-
-import javax.xml.namespace.QName;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.extension.ReferenceBindingExtension;
-import org.apache.tuscany.spi.model.Operation;
-import org.apache.tuscany.spi.model.ServiceContract;
-import org.apache.tuscany.spi.wire.TargetInvoker;
-
-/**
- * @version $Rev$ $Date$
- */
-public class EchoReference extends ReferenceBindingExtension {
-
-    private static final String OM_DATA_BINDING = OMElement.class.getName();
-
-    private static final QName BINDING_ECHO = new QName(SCA_NS, "binding.echo");
-
-    public EchoReference(String name, CompositeComponent parent) {
-        super(name, parent);
-    }
-
-    public QName getBindingType() {
-        return BINDING_ECHO;
-    }
-
-    @SuppressWarnings("unchecked")
-    public TargetInvoker createTargetInvoker(ServiceContract contract, Operation operation) {
-        // HACK to set the databinding
-        operation.setDataBinding(OM_DATA_BINDING);
-        return new EchoInvoker();
-    }
-}
diff --git a/branches/sca-java-integration/samples/sca/echo-databinding/src/main/java/echo/EchoService.java b/branches/sca-java-integration/samples/sca/echo-databinding/src/main/java/echo/EchoService.java
deleted file mode 100644
index 85ed497799..0000000000
--- a/branches/sca-java-integration/samples/sca/echo-databinding/src/main/java/echo/EchoService.java
+++ /dev/null
@@ -1,44 +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 echo;
-
-import static org.osoa.sca.Constants.SCA_NS;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.spi.CoreRuntimeException;
-import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.extension.ServiceBindingExtension;
-
-/**
- * @version $Rev$ $Date$
- */
-public class EchoService extends ServiceBindingExtension {
-    private static final QName BINDING_ECHO = new QName(SCA_NS, "binding.echo");
-
-    public EchoService(String name, CompositeComponent parent) throws CoreRuntimeException {
-        super(name, parent);
-        // do nothing, but this could register with the host environment
-    }
-
-
-    public QName getBindingType() {
-        return BINDING_ECHO;
-    }
-}
diff --git a/branches/sca-java-integration/samples/sca/echo-databinding/src/main/resources/META-INF/sca/extension.composite b/branches/sca-java-integration/samples/sca/echo-databinding/src/main/resources/META-INF/sca/extension.composite
deleted file mode 100644
index 34a5bac134..0000000000
--- a/branches/sca-java-integration/samples/sca/echo-databinding/src/main/resources/META-INF/sca/extension.composite
+++ /dev/null
@@ -1,31 +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:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"

-    name="binding.echo">

-

-    <component name="BindingLoader">

-        <system:implementation.system class="echo.EchoBindingLoader" />

-    </component>

-

-    <component name="BindingBuilder">

-        <system:implementation.system class="echo.EchoBuilder" />

-    </component>

-

-</composite>

diff --git a/branches/sca-java-integration/samples/sca/echo-databinding/src/test/java/echo/ComponentAImpl.java b/branches/sca-java-integration/samples/sca/echo-databinding/src/test/java/echo/ComponentAImpl.java
deleted file mode 100644
index 84466f90d0..0000000000
--- a/branches/sca-java-integration/samples/sca/echo-databinding/src/test/java/echo/ComponentAImpl.java
+++ /dev/null
@@ -1,94 +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 echo;
-
-import org.apache.axiom.om.OMElement;
-import org.osoa.sca.annotations.Constructor;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ComponentAImpl implements Interface1 {
-
-    private Interface1 componentBReference;
-    
-    private String prefix;
-    
-    private String prefix1;
-    
-    private String bar;
-    
-    private OMElement omProperty;
-
-    @Constructor
-    public ComponentAImpl(@Reference(name = "componentBReference", required = true)
-    Interface1 componentBReference) {
-        this.componentBReference = componentBReference;
-    }
-
-    public Object call(Object msg) {
-        String request = msg + " [" + msg.getClass().getName() + "]";
-        System.out.println("ComponentA --> Received message: " + request);
-        Object ret = componentBReference.call(msg);
-        String response = ret + " [" + ret.getClass().getName() + "]";
-        System.out.println("ComponentA --> Returned message: " + response);
-        return ret;
-    }
-
-    public Object call1(Object msg) {
-        String request = msg + " [" + msg.getClass().getName() + "]";
-        System.out.println("ComponentA --> Received message: " + request);
-        Object ret = componentBReference.call1(msg);
-        String response = ret + " [" + ret.getClass().getName() + "]";
-        System.out.println("ComponentA --> Returned message: " + response);
-        return ret;
-    }
-
-    @Property(name="prefix")
-    public void setPrefix(String prefix) {
-        System.out.println("[Property] prefix: " + prefix);
-        this.prefix = prefix;
-    }
-
-    @Property(name="prefix1")
-    public void setPrefix1(String prefix1) {
-        System.out.println("[Property] prefix1: " + prefix1);
-        this.prefix1 = prefix1;
-    }  
-    
-    /**
-     * @param bar the bar to set
-     */
-    @Property(name="bar")
-    public void setBar(String bar) {
-        System.out.println("[Property] bar: " + bar);
-        this.bar = bar;
-    }
-
-    /**
-     * @param omProperty the omProperty to set
-     */
-    @Property(name="omProperty")
-    public void setOmProperty(OMElement omProperty) {
-        this.omProperty = omProperty;
-    }
-
-}
diff --git a/branches/sca-java-integration/samples/sca/echo-databinding/src/test/java/echo/ComponentBImpl.java b/branches/sca-java-integration/samples/sca/echo-databinding/src/test/java/echo/ComponentBImpl.java
deleted file mode 100644
index f8783d39e9..0000000000
--- a/branches/sca-java-integration/samples/sca/echo-databinding/src/test/java/echo/ComponentBImpl.java
+++ /dev/null
@@ -1,59 +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 echo;
-
-import javax.xml.stream.XMLStreamReader;
-
-import org.osoa.sca.annotations.AllowsPassByReference;
-import org.osoa.sca.annotations.Constructor;
-import org.osoa.sca.annotations.Reference;
-import org.w3c.dom.Node;
-
-/**
- * @version $Rev$ $Date$
- */
-@AllowsPassByReference
-public class ComponentBImpl implements Interface2 {
-
-    private Echo echoReference;
-
-    @Constructor
-    public ComponentBImpl(@Reference(name = "echoReference", required = true)
-    Echo echoReference) {
-        this.echoReference = echoReference;
-    }
-
-    public Node call(Node msg) {
-        String request = msg + " [" + msg.getClass().getName() + "]";
-        System.out.println("ComponentB --> Received message: " + request);
-        Node ret = (Node) echoReference.echo(msg);
-        String response = ret + " [" + ret.getClass().getName() + "]";
-        System.out.println("ComponentB --> Returned message: " + response);
-        return ret;
-    }
-    
-    public XMLStreamReader call1(XMLStreamReader msg) {
-        String request = msg + " [" + msg.getClass().getName() + "]";
-        System.out.println("ComponentB --> Received message: " + request);
-//        XMLStreamReader ret = (XMLStreamReader) echoReference.echo(msg);
-        String response = request;
-        System.out.println("ComponentB --> Returned message: " + response);
-        return msg;
-    }    
-}
diff --git a/branches/sca-java-integration/samples/sca/echo-databinding/src/test/java/echo/Echo.java b/branches/sca-java-integration/samples/sca/echo-databinding/src/test/java/echo/Echo.java
deleted file mode 100644
index f6d10d55c7..0000000000
--- a/branches/sca-java-integration/samples/sca/echo-databinding/src/test/java/echo/Echo.java
+++ /dev/null
@@ -1,32 +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 echo;
-
-import org.apache.tuscany.api.annotation.DataType;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-// @DataType(name="org.apache.axiom.om.OMElement")
-@DataType(name="org.w3c.dom.Node")
-@Remotable
-public interface Echo {
-    Object echo(Object msg);
-}
diff --git a/branches/sca-java-integration/samples/sca/echo-databinding/src/test/java/echo/EchoDataBindingTestCase.java b/branches/sca-java-integration/samples/sca/echo-databinding/src/test/java/echo/EchoDataBindingTestCase.java
deleted file mode 100644
index f15501a9a5..0000000000
--- a/branches/sca-java-integration/samples/sca/echo-databinding/src/test/java/echo/EchoDataBindingTestCase.java
+++ /dev/null
@@ -1,49 +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 echo;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.api.SCARuntime;
-import org.osoa.sca.CompositeContext;
-import org.osoa.sca.CurrentCompositeContext;
-
-/**
- * @version $Rev$ $Date$
- */
-public class EchoDataBindingTestCase extends TestCase {
-
-    private Interface1 componentA;
-
-    public void testTransform() {
-        componentA.call("<message><foo>123</foo></message>");
-        componentA.call1("<message><foo>123</foo></message>");
-    }
-
-    protected void setUp() throws Exception {
-    	SCARuntime.start("EchoDataBinding.composite");
-    	
-        CompositeContext context = CurrentCompositeContext.getContext();
-        componentA = context.locateService(Interface1.class, "ComponentA");
-    }
-    
-    protected void tearDown() throws Exception {
-    	SCARuntime.stop();
-    }
-}
diff --git a/branches/sca-java-integration/samples/sca/echo-databinding/src/test/java/echo/Interface1.java b/branches/sca-java-integration/samples/sca/echo-databinding/src/test/java/echo/Interface1.java
deleted file mode 100644
index bce5dd46cb..0000000000
--- a/branches/sca-java-integration/samples/sca/echo-databinding/src/test/java/echo/Interface1.java
+++ /dev/null
@@ -1,32 +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 echo;
-
-import org.apache.tuscany.api.annotation.DataType;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-@DataType(name="java.lang.String")
-@Remotable
-public interface Interface1 {
-    Object call(Object msg);
-    Object call1(Object msg);
-}
diff --git a/branches/sca-java-integration/samples/sca/echo-databinding/src/test/java/echo/Interface2.java b/branches/sca-java-integration/samples/sca/echo-databinding/src/test/java/echo/Interface2.java
deleted file mode 100644
index c2f82971e9..0000000000
--- a/branches/sca-java-integration/samples/sca/echo-databinding/src/test/java/echo/Interface2.java
+++ /dev/null
@@ -1,36 +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 echo;
-
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.api.annotation.DataType;
-import org.osoa.sca.annotations.Remotable;
-import org.w3c.dom.Node;
-
-/**
- * @version $Rev$ $Date$
- */
-@DataType(name="org.w3c.dom.Node")
-@Remotable
-public interface Interface2 {
-    Node call(Node msg);
-    @DataType(name="javax.xml.stream.XMLStreamReader")
-    XMLStreamReader call1(XMLStreamReader msg);
-}
diff --git a/branches/sca-java-integration/samples/sca/echo-databinding/src/test/resources/EchoDataBinding.composite b/branches/sca-java-integration/samples/sca/echo-databinding/src/test/resources/EchoDataBinding.composite
deleted file mode 100644
index e3407e4ab7..0000000000
--- a/branches/sca-java-integration/samples/sca/echo-databinding/src/test/resources/EchoDataBinding.composite
+++ /dev/null
@@ -1,61 +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:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:f="http://foo"
-    xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance" name="EchoDataBinding">
-
-    <service name="EchoService">
-        <interface.java class="echo.Interface1" />
-        <binding.echo />
-        <reference>ComponentB</reference>
-    </service>
-
-    <component name="ComponentA">
-        <implementation.java class="echo.ComponentAImpl" />
-        <reference name="componentBReference" target="ComponentB"></reference>
-        <property name="prefix">ABC</property>
-        <property name="prefix1" source="$messagePrefix"></property>
-        <property name="bar" source="$complexProperty/*[local-name()='foo']/*[local-name()='bar']"></property>
-        <property name="omProperty"><a><b>XYZ</b></a></property>
-    </component>
-
-    <component name="ComponentB">
-        <implementation.java class="echo.ComponentBImpl" />
-    </component>
-
-    <reference name="EchoReference" promote="ComponentB/echoReference">
-        <!-- 
-            <interface.java interface="echo.Echo"/>
-        -->
-        <interface.wsdl interface="http://example.com/echo.wsdl#wsdl.interface(EchoPortType)" wsdli:wsdlLocation="http://example.com/echo.wsdl wsdl/echo.wsdl">
-            <db:databinding xmlns:db="http://tuscany.apache.org/xmlns/sca/databinding/1.0" name="org.apache.axiom.om.OMElement"/>
-        </interface.wsdl>
-        <binding.echo />
-    </reference>
-    
-    <property name="messagePrefix" type="xsd:string">ABC</property>
-    <property name="complexProperty" type="f:FooType">
-        <foo>
-            <bar attr="barAttr">BAR</bar>
-        </foo>
-    </property>
-
-</composite>
diff --git a/branches/sca-java-integration/samples/sca/echo-databinding/src/test/resources/wsdl/echo.wsdl b/branches/sca-java-integration/samples/sca/echo-databinding/src/test/resources/wsdl/echo.wsdl
deleted file mode 100644
index 5749bd8aff..0000000000
--- a/branches/sca-java-integration/samples/sca/echo-databinding/src/test/resources/wsdl/echo.wsdl
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>

-<definitions name="StockQuote" targetNamespace="http://example.com/echo.wsdl" xmlns:tns="http://example.com/echo.wsdl"

-    xmlns:xsd1="http://example.com/echo.xsd" xmlns="http://schemas.xmlsoap.org/wsdl/">

-

-    <types>

-        <schema targetNamespace="http://example.com/echo.xsd" xmlns:tns="http://example.com/echo.xsd"

-            xmlns="http://www.w3.org/2001/XMLSchema">

-            <complexType name="messageType">

-                <sequence>

-                    <element name="foo" type="string"></element>

-                </sequence>

-            </complexType>

-            <element name="echo">

-                <complexType>

-                    <sequence>

-                        <element name="message" type="tns:messageType" />

-                    </sequence>

-                </complexType>

-            </element>

-            <element name="echoResponse">

-                <complexType>

-                    <sequence>

-                        <element name="message" type="tns:messageType" />

-                    </sequence>

-                </complexType>

-            </element>

-        </schema>

-    </types>

-

-    <message name="EchoInput">

-        <part name="body" element="xsd1:echo" />

-    </message>

-

-    <message name="EchoOutput">

-        <part name="body" element="xsd1:echoResponse" />

-    </message>

-

-    <portType name="EchoPortType">

-        <operation name="echo">

-            <input message="tns:EchoInput" />

-            <output message="tns:EchoOutput" />

-        </operation>

-    </portType>

-

-</definitions>
\ No newline at end of file